diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/AbpTenantManagementApplicationAutoMapperProfile.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/AbpTenantManagementApplicationAutoMapperProfile.cs deleted file mode 100644 index e7db0c19b9..0000000000 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/AbpTenantManagementApplicationAutoMapperProfile.cs +++ /dev/null @@ -1,12 +0,0 @@ -using AutoMapper; - -namespace Volo.Abp.TenantManagement; - -public class AbpTenantManagementApplicationAutoMapperProfile : Profile -{ - public AbpTenantManagementApplicationAutoMapperProfile() - { - CreateMap() - .MapExtraProperties(); - } -} diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/AbpTenantManagementApplicationMapperlyMappers.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/AbpTenantManagementApplicationMapperlyMappers.cs new file mode 100644 index 0000000000..c3f44f2129 --- /dev/null +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/AbpTenantManagementApplicationMapperlyMappers.cs @@ -0,0 +1,13 @@ +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; + +namespace Volo.Abp.TenantManagement.Application.Volo.Abp.TenantManagement; + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +[MapExtraProperties] +public partial class TenantToTenantDtoMapper + : MapperBase +{ + public override partial TenantDto Map(Tenant source); + public override partial void Map(Tenant source, TenantDto destination); +} \ No newline at end of file diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/AbpTenantManagementApplicationModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/AbpTenantManagementApplicationModule.cs index 2583c06458..4f51d28f82 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/AbpTenantManagementApplicationModule.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/AbpTenantManagementApplicationModule.cs @@ -1,6 +1,5 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Application; -using Volo.Abp.AutoMapper; using Volo.Abp.Modularity; namespace Volo.Abp.TenantManagement; @@ -12,10 +11,6 @@ public class AbpTenantManagementApplicationModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.AddAutoMapperObjectMapper(); - Configure(options => - { - options.AddProfile(validate: true); - }); + context.Services.AddMapperlyObjectMapper(); } } diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/AbpTenantManagementBlazorAutoMapperProfile.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/AbpTenantManagementBlazorAutoMapperProfile.cs deleted file mode 100644 index 28ad6e9b8a..0000000000 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/AbpTenantManagementBlazorAutoMapperProfile.cs +++ /dev/null @@ -1,12 +0,0 @@ -using AutoMapper; - -namespace Volo.Abp.TenantManagement.Blazor; - -public class AbpTenantManagementBlazorAutoMapperProfile : Profile -{ - public AbpTenantManagementBlazorAutoMapperProfile() - { - CreateMap() - .MapExtraProperties(); - } -} diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/AbpTenantManagementBlazorMapperlyMappers.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/AbpTenantManagementBlazorMapperlyMappers.cs new file mode 100644 index 0000000000..7b8ea2a5bf --- /dev/null +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/AbpTenantManagementBlazorMapperlyMappers.cs @@ -0,0 +1,16 @@ +using Riok.Mapperly.Abstractions; +using Volo.Abp.Mapperly; + +namespace Volo.Abp.TenantManagement.Blazor; + +[Mapper] +[MapExtraProperties] +public partial class TenantDtoToTenantUpdateDtoMapper + : MapperBase +{ + [MapperIgnoreSource(nameof(TenantDto.Id))] + public override partial TenantUpdateDto Map(TenantDto source); + + [MapperIgnoreSource(nameof(TenantDto.Id))] + public override partial void Map(TenantDto source, TenantUpdateDto destination); +} \ No newline at end of file diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/AbpTenantManagementBlazorModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/AbpTenantManagementBlazorModule.cs index 0433f2e33b..0263106b43 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/AbpTenantManagementBlazorModule.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/AbpTenantManagementBlazorModule.cs @@ -1,7 +1,7 @@ using Localization.Resources.AbpUi; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AspNetCore.Components.Web.Theming.Routing; -using Volo.Abp.AutoMapper; +using Volo.Abp.Mapperly; using Volo.Abp.FeatureManagement.Blazor; using Volo.Abp.FeatureManagement.Localization; using Volo.Abp.Localization; @@ -16,7 +16,7 @@ using Volo.Abp.UI.Navigation; namespace Volo.Abp.TenantManagement.Blazor; [DependsOn( - typeof(AbpAutoMapperModule), + typeof(AbpMapperlyModule), typeof(AbpTenantManagementApplicationContractsModule), typeof(AbpFeatureManagementBlazorModule) )] @@ -26,12 +26,7 @@ public class AbpTenantManagementBlazorModule : AbpModule public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.AddAutoMapperObjectMapper(); - - Configure(options => - { - options.AddProfile(validate: true); - }); + context.Services.AddMapperlyObjectMapper(); Configure(options => { diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Volo.Abp.TenantManagement.Blazor.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Volo.Abp.TenantManagement.Blazor.csproj index 1afbbf56c7..8e54fdcba0 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Volo.Abp.TenantManagement.Blazor.csproj +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Volo.Abp.TenantManagement.Blazor.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.csproj index 7a40ae4f71..dcb196ce86 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.csproj +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.csproj @@ -17,7 +17,7 @@ - + diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantManagementDomainMapperlyMappers.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantManagementDomainMapperlyMappers.cs new file mode 100644 index 0000000000..29ae9f21fe --- /dev/null +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantManagementDomainMapperlyMappers.cs @@ -0,0 +1,47 @@ +using System; +using System.Collections.Generic; +using Riok.Mapperly.Abstractions; +using Volo.Abp.Data; +using Volo.Abp.Mapperly; +using Volo.Abp.MultiTenancy; + +namespace Volo.Abp.TenantManagement.Domain.Volo.Abp.TenantManagement; + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class TenantToTenantConfigurationMapper + : MapperBase +{ + [MapperIgnoreTarget(nameof(TenantConfiguration.EditionId))] + [MapperIgnoreTarget(nameof(TenantConfiguration.IsActive))] + public override partial TenantConfiguration Map(Tenant source); + + [MapperIgnoreTarget(nameof(TenantConfiguration.EditionId))] + [MapperIgnoreTarget(nameof(TenantConfiguration.IsActive))] + public override partial void Map(Tenant source, TenantConfiguration destination); + + protected virtual ConnectionStrings Map(List source) + { + var connStrings = new ConnectionStrings(); + + if (source == null) + { + return connStrings; + } + + foreach (var connectionString in source) + { + connStrings[connectionString.Name] = connectionString.Value; + } + + return connStrings; + } +} + +[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] +public partial class TenantToTenantEtoMapper + : MapperBase +{ + public override partial TenantEto Map(Tenant source); + + public override partial void Map(Tenant source, TenantEto destination); +} \ No newline at end of file diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantManagementDomainMappingProfile.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantManagementDomainMappingProfile.cs deleted file mode 100644 index 6fe1edafc6..0000000000 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantManagementDomainMappingProfile.cs +++ /dev/null @@ -1,36 +0,0 @@ -using AutoMapper; -using Volo.Abp.Data; -using Volo.Abp.MultiTenancy; - -namespace Volo.Abp.TenantManagement; - -public class AbpTenantManagementDomainMappingProfile : Profile -{ - public AbpTenantManagementDomainMappingProfile() - { - CreateMap() - .ForMember(ti => ti.ConnectionStrings, opts => - { - opts.MapFrom((tenant, ti) => - { - var connStrings = new ConnectionStrings(); - - if (tenant.ConnectionStrings == null) - { - return connStrings; - } - - foreach (var connectionString in tenant.ConnectionStrings) - { - connStrings[connectionString.Name] = connectionString.Value; - } - - return connStrings; - }); - }) - .ForMember(x => x.IsActive, x => x.Ignore()) - .ForMember(x => x.EditionId, x => x.Ignore()); - - CreateMap(); - } -} diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantManagementDomainModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantManagementDomainModule.cs index 6bd09809e4..afce2e0809 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantManagementDomainModule.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/AbpTenantManagementDomainModule.cs @@ -1,5 +1,5 @@ using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.AutoMapper; +using Volo.Abp.Mapperly; using Volo.Abp.Caching; using Volo.Abp.Data; using Volo.Abp.Domain; @@ -16,7 +16,7 @@ namespace Volo.Abp.TenantManagement; [DependsOn(typeof(AbpTenantManagementDomainSharedModule))] [DependsOn(typeof(AbpDataModule))] [DependsOn(typeof(AbpDddDomainModule))] -[DependsOn(typeof(AbpAutoMapperModule))] +[DependsOn(typeof(AbpMapperlyModule))] [DependsOn(typeof(AbpCachingModule))] public class AbpTenantManagementDomainModule : AbpModule { @@ -24,12 +24,7 @@ public class AbpTenantManagementDomainModule : AbpModule public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.AddAutoMapperObjectMapper(); - - Configure(options => - { - options.AddProfile(validate: true); - }); + context.Services.AddMapperlyObjectMapper(); Configure(options => { diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebAutoMapperProfile.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebAutoMapperProfile.cs deleted file mode 100644 index 4730033e60..0000000000 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebAutoMapperProfile.cs +++ /dev/null @@ -1,22 +0,0 @@ -using AutoMapper; -using Volo.Abp.AutoMapper; -using Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants; - -namespace Volo.Abp.TenantManagement.Web; - -public class AbpTenantManagementWebAutoMapperProfile : Profile -{ - public AbpTenantManagementWebAutoMapperProfile() - { - //List - CreateMap(); - - //CreateModal - CreateMap() - .MapExtraProperties(); - - //EditModal - CreateMap() - .MapExtraProperties(); - } -} diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebMapperlyMappers.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebMapperlyMappers.cs new file mode 100644 index 0000000000..d729809010 --- /dev/null +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebMapperlyMappers.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Riok.Mapperly.Abstractions; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Mapperly; +using Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants; + +namespace Volo.Abp.TenantManagement.Web; + +[Mapper] +[MapExtraProperties] +public partial class TenantDtoToTenantInfoModelMapper + : MapperBase +{ + public override partial EditModalModel.TenantInfoModel Map(TenantDto source); + + public override partial void Map(TenantDto source, EditModalModel.TenantInfoModel destination); +} + +[Mapper] +[MapExtraProperties] +public partial class CreateTenantInfoModelToTenantCreateDtoMapper + : TwoWayMapperBase +{ + public override partial TenantCreateDto Map(CreateModalModel.TenantInfoModel source); + + public override partial void Map(CreateModalModel.TenantInfoModel source, TenantCreateDto destination); + + public override partial CreateModalModel.TenantInfoModel ReverseMap(TenantCreateDto source); + + public override partial void ReverseMap(TenantCreateDto source, CreateModalModel.TenantInfoModel destination); +} + +[Mapper] +[MapExtraProperties] +public partial class TenantInfoModelToTenantUpdateDtoMapper + : MapperBase +{ + [MapperIgnoreSource(nameof(EditModalModel.TenantInfoModel.Id))] + [MapperIgnoreSource(nameof(EditModalModel.TenantInfoModel.ConcurrencyStamp))] + [MapperIgnoreTarget(nameof(TenantUpdateDto.ConcurrencyStamp))] + public override partial TenantUpdateDto Map(EditModalModel.TenantInfoModel source); + + [MapperIgnoreSource(nameof(EditModalModel.TenantInfoModel.Id))] + [MapperIgnoreSource(nameof(EditModalModel.TenantInfoModel.ConcurrencyStamp))] + [MapperIgnoreTarget(nameof(TenantUpdateDto.ConcurrencyStamp))] + public override partial void Map(EditModalModel.TenantInfoModel source, TenantUpdateDto destination); +} \ No newline at end of file diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs index b3a63fb8ae..90dc1df3d6 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AspNetCore.Mvc.Localization; using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars; -using Volo.Abp.AutoMapper; +using Volo.Abp.Mapperly; using Volo.Abp.FeatureManagement; using Volo.Abp.Http.ProxyScripting.Generators.JQuery; using Volo.Abp.Localization; @@ -21,7 +21,7 @@ namespace Volo.Abp.TenantManagement.Web; [DependsOn(typeof(AbpTenantManagementApplicationContractsModule))] [DependsOn(typeof(AbpAspNetCoreMvcUiBootstrapModule))] [DependsOn(typeof(AbpFeatureManagementWebModule))] -[DependsOn(typeof(AbpAutoMapperModule))] +[DependsOn(typeof(AbpMapperlyModule))] public class AbpTenantManagementWebModule : AbpModule { private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); @@ -41,6 +41,8 @@ public class AbpTenantManagementWebModule : AbpModule public override void ConfigureServices(ServiceConfigurationContext context) { + context.Services.AddMapperlyObjectMapper(); + Configure(options => { options.MenuContributors.Add(new AbpTenantManagementWebMainMenuContributor()); @@ -51,12 +53,6 @@ public class AbpTenantManagementWebModule : AbpModule options.FileSets.AddEmbedded(); }); - context.Services.AddAutoMapperObjectMapper(); - Configure(options => - { - options.AddProfile(validate: true); - }); - Configure(options => { options.Conventions.AuthorizePage("/TenantManagement/Tenants/Index", TenantManagementPermissions.Tenants.Default); diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.csproj index 0fe0724f15..59d7e74c6b 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.csproj +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Volo.Abp.TenantManagement.Web.csproj @@ -35,7 +35,7 @@ - +