#54 : Map between IEnumerable<> and ICollection<> or IList<>

fluentsprings · Nov 13, 2015 · a144e75 · a144e75
1 parent 46d43aa
commit a144e75
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 29 deletions.
diff --git a/ExpressMapper NET40/SourceTypeMapper.cs b/ExpressMapper NET40/SourceTypeMapper.cs
@@ -112,26 +112,25 @@ private void ProcessProjectingMember(Expression sourceExp, PropertyInfo destProp
                 MappingService.GetMemberQueryableExpression(sourceExp.Type,
                     destProp.PropertyType);
 
-
             var tCol =
                 sourceExp.Type.GetInterfaces()
-                    .FirstOrDefault(t => t.IsGenericType && t.GetGenericTypeDefinition() == typeof (IEnumerable<>)) ??
+                    .FirstOrDefault(t => t.IsGenericType && t.GetGenericTypeDefinition() == typeof(IEnumerable<>)) ??
                 (sourceExp.Type.IsGenericType
                  && sourceExp.Type.GetInterfaces().Any(t => t == typeof(IEnumerable))
                     ? sourceExp.Type
                     : null);
 
             var tnCol = destProp.PropertyType.GetInterfaces()
-                .FirstOrDefault(t => t.IsGenericType && t.GetGenericTypeDefinition() == typeof (IEnumerable<>)) ??
+                .FirstOrDefault(t => t.IsGenericType && t.GetGenericTypeDefinition() == typeof(IEnumerable<>)) ??
                         (destProp.PropertyType.IsGenericType &&
-                         destProp.PropertyType.GetInterfaces().Any(t => t == typeof (IEnumerable))
+                         destProp.PropertyType.GetInterfaces().Any(t => t == typeof(IEnumerable))
                             ? destProp.PropertyType
                             : null);
 
             if (sourceExp.Type != typeof(string) && tCol != null && tnCol != null)
             {
                 var sourceGenericType = sourceExp.Type.GetGenericArguments()[0];
-                var destGenericType = destProp.PropertyType.GetGenericArguments()[0];
+                var destGenericType = destProp.PropertyType.IsArray ? destProp.PropertyType.GetElementType() : destProp.PropertyType.GetGenericArguments()[0];
 
                 var genericMemberQueryableExpression =
                     MappingService.GetMemberQueryableExpression(sourceGenericType,
@@ -140,16 +139,24 @@ private void ProcessProjectingMember(Expression sourceExp, PropertyInfo destProp
 
                 MethodInfo selectMethod = null;
                 foreach (
-                    var p in from m in typeof (Enumerable).GetMethods().Where(m => m.Name == "Select")
-                        from p in m.GetParameters().Where(p => p.Name.Equals("selector"))
-                        where p.ParameterType.GetGenericArguments().Count() == 2
-                        select p)
-                    selectMethod = (MethodInfo) p.Member;
+                    var p in from m in typeof(Enumerable).GetMethods().Where(m => m.Name == "Select")
+                             from p in m.GetParameters().Where(p => p.Name.Equals("selector"))
+                             where p.ParameterType.GetGenericArguments().Count() == 2
+                             select p)
+                    selectMethod = (MethodInfo)p.Member;
 
-                var selectExpression = Expression.Call(
+                Expression selectExpression = Expression.Call(
                     null,
                     selectMethod.MakeGenericMethod(sourceGenericType, destGenericType),
-                    new[] {sourceExp, genericMemberQueryableExpression});
+                    new[] { sourceExp, genericMemberQueryableExpression });
+
+                var destListAndCollTest = typeof(ICollection<>).MakeGenericType(destGenericType).IsAssignableFrom(destProp.PropertyType);
+
+                if (destListAndCollTest)
+                {
+                    var toArrayMethod = typeof(Enumerable).GetMethod("ToList");
+                    selectExpression = Expression.Call(null, toArrayMethod.MakeGenericMethod(destGenericType), selectExpression);
+                }
 
                 _bindingExpressions.Add(destProp.Name,
                     Expression.Bind(destProp, selectExpression));
@@ -166,14 +173,6 @@ where p.ParameterType.GetGenericArguments().Count() == 2
                         Expression.Condition(
                             Expression.Equal(sourceExp, Expression.Constant(null, sourceExp.Type)),
                             Expression.Constant(null, destProp.PropertyType), clearanceExp);
-
-                    //var nullCheckNestedMemberVisitor = new NullCheckNestedMemberVisitor(true);
-                    //nullCheckNestedMemberVisitor.Visit(sourceExp);
-
-                    //expression = nullCheckNestedMemberVisitor.CheckNullExpression != null
-                    //    ? Expression.Condition(nullCheckNestedMemberVisitor.CheckNullExpression,
-                    //        Expression.Constant(null, destProp.PropertyType), expression)
-                    //    : expression;
                 }
                 else
                 {

diff --git a/ExpressMapper.Tests.Projections/ExpressMapper.Tests.Projections.csproj b/ExpressMapper.Tests.Projections/ExpressMapper.Tests.Projections.csproj
@@ -52,6 +52,18 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
+    <Reference Include="System.IO, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.IO.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Runtime.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Threading.Tasks, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Threading.Tasks.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -96,7 +108,9 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ExpressMapper NET40\ExpressMapper NET40.csproj">
@@ -110,6 +124,11 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/ExpressMapper.Tests.Projections/Tests/CollectionPropertyTest.cs b/ExpressMapper.Tests.Projections/Tests/CollectionPropertyTest.cs
@@ -216,7 +216,7 @@ private void InitializeData()
             {
                 Id = catalId,
                 Name = catalName,
-                Categories = new List<CategoryViewModel>
+                Categories = new[]
                 {
                     cat, cat1
                 }
@@ -236,7 +236,7 @@ private void InitializeData()
             {
                 Id = catalId1,
                 Name = catalName1,
-                Categories = new List<CategoryViewModel>
+                Categories = new []
                 {
                     cat, cat1, cat2
                 }
@@ -347,14 +347,14 @@ private List<CatalogueGroupViewModel> SortCollections(List<CatalogueGroupViewMod
                         {
                             if (e.Products != null)
                             {
-                                e.Products = e.Products.OrderBy(p => p.Id);
+                                e.Products = e.Products.OrderBy(p => p.Id).ToList();
                             }
                         }
                             );
-                        v.Categories = v.Categories.OrderBy(f => f.Id);
+                        v.Categories = v.Categories.OrderBy(f => f.Id).ToArray();
                     }
                 });
-                r.Catalogues = r.Catalogues.OrderBy(s => s.Id);
+                r.Catalogues = r.Catalogues.OrderBy(s => s.Id).ToList();
             });
             return list.OrderBy(r => r.Id).ToList();
         }

diff --git a/ExpressMapper.Tests.Projections/ViewModel/CatalogueGroupViewModel.cs b/ExpressMapper.Tests.Projections/ViewModel/CatalogueGroupViewModel.cs
@@ -13,7 +13,7 @@ public CatalogueGroupViewModel()
 
         public Guid Id { get; set; }
         public string Name { get; set; }
-        public IEnumerable<CatalogueViewModel> Catalogues { get; set; }
+        public List<CatalogueViewModel> Catalogues { get; set; }
 
         public bool Equals(CatalogueGroupViewModel other)
         {

diff --git a/ExpressMapper.Tests.Projections/ViewModel/CatalogueViewModel.cs b/ExpressMapper.Tests.Projections/ViewModel/CatalogueViewModel.cs
@@ -12,7 +12,7 @@ public CatalogueViewModel()
         }
         public Guid Id { get; set; }
         public string Name { get; set; }
-        public IEnumerable<CategoryViewModel> Categories { get; set; }
+        public IList<CategoryViewModel> Categories { get; set; }
 
         public bool Equals(CatalogueViewModel other)
         {

diff --git a/ExpressMapper.Tests.Projections/ViewModel/CategoryViewModel.cs b/ExpressMapper.Tests.Projections/ViewModel/CategoryViewModel.cs
@@ -13,7 +13,7 @@ public CategoryViewModel()
         public Guid Id { get; set; }
         public string Name { get; set; }
 
-        public IEnumerable<ProductViewModel> Products { get; set; }
+        public ICollection<ProductViewModel> Products { get; set; }
 
         public bool Equals(CategoryViewModel other)
         {