Merge pull request #16 from agileobjects/Issue14

Merge branch Issue14 to master

Author: SteveWilkes

AgileMapper.UnitTests/Configuration/WhenConfiguringDataSources.cs

@@ -860,5 +860,40 @@ public void ShouldRestrictConfigurationApplicationByMappingRuleSet()
                 overwriteResult.Value.ShouldBe(source.Value);
             }
         }
+
+        // See https://github.com/agileobjects/AgileMapper/issues/14
+        [Fact]
+        public void ShouldAllowIdAndIdentifierConfiguration()
+        {
+            using (var mapper = Mapper.CreateNew())
+            {
+                mapper.WhenMapping
+                    .From<PublicTwoFields<int, int>>()
+                    .To<IdTester>()
+                    .Map((ptf, id) => ptf.Value1)
+                    .To(id => id.ClassId)
+                    .And
+                    .Map((ptf, id) => ptf.Value2)
+                    .To(id => id.ClassIdentifier);
+
+                var source = new PublicTwoFields<int, int>
+                {
+                    Value1 = 123,
+                    Value2 = 987
+                };
+
+                var result = mapper.Map(source).ToANew<IdTester>();
+
+                result.ClassId.ShouldBe(123);
+                result.ClassIdentifier.ShouldBe(987);
+            }
+        }
+
+        private class IdTester
+        {
+            public int ClassId { get; set; }
+
+            public int ClassIdentifier { get; set; }
+        }
     }
 }

AgileMapper/Configuration/UserConfiguredItemBase.cs

@@ -55,12 +55,15 @@ public virtual bool ConflictsWith(UserConfiguredItemBase otherConfiguredItem)
 
             if (ConfigInfo.HasCompatibleTypes(otherConfiguredItem.ConfigInfo))
             {
-                return TargetMember.Matches(otherConfiguredItem.TargetMember);
+                return MembersConflict(otherConfiguredItem.TargetMember);
             }
 
             return false;
         }
 
+        protected virtual bool MembersConflict(QualifiedMember otherMember)
+            => TargetMember.Matches(otherMember);
+
         protected bool SourceAndTargetTypesAreTheSame(UserConfiguredItemBase otherConfiguredItem)
         {
             return ConfigInfo.HasSameSourceTypeAs(otherConfiguredItem.ConfigInfo) &&

AgileMapper/DataSources/ConfiguredDataSourceFactory.cs

@@ -1,5 +1,6 @@
 namespace AgileObjects.AgileMapper.DataSources
 {
+    using System.Linq;
     using System.Linq.Expressions;
     using Configuration;
     using Members;
@@ -48,6 +49,9 @@ public override bool ConflictsWith(UserConfiguredItemBase otherConfiguredItem)
             return _dataSourceLambda.IsSameAs(otherDataSource._dataSourceLambda);
         }
 
+        protected override bool MembersConflict(QualifiedMember otherMember)
+            => TargetMember.LeafMember.Equals(otherMember.LeafMember);
+
         public IConfiguredDataSource Create(IMemberMapperData mapperData)
         {
             var configuredCondition = GetConditionOrNull(mapperData);