From 9332a9161d6abf2fff3b14e7d376ff0fdfbd2d4d Mon Sep 17 00:00:00 2001 From: TekH Date: Mon, 4 Aug 2025 14:36:53 +0200 Subject: [PATCH] fix: update ConfigMapping to configure with MappingOptions --- src/WorkFlow.API/Program.cs | 2 +- src/WorkFlow.API/appsettings.Mapping.json | 2 +- src/WorkFlow.Application/DependencyInjection.cs | 4 ++-- src/WorkFlow.Application/Dto/TfFileDto.cs | 4 ++-- src/WorkFlow.Application/Mapping/MappingProfile.cs | 4 ++-- ...IconUriBuilderResolver.cs => TfFileIconUriResolver.cs} | 8 ++++---- .../{TfFileUriBuilderResolver.cs => TfFileUriResolver.cs} | 8 ++++---- 7 files changed, 16 insertions(+), 16 deletions(-) rename src/WorkFlow.Application/Mapping/{TfFileIconUriBuilderResolver.cs => TfFileIconUriResolver.cs} (52%) rename src/WorkFlow.Application/Mapping/{TfFileUriBuilderResolver.cs => TfFileUriResolver.cs} (51%) diff --git a/src/WorkFlow.API/Program.cs b/src/WorkFlow.API/Program.cs index ae2a8bb..442cb1a 100644 --- a/src/WorkFlow.API/Program.cs +++ b/src/WorkFlow.API/Program.cs @@ -50,7 +50,7 @@ try builder.Services.AddWorkFlowServices(opt => { opt.MediatRLicense = mediatRLicense; - opt.ConfigMapping(config); + opt.ConfigMapping(config.GetSection("MappingOptions")); }).AddWorkFlowRepositories(); builder.Services.AddUserManager(); diff --git a/src/WorkFlow.API/appsettings.Mapping.json b/src/WorkFlow.API/appsettings.Mapping.json index 0c0c4c2..fc7cf0b 100644 --- a/src/WorkFlow.API/appsettings.Mapping.json +++ b/src/WorkFlow.API/appsettings.Mapping.json @@ -2,7 +2,7 @@ "MappingOptions": { "TfFileUri": { "Scheme": "https", - "Host": " dd-gan.digitaldata.works", + "Host": "dd-gan.digitaldata.works", "Port": 8443, "Path": "api/file" }, diff --git a/src/WorkFlow.Application/DependencyInjection.cs b/src/WorkFlow.Application/DependencyInjection.cs index 0450bbf..72a67fc 100644 --- a/src/WorkFlow.Application/DependencyInjection.cs +++ b/src/WorkFlow.Application/DependencyInjection.cs @@ -21,8 +21,8 @@ public static class DependencyInjection if(!sOptions.IsMappingConfigured) services.Configure(_ => { }); - services.AddTransient(); - services.AddTransient(); + services.AddTransient(); + services.AddTransient(); return services; } diff --git a/src/WorkFlow.Application/Dto/TfFileDto.cs b/src/WorkFlow.Application/Dto/TfFileDto.cs index 020b5fa..c379dc0 100644 --- a/src/WorkFlow.Application/Dto/TfFileDto.cs +++ b/src/WorkFlow.Application/Dto/TfFileDto.cs @@ -2,7 +2,7 @@ public class TfFileDto { - public UriBuilder? Url { get; set; } + public string? Url { get; set; } public string? Headline { get; set; } @@ -10,5 +10,5 @@ public class TfFileDto public string? Comment { get; set; } - public UriBuilder? IconUrl { get; set; } + public string? IconUrl { get; set; } } \ No newline at end of file diff --git a/src/WorkFlow.Application/Mapping/MappingProfile.cs b/src/WorkFlow.Application/Mapping/MappingProfile.cs index 7e2cccd..86651c7 100644 --- a/src/WorkFlow.Application/Mapping/MappingProfile.cs +++ b/src/WorkFlow.Application/Mapping/MappingProfile.cs @@ -29,7 +29,7 @@ public class MappingProfile : AutoMapper.Profile .ForMember(dest => dest.Others, opt => opt.MapFrom(src => new string?[] { src.State2, src.State3, src.State4 })); CreateMap() - .ForMember(dest => dest.Url, opt => opt.MapFrom()) - .ForMember(dest => dest.IconUrl, opt => opt.MapFrom()); + .ForMember(dest => dest.Url, opt => opt.MapFrom()) + .ForMember(dest => dest.IconUrl, opt => opt.MapFrom()); } } \ No newline at end of file diff --git a/src/WorkFlow.Application/Mapping/TfFileIconUriBuilderResolver.cs b/src/WorkFlow.Application/Mapping/TfFileIconUriResolver.cs similarity index 52% rename from src/WorkFlow.Application/Mapping/TfFileIconUriBuilderResolver.cs rename to src/WorkFlow.Application/Mapping/TfFileIconUriResolver.cs index f5bcd67..454074a 100644 --- a/src/WorkFlow.Application/Mapping/TfFileIconUriBuilderResolver.cs +++ b/src/WorkFlow.Application/Mapping/TfFileIconUriResolver.cs @@ -6,19 +6,19 @@ using WorkFlow.Domain.Entities; namespace WorkFlow.Application.Mapping; -public class TfFileIconUriBuilderResolver : IValueResolver +public class TfFileIconUriResolver : IValueResolver { private readonly Func _uriBuilderFactory; - public TfFileIconUriBuilderResolver(IOptions options) => _uriBuilderFactory = () => options.Value.TfFileIconUri.ToBuilder; + public TfFileIconUriResolver(IOptions options) => _uriBuilderFactory = () => options.Value.TfFileIconUri.ToBuilder; - public UriBuilder? Resolve(TfFile source, TfFileDto destination, UriBuilder? destMember, ResolutionContext context) + public string? Resolve(TfFile source, TfFileDto destination, string? destMember, ResolutionContext context) { if(string.IsNullOrEmpty(source.Icon)) return null; var builder = _uriBuilderFactory(); builder.AppendPath(source.Icon); - return builder; + return builder.ToString(); } } \ No newline at end of file diff --git a/src/WorkFlow.Application/Mapping/TfFileUriBuilderResolver.cs b/src/WorkFlow.Application/Mapping/TfFileUriResolver.cs similarity index 51% rename from src/WorkFlow.Application/Mapping/TfFileUriBuilderResolver.cs rename to src/WorkFlow.Application/Mapping/TfFileUriResolver.cs index 1943a90..677fb26 100644 --- a/src/WorkFlow.Application/Mapping/TfFileUriBuilderResolver.cs +++ b/src/WorkFlow.Application/Mapping/TfFileUriResolver.cs @@ -5,19 +5,19 @@ using WorkFlow.Domain.Entities; namespace WorkFlow.Application.Mapping; -public class TfFileUriBuilderResolver : IValueResolver +public class TfFileUriResolver : IValueResolver { private readonly Func _uriBuilderFactory; - public TfFileUriBuilderResolver(IOptions options) => _uriBuilderFactory = () => options.Value.TfFileUri.ToBuilder; + public TfFileUriResolver(IOptions options) => _uriBuilderFactory = () => options.Value.TfFileUri.ToBuilder; - public UriBuilder? Resolve(TfFile source, TfFileDto destination, UriBuilder? destMember, ResolutionContext context) + public string? Resolve(TfFile source, TfFileDto destination, string? destMember, ResolutionContext context) { if (string.IsNullOrEmpty(source.Path)) return null; var builder = _uriBuilderFactory(); builder.AppendPath(source.Path); - return builder; + return builder.ToString(); } } \ No newline at end of file