Merge pull request #7666 from iyilm4z/MapExtraPropertiesToRegularProperties

Map ExtraProperties of an entity to regular properties of a type-safe dto

framework/src/Volo.Abp.AutoMapper/AutoMapper/AbpAutoMapperExtensibleDtoExtensions.cs

@@ -10,7 +10,8 @@ namespace AutoMapper
         public static IMappingExpression<TSource, TDestination> MapExtraProperties<TSource, TDestination>(
             this IMappingExpression<TSource, TDestination> mappingExpression,
             MappingPropertyDefinitionChecks? definitionChecks = null,
-            string[] ignoredProperties = null)
+            string[] ignoredProperties = null,
+            bool mapToRegularProperties = false)
             where TDestination : IHasExtraProperties
             where TSource : IHasExtraProperties
         {
@@ -34,9 +35,16 @@ namespace AutoMapper
 
                             return result;
                         })
-                );
+                )
+                .AfterMap((source, destination, context) =>
+                {
+                    if (mapToRegularProperties)
+                    {
+                        destination.SetExtraPropertiesToRegularProperties();
+                    }
+                });
         }
-        
+
         public static IMappingExpression<TSource, TDestination> IgnoreExtraProperties<TSource, TDestination>(
             this IMappingExpression<TSource, TDestination> mappingExpression)
             where TDestination : IHasExtraProperties

framework/src/Volo.Abp.ObjectExtending/Volo/Abp/Data/HasExtraPropertiesExtensions.cs

@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
-using Volo.Abp.DynamicProxy;
+using System.Linq;
-using Volo.Abp.Localization;
 using Volo.Abp.ObjectExtending;
 using Volo.Abp.Reflection;
 
@@ -106,7 +105,21 @@ namespace Volo.Abp.Data
                 throw new ArgumentException($"Given {nameof(source)} object does not implement the {nameof(IHasExtraProperties)} interface!", nameof(source));
             }
 
-            ((IHasExtraProperties) source).SetDefaultsForExtraProperties(objectType);
+            ((IHasExtraProperties)source).SetDefaultsForExtraProperties(objectType);
+        }
+
+        public static void SetExtraPropertiesToRegularProperties(this IHasExtraProperties source)
+        {
+            var properties = source.GetType().GetProperties()
+                .Where(x => source.ExtraProperties.ContainsKey(x.Name)
+                            && x.GetSetMethod(true) != null)
+                .ToList();
+
+            foreach (var property in properties)
+            {
+                property.SetValue(source, source.ExtraProperties[property.Name]);
+                source.RemoveProperty(property.Name);
+            }
         }
     }
 }

framework/test/Volo.Abp.AutoMapper.Tests/AutoMapper/AbpAutoMapperExtensibleDtoExtensions_Tests.cs

@@ -39,5 +39,30 @@ namespace AutoMapper
             personDto.HasProperty("Age").ShouldBeFalse(); //Not defined on the destination
             personDto.HasProperty("Sex").ShouldBeFalse(); //Not defined in both classes
         }
+
+        [Fact]
+        public void MapExtraProperties_Also_Should_Map_To_RegularProperties()
+        {
+            var person = new ExtensibleTestPerson()
+                .SetProperty("Name", "John")
+                .SetProperty("Age", 42);
+
+            var personDto = new ExtensibleTestPersonWithRegularPropertiesDto()
+                .SetProperty("IsActive", true);
+
+            _objectMapper.Map(person, personDto);
+
+            //Defined in both classes
+            personDto.HasProperty("Name").ShouldBe(false);
+            personDto.Name.ShouldBe("John");
+
+            //Defined in both classes
+            personDto.HasProperty("Age").ShouldBe(false);
+            personDto.Age.ShouldBe(42);
+
+            //Should not clear existing values
+            personDto.HasProperty("IsActive").ShouldBe(false);
+            personDto.IsActive.ShouldBe(true);
+        }
     }
 }

framework/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyMapProfile.cs

@@ -11,6 +11,12 @@ namespace Volo.Abp.AutoMapper.SampleClasses
 
             CreateMap<ExtensibleTestPerson, ExtensibleTestPersonDto>()
                 .MapExtraProperties(ignoredProperties: new[] { "CityName" });
+
+            CreateMap<ExtensibleTestPerson, ExtensibleTestPersonWithRegularPropertiesDto>()
+                .ForMember(x => x.Name, y => y.Ignore())
+                .ForMember(x => x.Age, y => y.Ignore())
+                .ForMember(x => x.IsActive, y => y.Ignore())
+                .MapExtraProperties(mapToRegularProperties: true);
         }
     }
 }

framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/AbpObjectExtendingTestModule.cs

@@ -23,7 +23,9 @@ namespace Volo.Abp.ObjectExtending
                     .AddOrUpdateProperty<ExtensibleTestPerson, string>("CityName")
                     .AddOrUpdateProperty<ExtensibleTestPersonDto, string>("Name")
                     .AddOrUpdateProperty<ExtensibleTestPersonDto, int>("ChildCount")
-                    .AddOrUpdateProperty<ExtensibleTestPersonDto, string>("CityName");
+                    .AddOrUpdateProperty<ExtensibleTestPersonDto, string>("CityName")
+                    .AddOrUpdateProperty<ExtensibleTestPersonWithRegularPropertiesDto, string>("Name")
+                    .AddOrUpdateProperty<ExtensibleTestPersonWithRegularPropertiesDto, int>("Age");
             });
         }
     }

framework/test/Volo.Abp.ObjectExtending.Tests/Volo/Abp/ObjectExtending/TestObjects/ExtensibleTestPersonWithRegularPropertiesDto.cs

@@ -0,0 +1,11 @@
+namespace Volo.Abp.ObjectExtending.TestObjects
+{
+    public class ExtensibleTestPersonWithRegularPropertiesDto : ExtensibleObject
+    {
+        public string Name { get; set; }
+
+        public int Age { get; set; }
+
+        public bool IsActive { get; set; }
+    }
+}