Merge pull request #84 from AutoMapper/Issue83

Fix for Issue #83. Unusual cast required after upgrading to version 4.0.0.

Author: BlaiseD

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
 
     - name: Set Variables
       run: |
-        echo '::set-env name=VERSION_NUMBER::4.0.1-preview-1'
+        echo '::set-env name=VERSION_NUMBER::4.0.1-preview-2'
         echo '::set-env name=DEPLOY_PACKAGE_URL::https://www.myget.org/F/automapperdev/api/v3/index.json'
         echo '::set-env name=DEPLOY_PACKAGE_API_KEY::${{ secrets.MYGET_CI_API_KEY }}'
         echo '::set-env name=REPO::${{ github.repository }}'

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
 
     - name: Set Variables
       run: |
-        echo '::set-env name=VERSION_NUMBER::4.0.1-preview-1'
+        echo '::set-env name=VERSION_NUMBER::4.0.1-preview-2'
         echo '::set-env name=DEPLOY_PACKAGE_URL::https://api.nuget.org/v3/index.json'
         echo '::set-env name=DEPLOY_PACKAGE_API_KEY::${{ secrets.NUGET_API_KEY }}'
         echo '::set-env name=REPO::${{ github.repository }}'

Directory.Build.props

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

src/AutoMapper.Extensions.ExpressionMapping/XpressionMapperVisitor.cs

@@ -65,7 +65,8 @@ protected override Expression VisitMember(MemberExpression node)
                                 ((ConstantExpression)baseExpression).Value,
                                 node.GetPropertyFullName(),
                                 baseExpression.Type
-                            )
+                            ),
+                            node.Type
                         )
                     );
                 }

tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/XpressionMapper.Structs.Tests.cs

@@ -165,6 +165,57 @@ public void Can_map_listeral_child_property_of_local_variable_in_filter()
             //Assert
             Assert.NotNull(mappedfilter);
         }
+
+        [Fact]
+        public void Can_map_local_variable_literal_in_filter()
+        {
+            // Arrange
+            var config = new MapperConfiguration(c =>
+            {
+                c.CreateMap<ItemWithDateLiteral, ItemWithDateLiteralDto>()
+                .ForMember(dest => dest.CreateDate, opts => opts.MapFrom(x => x.Date));
+            });
+
+            config.AssertConfigurationIsValid();
+            var mapper = config.CreateMapper();
+
+            DateTime firstReleaseDate = new DateTime();
+            DateTime lastReleaseDate = new DateTime();
+
+            Expression<Func<ItemWithDateLiteralDto, bool>> exp = x => (firstReleaseDate == null || x.CreateDate >= firstReleaseDate) &&
+                                      (lastReleaseDate == null || x.CreateDate <= lastReleaseDate);
+
+            //Act
+            Expression<Func<ItemWithDateLiteral, bool>> expMapped = mapper.MapExpression<Expression<Func<ItemWithDateLiteral, bool>>>(exp);
+
+            //Assert
+            Assert.NotNull(expMapped);
+        }
+
+        [Fact]
+        public void Can_map_local_variable_nullable_in_filter()
+        {
+            // Arrange
+            var config = new MapperConfiguration(c =>
+            {
+                c.CreateMap<ItemWithDateLiteral, ItemWithDateLiteralDto>()
+                .ForMember(dest => dest.CreateDate, opts => opts.MapFrom(x => x.Date));
+            });
+
+            config.AssertConfigurationIsValid();
+            var mapper = config.CreateMapper();
+            DateTime? firstReleaseDate = new DateTime();
+            DateTime? lastReleaseDate = new DateTime();
+
+            Expression<Func<ItemWithDateLiteralDto, bool>> exp = x => (firstReleaseDate == null || x.CreateDate >= firstReleaseDate) &&
+                                      (lastReleaseDate == null || x.CreateDate <= lastReleaseDate);
+
+            //Act
+            Expression<Func<ItemWithDateLiteral, bool>> expMapped = mapper.MapExpression<Expression<Func<ItemWithDateLiteral, bool>>>(exp);
+
+            //Assert
+            Assert.NotNull(expMapped);
+        }
     }
 
     public struct Source
@@ -372,6 +423,16 @@ public override int GetHashCode()
         }
     }
 
+    public struct ItemWithDateLiteralDto
+    {
+        public DateTime CreateDate { get; set; }
+    }
+
+    public struct ItemWithDateLiteral
+    {
+        public DateTime Date { get; set; }
+    }
+
     static class Extensions
     {
         internal static ICollection<TModel> GetItems<TModel, TData>(this IQueryable<TData> query, IMapper mapper,

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

@@ -703,6 +703,54 @@ public void Map_accountModel_to_account()
             Assert.True(accounts.Count == 2);
         }
 
+        [Fact]
+        public void Map_accountModel_to_account_with_local_nullables()
+        {
+            DateTime? firstReleaseDate = null;
+            DateTime? lastReleaseDate = null;
+
+            Expression<Func<AccountModel, bool>> exp = x => (firstReleaseDate == null || x.DateCreated >= firstReleaseDate) &&
+                                      (lastReleaseDate == null || x.DateCreated <= lastReleaseDate);
+
+            //Act
+            Expression<Func<Account, bool>> expMapped = mapper.MapExpression<Expression<Func<Account, bool>>>(exp);
+
+            //Assert
+            Assert.NotNull(expMapped);
+        }
+
+        [Fact]
+        public void Map_ItemDto_to_ItemDto_with_local_nullables()
+        {
+            DateTime? firstReleaseDate = new DateTime();
+            DateTime? lastReleaseDate = new DateTime();
+
+            Expression<Func<ItemDto, bool>> exp = x => (firstReleaseDate == null || x.CreateDate >= firstReleaseDate) &&
+                                      (lastReleaseDate == null || x.CreateDate <= lastReleaseDate);
+
+            //Act
+            Expression<Func<Item, bool>> expMapped = mapper.MapExpression<Expression<Func<Item, bool>>>(exp);
+
+            //Assert
+            Assert.NotNull(expMapped);
+        }
+
+        [Fact]
+        public void Map_ItemDto_to_ItemDto_with_local_literal_types()
+        {
+            DateTime firstReleaseDate = new DateTime();
+            DateTime lastReleaseDate = new DateTime();
+
+            Expression<Func<ItemDto, bool>> exp = x => (firstReleaseDate == null || x.CreateDate >= firstReleaseDate) &&
+                                      (lastReleaseDate == null || x.CreateDate <= lastReleaseDate);
+
+            //Act
+            Expression<Func<Item, bool>> expMapped = mapper.MapExpression<Expression<Func<Item, bool>>>(exp);
+
+            //Assert
+            Assert.NotNull(expMapped);
+        }
+
         [Fact]
         public void Map_accountModel_to_account_with_null_checks_against_value_types()
         {