Merge pull request #53 from AutoMapper/FixHashConditionals

Ignore converting conditional expressions

Author: TylerCarlson1

src/AutoMapper.Collection.Tests/MapCollectionWithEqualityTests.cs

@@ -163,6 +163,42 @@ public void Should_Be_Fast_With_Large_Lists_SubObject_WrongCollectionType_Should
             a.ShouldThrow<ArgumentException>().Where(x => x.Message.Contains(typeof(ThingSubDto).FullName) && x.Message.Contains(typeof(ThingDto).FullName));
         }
 
+        public void Should_Work_With_Conditionals()
+        {
+            Mapper.Initialize(cfg =>
+            {
+                cfg.AddCollectionMappers();
+                cfg.CreateMap<ClientDto, Client>()
+                    .EqualityComparison((src, dest) => dest.DtoId == 0 ? src.Code == dest.Code : src.Id == dest.DtoId);
+            });
+            
+            var dto = new ClientDto
+            {
+                Code = "abc",
+                Id = 1
+            };
+            var entity = new Client {Code = dto.Code, Id = 42};
+            var entityCollection = new List<Client> {entity};
+
+            Mapper.Map(new[] {dto}, entityCollection);
+
+            entity.ShouldBeEquivalentTo(entityCollection[0]);
+        }
+
+        public class Client
+        {
+            public long Id { get; set; }
+            public string Code { get; set; }
+            public long DtoId { get; set; }
+        }
+
+        public class ClientDto
+        {
+            public long Id { get; set; }
+            public string Code { get; set; }
+        }
+
+
         public void Should_Work_With_Null_Destination()
         {
             var dtos = new List<ThingDto>

src/AutoMapper.Collection/EquivalencyExpression/HashableExpressionsVisitor.cs

@@ -27,6 +27,11 @@ internal static Tuple<List<Expression>, List<Expression>> Expand(ParameterExpres
             return Tuple.Create(visitor._sourceMembers, visitor._destinationMembers);
         }
 
+        protected override Expression VisitConditional(ConditionalExpression node)
+        {
+            return node;
+        }
+
         protected override Expression VisitBinary(BinaryExpression node)
         {
             switch (node.NodeType)