fix regression in interfaces mapping

MapsterMapper · Jan 7, 2025 · 2c430e9 · 2c430e9
1 parent c620ed9
commit 2c430e9
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 1 deletion.
diff --git a/src/Mapster.Tests/WhenMappingToInterface.cs b/src/Mapster.Tests/WhenMappingToInterface.cs
@@ -3,6 +3,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json.Serialization;
+using Newtonsoft.Json;
 
 namespace Mapster.Tests
 {
@@ -266,6 +268,27 @@ public void MappingToInteraceWithReadonlyProps_AllPropsInitialized()
             );
         }
 
+        [TestMethod]
+        public void MappingToInterface_VerifyReadonlyPropsInterfaceRule()
+        {
+            SampleInterfaceCls source = new SampleInterfaceCls
+            {
+                ActivityData = new SampleActivityData
+                {
+                    Data = new SampleActivityParsedData
+                    {
+                        Steps = new List<string> { "A", "B", "C" }
+                    }
+                }
+            };
+
+            SampleInterfaceCls target = source.Adapt<SampleInterfaceCls>();
+            target.ShouldNotBeNull();
+            target.ShouldSatisfyAllConditions(
+                () => target.ActivityData.ShouldBe(source.ActivityData)
+            );
+        }
+
         public interface IInheritedDtoWithoutProperties : IInheritedDto
         {
         }
@@ -374,6 +397,42 @@ public class PropertyInitializationTestSource
             public int Property1 { get; set; }
             public int Property2 { get; set; }
         }
+
+        public interface IActivityData
+        {
+
+        }
+
+        public class SampleInterfaceCls
+        {
+            [Newtonsoft.Json.JsonIgnore]
+            public IActivityData? ActivityData { get; set; }
+
+            public SampleInterfaceCls()
+            {
+
+            }
+
+            public SampleInterfaceCls(IActivityData data)
+            {
+                SetActivityData(data);
+            }
+
+            public void SetActivityData(IActivityData data)
+            {
+                ActivityData = data;
+            }
+        }
+
+        public class SampleActivityData : IActivityData
+        {
+            public SampleActivityParsedData Data { get; set; }
+        }
+
+        public class SampleActivityParsedData
+        {
+            public List<string> Steps { get; set; } = new List<string>();
+        }
 
     }
 }
diff --git a/src/Mapster/Adapters/ReadOnlyInterfaceAdapter.cs b/src/Mapster/Adapters/ReadOnlyInterfaceAdapter.cs
@@ -10,7 +10,7 @@ internal class ReadOnlyInterfaceAdapter : ClassAdapter
 
         protected override bool CanMap(PreCompileArgument arg)
         {
-            return arg.DestinationType.IsInterface;
+            return arg.DestinationType.IsInterface && arg.DestinationType.GetProperties().Length > 0;
         }
 
         protected override bool CanInline(Expression source, Expression? destination, CompileArgument arg)