fix #263 fix when source path is Dictionary

MapsterMapper · Aug 19, 2020 · 27babf3 · 27babf3
1 parent e3872a1
commit 27babf3
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/src/Mapster.Tests/WhenMappingWithPath.cs b/src/Mapster.Tests/WhenMappingWithPath.cs
@@ -178,6 +178,20 @@ public void TestMappingToSelf()
             p1.Secret.ShouldBeNull();
         }
 
+        [TestMethod]
+        public void TestMappingFromDictionary()
+        {
+            var config = new TypeAdapterConfig();
+            config.NewConfig<Post, Post>()
+                .Map(nameof(Post.Dic) + ".Name", nameof(Post.Dic) + ".Name");
+
+            var p1 = new Post{ Dic = new Dictionary<string, string> { { "Name", "test"}, {"Secret" , "password" }} };
+            var p2 = new Post();
+            p1.Adapt(p2, config);
+
+            p2.Dic["Name"].ShouldBe("test");
+        }
+
         public class Poco
         {
             public Guid Id { get; set; }

diff --git a/src/Mapster/Settings/ValueAccessingStrategy.cs b/src/Mapster/Settings/ValueAccessingStrategy.cs
@@ -28,7 +28,7 @@ public static class ValueAccessingStrategy
         {
             var config = arg.Settings;
             var resolvers = config.Resolvers;
-            if (resolvers == null || resolvers.Count == 0)
+            if (resolvers.Count == 0)
                 return null;
 
             var invokes = new List<Tuple<Expression, Expression>>();
@@ -205,7 +205,7 @@ private static IEnumerable<string> GetDeepUnflattening(IMemberModel destinationM
         {
             var config = arg.Settings;
             var resolvers = config.Resolvers;
-            if (resolvers == null || resolvers.Count == 0)
+            if (resolvers.Count == 0)
                 return null;
             var dictType = source.Type.GetDictionaryType();
             if (dictType == null)

diff --git a/src/Mapster/Utils/ExpressionEx.cs b/src/Mapster/Utils/ExpressionEx.cs
@@ -26,6 +26,16 @@ public static Expression PropertyOrFieldPath(Expression expr, string path)
         private static Expression PropertyOrField(Expression expr, string prop)
         {
             var type = expr.Type;
+            var dictType = type.GetDictionaryType();
+            if (dictType?.GetGenericArguments()[0] == typeof(string))
+            {
+                var method = typeof(MapsterHelper).GetMethods()
+                    .First(m => m.Name == nameof(MapsterHelper.GetValueOrDefault) && m.GetParameters()[0].ParameterType.Name == dictType.Name)
+                    .MakeGenericMethod(dictType.GetGenericArguments());
+
+                return Expression.Call(method, expr.To(type), Expression.Constant(prop));
+            }
+
             if (type.GetTypeInfo().IsInterface)
             {
                 var allTypes = type.GetAllInterfaces();