Merge pull request #629 from rafalka/bugfix/628-custom-coversion-igno…

…red-when-ShallowCopyForSameType-is-set Not using shallow copy if mapping rule exists
MapsterMapper · Sep 21, 2023 · c337c95 · c337c95
2 parents c49bc32 + a984fc7
commit c337c95
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 2 deletions.
diff --git a/src/Mapster.Tests/WhenSettingMapToTargetWith.cs b/src/Mapster.Tests/WhenSettingMapToTargetWith.cs
@@ -17,13 +17,40 @@ public void MapToTargetWith_Should_Work_With_Adapt_To_Target()
             var a = new Foo { A = 1 };
             var b = new Bar { A = 2 };
 
-            //This will not work as expected => b.A will be 1, ignoring the mapping defined
             var config = new TypeAdapterConfig();
+            config.Default.ShallowCopyForSameType(true);
+
             config.NewConfig<double, double>().MapToTargetWith((x, y) => 5);
             a.Adapt(b, config);
             b.A.ShouldBe(5);
         }
 
+        [TestMethod]
+        public void MapWith_Should_Work_With_Adapt_To_Target()
+        {
+            var a = new List<double> {1, 2, 3};
+
+            var config = new TypeAdapterConfig();
+            config.Default.ShallowCopyForSameType(true);
+
+            config.NewConfig<double, double>().MapWith(_ => 5);
+            var b = a.Adapt<List<double>>(config);
+            b.ShouldBe(new List<double>{ 5, 5, 5});
+        }
+
+        [TestMethod]
+        public void MapWith_Should_Work_With_Adapt_To_Target_For_Collection()
+        {
+            var a = new List<double> {1, 2, 3};
+
+            var config = new TypeAdapterConfig();
+            config.Default.ShallowCopyForSameType(true);
+
+            config.NewConfig<List<double>, List<double>>().MapWith(_ => new List<double>{ 5, 5, 5});
+            var b = a.Adapt<List<double>>(config);
+            b.ShouldBe(new List<double>{ 5, 5, 5});
+        }
+
         internal class Foo
         {
             public double A { get; set; }

diff --git a/src/Mapster/Adapters/BaseAdapter.cs b/src/Mapster/Adapters/BaseAdapter.cs
@@ -455,7 +455,8 @@ internal Expression CreateAdaptExpression(Expression source, Type destinationTyp
 
             //adapt(source);
             var notUsingDestinationValue = mapping is not { UseDestinationValue: true };
-            var exp = source.Type == destinationType && arg.Settings.ShallowCopyForSameType == true && notUsingDestinationValue
+            var exp = source.Type == destinationType && arg.Settings.ShallowCopyForSameType == true && notUsingDestinationValue &&
+                      !arg.Context.Config.HasRuleFor(source.Type, destinationType)
                 ? source
                 : CreateAdaptExpressionCore(source, destinationType, arg, mapping, destination);
 

diff --git a/src/Mapster/Utils/TypeAdapterConfigExtensions.cs b/src/Mapster/Utils/TypeAdapterConfigExtensions.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using Mapster.Models;
 
 namespace Mapster.Utils;
 
@@ -27,4 +28,7 @@ internal static void ScanInheritedTypes(this TypeAdapterConfig config, List<Type
         InterfaceDynamicMapper dynamicMapper = new(config, types);
         dynamicMapper.ApplyMappingFromAssembly();
     }
+
+    public static bool HasRuleFor(this TypeAdapterConfig config, Type srcType, Type dstType) =>
+        config.RuleMap.ContainsKey(new TypeTuple(srcType, dstType));
 }