diff --git a/docs/en/Application-Services.md b/docs/en/Application-Services.md index de9fc1f0df..bed14370f5 100644 --- a/docs/en/Application-Services.md +++ b/docs/en/Application-Services.md @@ -146,7 +146,7 @@ public interface IBookAppService : IApplicationService `BookDto` is a simple [DTO](Data-Transfer-Objects.md) class defined as below: ````csharp -[AutoMapFrom(typeof(Book))] //Defines the mapping +[AbpAutoMapFrom(typeof(Book))] //Defines the mapping public class BookDto { public Guid Id { get; set; } @@ -159,7 +159,7 @@ public class BookDto } ```` -* `BookDto` defines `[AutoMapFrom(typeof(Book))]` attribute to create the object mapping from `Book` to `BookDto`. +* `BookDto` defines `[AbpAutoMapFrom(typeof(Book))]` attribute to create the object mapping from `Book` to `BookDto`. Then you can implement the `GetAsync` method as shown below: @@ -248,7 +248,7 @@ public interface IAsyncCrudAppService< DTO classes used in this example are `BookDto` and `CreateUpdateBookDto`: ````csharp -[AutoMapFrom(typeof(Book))] +[AbpAutoMapFrom(typeof(Book))] public class BookDto : AuditedEntityDto { public string Name { get; set; } @@ -258,7 +258,7 @@ public class BookDto : AuditedEntityDto public float Price { get; set; } } -[AutoMapTo(typeof(Book))] +[AbpAutoMapTo(typeof(Book))] public class CreateUpdateBookDto { [Required] diff --git a/docs/en/Dapper.md b/docs/en/Dapper.md new file mode 100644 index 0000000000..d8b17838eb --- /dev/null +++ b/docs/en/Dapper.md @@ -0,0 +1,61 @@ +# Dapper Integration + +Because Dapper's idea is that the sql statement takes precedence, and mainly provides some extension methods for the `IDbConnection` interface. + +Abp does not encapsulate too many functions for Dapper. Abp Dapper provides a `DapperRepository` base class based on Abp EntityFrameworkCore, which provides the `IDbConnection` and `IDbTransaction` properties required by Dapper. + +These two properties can work well with [Unit-Of-Work](Unit-Of-Work.md). + +## Installation + +Please install and configure EF Core according to [EF Core's integrated documentation](Entity-Framework-Core.md). + +`Volo.Abp.Dapper` is the main nuget package for the Dapper integration. Install it to your project (for a layered application, to your data/infrastructure layer): + +```shell +Install-Package Volo.Abp.Dapper +``` + +Then add `AbpDapperModule` module dependency (`DependsOn` attribute) to your [module](Module-Development-Basics.md): + +````C# +using Volo.Abp.Dapper; +using Volo.Abp.Modularity; + +namespace MyCompany.MyProject +{ + [DependsOn(typeof(AbpDapperModule))] + public class MyModule : AbpModule + { + //... + } +} +```` + +## Implement Dapper Repository + +The following code implements the `Person` repository, which requires EF Core's `DbContext` (MyAppDbContext). You can inject `PersonDapperRepository` to call its methods. + +`DbConnection` and `DbTransaction` are from the `DapperRepository` base class. + +```C# +public class PersonDapperRepository : DapperRepository, ITransientDependency +{ + public PersonDapperRepository(IDbContextProvider dbContextProvider) + : base(dbContextProvider) + { + } + + public virtual async Task> GetAllPersonNames() + { + return (await DbConnection.QueryAsync("select Name from People", transaction: DbTransaction)) + .ToList(); + } + + public virtual async Task UpdatePersonNames(string name) + { + return await DbConnection.ExecuteAsync("update People set Name = @NewName", new { NewName = name }, + DbTransaction); + } +} +``` diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json index fdb4a7797c..deaa6bcc67 100644 --- a/docs/en/docs-nav.json +++ b/docs/en/docs-nav.json @@ -256,6 +256,10 @@ { "text": "MongoDB Integration", "path": "MongoDB.md" + }, + { + "text": "Dapper Integration", + "path": "Dapper.md" } ] }, diff --git a/docs/zh-Hans/Application-Services.md b/docs/zh-Hans/Application-Services.md index e98e945405..74718eb571 100644 --- a/docs/zh-Hans/Application-Services.md +++ b/docs/zh-Hans/Application-Services.md @@ -146,7 +146,7 @@ public interface IBookAppService : IApplicationService `BookDto`是一个简单的[DTO](Data-Transfer-Objects.md)类, 定义如下: ````csharp -[AutoMapFrom(typeof(Book))] //Defines the mapping +[AbpAutoMapFrom(typeof(Book))] //Defines the mapping public class BookDto { public Guid Id { get; set; } @@ -159,7 +159,7 @@ public class BookDto } ```` -* `BookDto`定义了`[AutoMapFrom(typeof(Book))]`属性来从创建对象映射Book到BookDto. +* `BookDto`定义了`[AbpAutoMapFrom(typeof(Book))]`属性来从创建对象映射Book到BookDto. 然后你可以实现`GetAsync`方法. 如下所示: @@ -247,7 +247,7 @@ public interface IAsyncCrudAppService< 示例中使用的DTO类是`BookDto`和`CreateUpdateBookDto`: ````csharp -[AutoMapFrom(typeof(Book))] +[AbpAutoMapFrom(typeof(Book))] public class BookDto : AuditedEntityDto { public string Name { get; set; } @@ -257,7 +257,7 @@ public class BookDto : AuditedEntityDto public float Price { get; set; } } -[AutoMapTo(typeof(Book))] +[AbpAutoMapTo(typeof(Book))] public class CreateUpdateBookDto { [Required] diff --git a/docs/zh-Hans/Dapper.md b/docs/zh-Hans/Dapper.md new file mode 100644 index 0000000000..60289abd00 --- /dev/null +++ b/docs/zh-Hans/Dapper.md @@ -0,0 +1,61 @@ +# Dapper 集成 + +由于Dapper的思想是sql语句优先, 且主要为`IDbConnection`接口提供了一些扩展方法. + +Abp并没有为Dapper封装太多功能. Abp Dapper在Abp EntityFrameworkCore的基础上提供了`DapperRepository`基类, 在其中提供了Dapper需要的`IDbConnection`和`IDbTransaction`属性. + +这两个属性可以和[工作单元](Unit-Of-Work.md)很好的配合. + +## 安装 + +请先根据[EF Core的集成文档](Entity-Framework-Core.md)安装并配置好EF Core. + +`Volo.Abp.Dapper`是Dapper集成的主要nuget包. 将其安装到你的项目中(在分层应用程序中适用于 数据访问/基础设施层): + +```shell +Install-Package Volo.Abp.Dapper +``` + +然后添加 `AbpDapperModule` 模块依赖项(`DependsOn` Attribute) 到 [module](Module-Development-Basics.cn.md)(项目中的Mudole类): + +````C# +using Volo.Abp.Dapper; +using Volo.Abp.Modularity; + +namespace MyCompany.MyProject +{ + [DependsOn(typeof(AbpDapperModule))] + public class MyModule : AbpModule + { + //... + } +} +```` + +## 实现Dapper仓储 + +下面的代码实现了`Person`仓储, 它需要EF Core的`DbContext`(MyAppDbContext). 你可以注入`PersonDapperRepository`来调用它的方法. + +`DbConnection`和`DbTransaction`来自于`DapperRepository`基类. + +```C# +public class PersonDapperRepository : DapperRepository, ITransientDependency +{ + public PersonDapperRepository(IDbContextProvider dbContextProvider) + : base(dbContextProvider) + { + } + + public virtual async Task> GetAllPersonNames() + { + return (await DbConnection.QueryAsync("select Name from People", transaction: DbTransaction)) + .ToList(); + } + + public virtual async Task UpdatePersonNames(string name) + { + return await DbConnection.ExecuteAsync("update People set Name = @NewName", new { NewName = name }, + DbTransaction); + } +} +``` diff --git a/docs/zh-Hans/Entity-Framework-Core.md b/docs/zh-Hans/Entity-Framework-Core.md index e709767652..6a7f69c2aa 100644 --- a/docs/zh-Hans/Entity-Framework-Core.md +++ b/docs/zh-Hans/Entity-Framework-Core.md @@ -10,7 +10,7 @@ Install-Package Volo.Abp.EntityFrameworkCore ``` -然后添加 `AbpEntityFrameworkCoreModule` 模块依赖项(`DependsOn` Attribute) 到 [module](Module-Development-Basics.cn.md)(项目中的Mudole类): +然后添加 `AbpEntityFrameworkCoreModule` 模块依赖项(`DependsOn` Attribute) 到 [module](Module-Development-Basics.md)(项目中的Mudole类): ````C# using Volo.Abp.EntityFrameworkCore; diff --git a/docs/zh-Hans/docs-nav.json b/docs/zh-Hans/docs-nav.json index fb147ac0fe..60c4afb3d7 100644 --- a/docs/zh-Hans/docs-nav.json +++ b/docs/zh-Hans/docs-nav.json @@ -242,6 +242,10 @@ { "text": "MongoDB 集成", "path": "MongoDB.md" + }, + { + "text": "Dapper 集成", + "path": "Dapper.md" } ] }, diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml index cace550248..61b9ef49ee 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml @@ -27,7 +27,16 @@ {
  • - +
    @foreach (var childMenuItem in menuItem.Items) { diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml index 4e2dd80fbf..19c3803408 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml @@ -10,6 +10,13 @@ if (Model.Url != null) { + @if (Model.Icon != null) + { + if (Model.Icon.StartsWith("fa")) + { + + } + } @Model.DisplayName } diff --git a/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperModule.cs b/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperModule.cs index 152e4f9283..ebf517dc65 100644 --- a/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperModule.cs +++ b/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperModule.cs @@ -1,13 +1,9 @@ using System; -using System.Linq; -using System.Reflection; using AutoMapper; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Volo.Abp.Modularity; using Volo.Abp.ObjectMapping; -using Volo.Abp.Reflection; namespace Volo.Abp.AutoMapper { @@ -34,7 +30,6 @@ namespace Volo.Abp.AutoMapper void ConfigureAll(IAbpAutoMapperConfigurationContext ctx) { - FindAndAutoMapTypes(ctx); foreach (var configurator in options.Configurators) { configurator(ctx); @@ -59,36 +54,5 @@ namespace Volo.Abp.AutoMapper scope.ServiceProvider.GetRequiredService().Mapper = mapperConfiguration.CreateMapper(); } } - - private void FindAndAutoMapTypes(IAbpAutoMapperConfigurationContext context) - { - //TODO: AutoMapping (by attributes) can be optionally enabled/disabled. - - var typeFinder = context.ServiceProvider.GetRequiredService(); - var logger = context.ServiceProvider.GetRequiredService>(); - - var types = typeFinder.Types.Where(type => - { - var typeInfo = type.GetTypeInfo(); - return typeInfo.IsDefined(typeof(AutoMapAttribute)) || - typeInfo.IsDefined(typeof(AutoMapFromAttribute)) || - typeInfo.IsDefined(typeof(AutoMapToAttribute)); - } - ).ToArray(); - - if (types.Length <= 0) - { - logger.LogDebug($"No class found with auto mapping attributes."); - } - else - { - logger.LogDebug($"Found {types.Length} classes define auto mapping attributes."); - foreach (var type in types) - { - logger.LogDebug(type.FullName); - context.MapperConfiguration.CreateAutoAttributeMaps(type); - } - } - } } } diff --git a/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperOptions.cs b/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperOptions.cs index cdd407e03c..403a23300b 100644 --- a/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperOptions.cs +++ b/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperOptions.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq; using AutoMapper; using Volo.Abp.Collections; @@ -17,8 +18,30 @@ namespace Volo.Abp.AutoMapper ValidatingProfiles = new TypeList(); } + public void AddMaps(bool validate = false) + { + var assembly = typeof(TModule).Assembly; + + Configurators.Add(context => + { + context.MapperConfiguration.AddMaps(assembly); + }); + + if (validate) + { + var profileTypes = assembly + .DefinedTypes + .Where(type => typeof(Profile).IsAssignableFrom(type) && !type.IsAbstract && !type.IsGenericType); + + foreach (var profileType in profileTypes) + { + ValidatingProfiles.Add(profileType); + } + } + } + public void AddProfile(bool validate = false) - where TProfile: Profile, new() + where TProfile : Profile, new() { Configurators.Add(context => { @@ -27,7 +50,25 @@ namespace Volo.Abp.AutoMapper if (validate) { - ValidatingProfiles.Add(); + ValidateProfile(typeof(TProfile)); + } + } + + public void ValidateProfile(bool validate = true) + where TProfile : Profile + { + ValidateProfile(typeof(TProfile), validate); + } + + public void ValidateProfile(Type profileType, bool validate = true) + { + if (validate) + { + ValidatingProfiles.AddIfNotContains(profileType); + } + else + { + ValidatingProfiles.Remove(profileType); } } } diff --git a/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapAttribute.cs b/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapAttribute.cs deleted file mode 100644 index e0fcf06d05..0000000000 --- a/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapAttribute.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.Collections.Generic; -using AutoMapper; - -namespace Volo.Abp.AutoMapper -{ - public class AutoMapAttribute : AutoMapAttributeBase - { - public AutoMapAttribute(params Type[] targetTypes) - : base(targetTypes) - { - - } - - public override void CreateMap(IMapperConfigurationExpression configuration, Type type) - { - if (TargetTypes.IsNullOrEmpty()) - { - return; - } - - foreach (var targetType in TargetTypes) - { - configuration.CreateMap(type, targetType, MemberList.Source); - configuration.CreateMap(targetType, type, MemberList.Destination); - } - } - } -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapAttributeBase.cs b/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapAttributeBase.cs deleted file mode 100644 index 5756347380..0000000000 --- a/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapAttributeBase.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using AutoMapper; - -namespace Volo.Abp.AutoMapper -{ - public abstract class AutoMapAttributeBase : Attribute - { - public Type[] TargetTypes { get; } - - protected AutoMapAttributeBase(params Type[] targetTypes) - { - TargetTypes = targetTypes; - } - - public abstract void CreateMap(IMapperConfigurationExpression configuration, Type type); - } -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapFromAttribute.cs b/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapFromAttribute.cs deleted file mode 100644 index 5e767273e1..0000000000 --- a/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapFromAttribute.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Collections.Generic; -using AutoMapper; - -namespace Volo.Abp.AutoMapper -{ - public class AutoMapFromAttribute : AutoMapAttributeBase - { - public MemberList MemberList { get; set; } = MemberList.Destination; - - public AutoMapFromAttribute(params Type[] targetTypes) - : base(targetTypes) - { - - } - - public AutoMapFromAttribute(MemberList memberList, params Type[] targetTypes) - : this(targetTypes) - { - MemberList = memberList; - } - - public override void CreateMap(IMapperConfigurationExpression configuration, Type type) - { - if (TargetTypes.IsNullOrEmpty()) - { - return; - } - - foreach (var targetType in TargetTypes) - { - configuration.CreateMap(targetType, type, MemberList); - } - } - } -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapToAttribute.cs b/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapToAttribute.cs deleted file mode 100644 index 9b42fd4f46..0000000000 --- a/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapToAttribute.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Collections.Generic; -using AutoMapper; - -namespace Volo.Abp.AutoMapper -{ - public class AutoMapToAttribute : AutoMapAttributeBase - { - public MemberList MemberList { get; set; } = MemberList.Source; - - public AutoMapToAttribute(params Type[] targetTypes) - : base(targetTypes) - { - - } - - public AutoMapToAttribute(MemberList memberList, params Type[] targetTypes) - : this(targetTypes) - { - MemberList = memberList; - } - - public override void CreateMap(IMapperConfigurationExpression configuration, Type type) - { - if (TargetTypes.IsNullOrEmpty()) - { - return; - } - - foreach (var targetType in TargetTypes) - { - configuration.CreateMap(type, targetType, MemberList); - } - } - } -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapperConfigurationExtensions.cs b/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapperConfigurationExtensions.cs deleted file mode 100644 index 579e5181d1..0000000000 --- a/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AutoMapperConfigurationExtensions.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Reflection; -using AutoMapper; - -namespace Volo.Abp.AutoMapper -{ - internal static class AutoMapperConfigurationExtensions - { - public static void CreateAutoAttributeMaps(this IMapperConfigurationExpression configuration, Type type) - { - foreach (var autoMapAttribute in type.GetTypeInfo().GetCustomAttributes()) - { - autoMapAttribute.CreateMap(configuration, type); - } - } - } -} \ No newline at end of file diff --git a/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutofacTestModule.cs b/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapperTestModule.cs similarity index 69% rename from framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutofacTestModule.cs rename to framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapperTestModule.cs index dbac30a805..3d873ccacf 100644 --- a/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutofacTestModule.cs +++ b/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapperTestModule.cs @@ -8,7 +8,10 @@ namespace Volo.Abp.AutoMapper { public override void ConfigureServices(ServiceConfigurationContext context) { - + Configure(options => + { + options.AddMaps(); + }); } } } \ No newline at end of file diff --git a/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapper_ConfigurationValidation_Tests.cs b/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapper_ConfigurationValidation_Tests.cs index dba63ed8c9..7504bd7209 100644 --- a/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapper_ConfigurationValidation_Tests.cs +++ b/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapper_ConfigurationValidation_Tests.cs @@ -30,8 +30,8 @@ namespace Volo.Abp.AutoMapper { Configure(options => { - options.AddProfile(true); - options.AddProfile(); + options.AddMaps(validate: true); //Adds all profiles in the TestModule assembly by validating configurations + options.ValidateProfile(validate: false); //Exclude a profile from the configuration validation }); } } diff --git a/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapper_Inheritance_Tests.cs b/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapper_Inheritance_Tests.cs deleted file mode 100644 index 8d010d829f..0000000000 --- a/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapper_Inheritance_Tests.cs +++ /dev/null @@ -1,75 +0,0 @@ -using AutoMapper; -using Shouldly; -using Xunit; - -namespace Volo.Abp.AutoMapper -{ - public class AutoMapper_Inheritance_Tests - { - private readonly IMapper _mapper; - - public AutoMapper_Inheritance_Tests() - { - var config = new MapperConfiguration(configuration => - { - configuration.CreateAutoAttributeMaps(typeof(MyTargetClassToMap)); - configuration.CreateAutoAttributeMaps(typeof(EntityDto)); - configuration.CreateAutoAttributeMaps(typeof(DerivedEntityDto)); - }); - - _mapper = config.CreateMapper(); - } - - [Fact] - public void Should_Map_Derived_To_Target() - { - var derived = new MyDerivedClass { Value = "fortytwo" }; - var target = _mapper.Map(derived); - target.Value.ShouldBe("fortytwo"); - } - - public class MyBaseClass - { - public string Value { get; set; } - } - - public class MyDerivedClass : MyBaseClass - { - - } - - [AutoMapFrom(typeof(MyBaseClass))] - public class MyTargetClassToMap - { - public string Value { get; set; } - } - - //[Fact] //TODO: That's a problem but related to AutoMapper rather than ABP. - public void Should_Map_EntityProxy_To_EntityDto_And_To_DrivedEntityDto() - { - var proxy = new EntityProxy() { Value = "42"}; - var target = _mapper.Map(proxy); - var target2 = _mapper.Map(proxy); - target.Value.ShouldBe("42"); - target2.Value.ShouldBe("42"); - } - - private class Entity - { - public string Value { get; set; } - } - - private class DerivedEntity : Entity { } - - private class EntityProxy : DerivedEntity { } - - [AutoMapFrom(typeof(Entity))] - private class EntityDto - { - public string Value { get; set; } - } - - [AutoMapFrom(typeof(DerivedEntity))] - private class DerivedEntityDto : EntityDto { } - } -} diff --git a/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapping_Tests.cs b/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapping_Tests.cs deleted file mode 100644 index 58839b30b6..0000000000 --- a/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapping_Tests.cs +++ /dev/null @@ -1,157 +0,0 @@ -using System; -using System.Collections.Generic; -using AutoMapper; -using Shouldly; -using Xunit; - -namespace Volo.Abp.AutoMapper -{ - public class AutoMapping_Tests - { - private readonly IMapper _mapper; - - public AutoMapping_Tests() - { - var config = new MapperConfiguration(configuration => - { - configuration.CreateAutoAttributeMaps(typeof(MyClass1)); - configuration.CreateAutoAttributeMaps(typeof(MyClass2)); - }); - - _mapper = config.CreateMapper(); - } - - [Fact] - public void Map_Null_Tests() - { - MyClass1 obj1 = null; - var obj2 = _mapper.Map(obj1); - obj2.ShouldBe(null); - } - - [Fact] - public void Map_Null_Existing_Object_Tests() - { - MyClass1 obj1 = null; - - var obj2 = new MyClass2 { TestProp = "before map" }; - _mapper.Map(obj1, obj2); - obj2.TestProp.ShouldBe("before map"); - } - - [Fact] - public void MapTo_Tests() - { - var obj1 = new MyClass1 { TestProp = "Test value" }; - - var obj2 = _mapper.Map(obj1); - obj2.TestProp.ShouldBe("Test value"); - - var obj3 = _mapper.Map(obj1); - obj3.TestProp.ShouldBe("Test value"); - } - - [Fact] - public void MapTo_Existing_Object_Tests() - { - var obj1 = new MyClass1 { TestProp = "Test value" }; - - var obj2 = new MyClass2(); - _mapper.Map(obj1, obj2); - obj2.TestProp.ShouldBe("Test value"); - - var obj3 = new MyClass3(); - _mapper.Map(obj2, obj3); - obj3.TestProp.ShouldBe("Test value"); - - Assert.ThrowsAny(() => //Did not define reverse mapping! - { - _mapper.Map(obj3, obj2); - }); - } - - [Fact] - public void MapFrom_Tests() - { - var obj2 = new MyClass2 { TestProp = "Test value" }; - - var obj1 = _mapper.Map(obj2); - obj1.TestProp.ShouldBe("Test value"); - } - - [Fact] - public void IgnoreMap_Tests() - { - var obj2 = new MyClass2 {TestProp = "Test value", AnotherValue = 42}; - var obj3 = _mapper.Map(obj2); - obj3.TestProp.ShouldBe("Test value"); - obj3.AnotherValue.ShouldBe(0); //Ignored because of IgnoreMap attribute! - } - - [Fact] - public void MapTo_Collection_Tests() - { - var list1 = new List - { - new MyClass1 {TestProp = "Test value 1"}, - new MyClass1 {TestProp = "Test value 2"} - }; - - var list2 = _mapper.Map>(list1); - list2.Count.ShouldBe(2); - list2[0].TestProp.ShouldBe("Test value 1"); - list2[1].TestProp.ShouldBe("Test value 2"); - } - - [Fact] - public void Map_Should_Set_Null_Existing_Object_Tests() - { - MyClass1 obj1 = new MyClass1 { TestProp = null }; - var obj2 = new MyClass2 { TestProp = "before map" }; - _mapper.Map(obj1, obj2); - obj2.TestProp.ShouldBe(null); - } - - [Fact] - public void Should_Map_Nullable_Value_To_Null_If_It_Is_Null_On_Source() - { - var obj1 = new MyClass1(); - var obj2 = _mapper.Map(obj1); - obj2.NullableValue.ShouldBeNull(); - } - - [Fact] - public void Should_Map_Nullable_Value_To__Not_Null_If_It_Is__Not_Null_On_Source() - { - var obj1 = new MyClass1 { NullableValue = 42 }; - var obj2 = _mapper.Map(obj1); - obj2.NullableValue.ShouldBe(42); - } - - [AutoMap(typeof(MyClass2), typeof(MyClass3))] - private class MyClass1 - { - public string TestProp { get; set; } - - public long? NullableValue { get; set; } - } - - [AutoMapTo(typeof(MyClass3))] - private class MyClass2 - { - public string TestProp { get; set; } - - public long? NullableValue { get; set; } - - public int AnotherValue { get; set; } - } - - private class MyClass3 - { - public string TestProp { get; set; } - - [IgnoreMap] - public int AnotherValue { get; set; } - } - } -} diff --git a/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntityDto.cs b/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntityDto.cs index 68b57144db..ff01da0cce 100644 --- a/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntityDto.cs +++ b/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntityDto.cs @@ -2,7 +2,6 @@ namespace Volo.Abp.AutoMapper.SampleClasses { - [AutoMap(typeof(MyEntity))] public class MyEntityDto { public Guid Id { get; set; } diff --git a/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyMapProfile.cs b/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyMapProfile.cs new file mode 100644 index 0000000000..a65a7209e2 --- /dev/null +++ b/framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyMapProfile.cs @@ -0,0 +1,12 @@ +using AutoMapper; + +namespace Volo.Abp.AutoMapper.SampleClasses +{ + public class MyMapProfile : Profile + { + public MyMapProfile() + { + CreateMap().ReverseMap(); + } + } +} diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/Person.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/Person.cs index 8235225def..16ac62589e 100644 --- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/Person.cs +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/Person.cs @@ -1,12 +1,10 @@ using System; using System.Collections.ObjectModel; -using Volo.Abp.AutoMapper; using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.MultiTenancy; namespace Volo.Abp.TestApp.Domain { - [AutoMapTo(typeof(PersonEto))] public class Person : FullAuditedAggregateRoot, IMultiTenant { public virtual Guid? TenantId { get; set; } diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/TestAutoMapProfile.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/TestAutoMapProfile.cs new file mode 100644 index 0000000000..8d1c6df146 --- /dev/null +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/TestAutoMapProfile.cs @@ -0,0 +1,12 @@ +using AutoMapper; + +namespace Volo.Abp.TestApp.Domain +{ + public class TestAutoMapProfile : Profile + { + public TestAutoMapProfile() + { + CreateMap().ReverseMap(); + } + } +} diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs index 747218984f..aea5013fef 100644 --- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs @@ -37,6 +37,8 @@ namespace Volo.Abp.TestApp ctx.MapperConfiguration.CreateMap().ReverseMap(); ctx.MapperConfiguration.CreateMap().ReverseMap(); }); + + options.AddMaps(); }); }