Merge pull request #47 from BlaiseD/master

Fix for Issue #45 (Mapping of conditional expressions throws a null reference exception)

Author: BlaiseD

AutoMapper.Extensions.ExpressionMapping.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2020
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29001.49
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoMapper.Extensions.ExpressionMapping", "src\AutoMapper.Extensions.ExpressionMapping\AutoMapper.Extensions.ExpressionMapping.csproj", "{24DF305C-EE59-460A-BA97-4B7CD5505434}"
 EndProject

Directory.Build.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Authors>Jimmy Bogard</Authors>
     <LangVersion>latest</LangVersion>
-    <VersionPrefix>3.0.2</VersionPrefix>
+    <VersionPrefix>3.0.3-preview01</VersionPrefix>
     <WarningsAsErrors>true</WarningsAsErrors>
     <NoWarn>$(NoWarn);1701;1702;1591</NoWarn>
   </PropertyGroup>

src/AutoMapper.Extensions.ExpressionMapping/Extensions/VisitorExtensions.cs

@@ -48,6 +48,9 @@ private static bool IsMemberOrParameterExpression(Expression expression)
         /// <returns></returns>
         public static string GetPropertyFullName(this Expression expression)
         {
+            if (expression == null)
+                return string.Empty;
+
             const string period = ".";
 
             //the node represents parameter of the expression

tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/XpressionMapperTests.cs

@@ -757,6 +757,19 @@ public void Can_map_expression_when_mapped_when_members_parent_is_a_method()
             //Assert
             Assert.True(res.Count == 1);
         }
+
+        [Fact]
+        public void Can_map_expression_with_condittional_logic_while_deflattening()
+        {
+            /*
+             CreateMap<TestEntity, TestDTO>()
+                .ForMember(dst => dst.NestedClass, opt => opt.MapFrom(src => src.ConditionField == 1 ? src : default));*/
+            Expression<Func<TestDTO, bool>> expr = x => x.NestedClass.NestedField == 1;
+
+            var mappedExpression = mapper.MapExpression<Expression<Func<TestEntity, bool>>>(expr);
+
+            Assert.NotNull(mappedExpression);
+        }
         #endregion Tests
 
         private static void SetupAutoMapper()
@@ -1192,6 +1205,23 @@ internal class EventModel
         public DateTime EventDate { get; set; }
     }
 
+    public class TestEntity
+    {
+        public Guid Id { get; set; }
+        public int ConditionField { get; set; }
+        public int ToBeNestedField { get; set; }
+    }
+
+    public class TestDTO
+    {
+        public Guid Id { get; set; }
+        public TestDTONestedClass NestedClass { get; set; }
+    }
+    public class TestDTONestedClass
+    {
+        public int? NestedField { get; set; }
+    }
+
     public class OrganizationProfile : Profile
     {
         public OrganizationProfile()
@@ -1297,6 +1327,13 @@ public OrganizationProfile()
 
             CreateMap<EmployeeModel, EmployeeEntity>().ReverseMap();
             CreateMap<EventModel, EventEntity>().ReverseMap();
+
+            CreateMap<TestEntity, TestDTO>()
+                .ForMember(dst => dst.Id, opt => opt.MapFrom(src => src.Id))
+                .ForMember(dst => dst.NestedClass, opt => opt.MapFrom(src => src.ConditionField == 1 ? src : default));
+
+            CreateMap<TestEntity, TestDTONestedClass>()
+                .ForMember(dst => dst.NestedField, opt => opt.MapFrom(src => (int?)src.ToBeNestedField));
         }
     }