Fixes #149 (#148)

Co-authored-by: Stéphane Mitermite <[email protected]>

Author: kakone

src/AutoMapper.Extensions.ExpressionMapping/MapIncludesVisitor.cs

@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Reflection;
-using AutoMapper.Internal;
 using AutoMapper.Extensions.ExpressionMapping.Extensions;
 using AutoMapper.Extensions.ExpressionMapping.Structures;
 
@@ -18,6 +16,9 @@ public MapIncludesVisitor(IMapper mapper, IConfigurationProvider configurationPr
 
         protected override Expression VisitLambda<T>(Expression<T> node)
         {
+            if (!node.Body.Type.IsLiteralType())
+                return base.VisitLambda(node);
+
             var ex = this.Visit(node.Body);
 
             var mapped = Expression.Lambda(ex, node.GetDestinationParameterExpressions(this.InfoDictionary, this.TypeMappings));
@@ -27,6 +28,9 @@ protected override Expression VisitLambda<T>(Expression<T> node)
 
         protected override Expression VisitMember(MemberExpression node)
         {
+            if (!node.Type.IsLiteralType())
+                return base.VisitMember(node);
+
             var parameterExpression = node.GetParameterExpression();
             if (parameterExpression == null)
                 return base.VisitMember(node);

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

@@ -147,6 +147,20 @@ public void Map_includes_trim_string_nested_in_select_using_explicit_types()
             Assert.True(cars.Count == 4);
         }
 
+        private static bool IncludeTest<T, TProperty>(IQueryable<T> model, Expression<Func<T, TProperty>> navigationPropertyPath)
+        {
+            return !model.Equals(navigationPropertyPath);
+        }
+
+        [Fact]
+        public void Map_includes_with_include_method_call()
+        {
+            Expression<Func<IQueryable<PurchaseOrderDTO>, bool>> selection = s => IncludeTest(s, s => s.ValidLines);
+            var expression = mapper.MapExpressionAsInclude<Expression<Func<IQueryable<PurchaseOrder>, bool>>>(selection);
+
+            Assert.True(expression.Compile()(new List<PurchaseOrder>() { new PurchaseOrder() }.AsQueryable()));
+        }
+
         [Fact]
         public void Map_object_type_change()
         {
@@ -625,8 +639,8 @@ public void Map_orderBy_thenBy_To_Dictionary_Select_expression_without_generic_t
             //Act
             Expression<Func<IQueryable<User>, IEnumerable<object>>> expMapped = (Expression<Func<IQueryable<User>, IEnumerable<object>>>)mapper.MapExpression
             (
-                grouped, 
-                typeof(Expression<Func<IQueryable<UserModel>, IEnumerable<object>>>), 
+                grouped,
+                typeof(Expression<Func<IQueryable<UserModel>, IEnumerable<object>>>),
                 typeof(Expression<Func<IQueryable<User>, IEnumerable<object>>>)
             );
 
@@ -1019,7 +1033,7 @@ public void Can_map_expression_with_multiple_destination_parameters_of_the_same_
 
             Assert.Equal
             (//parameters ch and c are of the same type
-                "c => ((c.Finished == null) AndAlso Not(c.Part.History.Any(ch => (ch.Started > c.Started))))", 
+                "c => ((c.Finished == null) AndAlso Not(c.Part.History.Any(ch => (ch.Started > c.Started))))",
                 mappedExpression.ToString()
             );
         }
@@ -1094,7 +1108,7 @@ private static void SetupQueryableCollection()
                             new Thing { Bar = "Bar4", Car = new Car { Color = "White", Year = 2015 } }
                         },
                         Type = "Business",
-                        Users = new User[] 
+                        Users = new User[]
                         {
                             new User
                             {
@@ -1265,6 +1279,16 @@ public interface IUserModel : IIdentifiable
         bool IsActive { get; set; }
     }
 
+    public class PurchaseOrder
+    {
+        public IList<OrderLine> Lines { get; set; }
+    }
+
+    public class PurchaseOrderDTO
+    {
+        public IEnumerable<OrderLineDTO> ValidLines { get; set; }
+    }
+
     public class OrderLine
     {
         public int Id { get; set; }
@@ -1415,7 +1439,7 @@ class ItemEntity
         public string Name { get; set; }
     }
 
-    class ListParentExtension 
+    class ListParentExtension
     {
         public ListExtension List { get; set; }
     }
@@ -1588,6 +1612,9 @@ public OrganizationProfile()
             CreateMap<Item, ItemDto>()
                 .ForMember(dest => dest.CreateDate, opts => opts.MapFrom(x => x.Date));
 
+            CreateMap<PurchaseOrder, PurchaseOrderDTO>()
+                .ForMember(d => d.ValidLines, opt => opt.MapFrom(s => s.Lines.Where(l => l.Quantity > 0)));
+
             CreateMap<OrderLine, ItemDTO>()
                 .ForMember(dto => dto.Name, conf => conf.MapFrom(src => src.ItemName));
             CreateMap<OrderLine, OrderLineDTO>()