Fix expand with nested filer on model without default constructor (Au…

…toMapper#217)
NetanelPersik · Jul 6, 2024 · 675de06 · 675de06
1 parent d091a40
commit 675de06
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 1 deletion.
diff --git a/AutoMapper.AspNetCore.OData.EFCore/Visitors/ProjectionVisitor.cs b/AutoMapper.AspNetCore.OData.EFCore/Visitors/ProjectionVisitor.cs
@@ -26,7 +26,7 @@ protected override Expression VisitMemberInit(MemberInitExpression node)
 
             return Expression.MemberInit
             (
-                Expression.New(node.Type),
+                Expression.New(node.NewExpression.Constructor, node.NewExpression.Arguments),
                 node.Bindings.OfType<MemberAssignment>().Aggregate
                 (
                     new List<MemberBinding>(),

diff --git a/AutoMapper.OData.EFCore.Tests/Data/DataClasses.cs b/AutoMapper.OData.EFCore.Tests/Data/DataClasses.cs
@@ -69,6 +69,19 @@ public class Category
         public IQueryable<Product> QueryableProducts { get; set; }
     }
 
+    public class SuperCategory
+    {
+        public SuperCategory(string superCategoryName)
+        {
+            SuperCategoryName = superCategoryName;
+        }
+
+        public int SuperCategoryID { get; set; }
+        public string SuperCategoryName { get; set; }
+
+        public IEnumerable<Category> Categories { get; set; }
+    }
+
     public class CompositeKey
     {        
         public int ID1 { get; set; }        

diff --git a/AutoMapper.OData.EFCore.Tests/GetQueryTests.cs b/AutoMapper.OData.EFCore.Tests/GetQueryTests.cs
@@ -1334,6 +1334,51 @@ static void Test(ICollection<CategoryModel> collection)
             }
         }
 
+        private IQueryable<SuperCategory> GetSuperCategories()
+         => new SuperCategory[]
+            {
+                new SuperCategory("SuperCategoryOne")
+                {
+                    SuperCategoryID = 1,
+                    Categories = GetCategories()
+                },
+                new SuperCategory("SuperCategoryTwo")
+                {
+                    SuperCategoryID = 2,
+                    Categories = Enumerable.Empty<Category>()
+                }
+            }.AsQueryable();
+
+        [Fact]
+        public async void ExpandChildCollectionWithNoDefaultConstructorNoFilter()
+        {
+            const string query = "/SuperCategoryModel?$expand=Categories";
+            Test(await GetAsync<SuperCategoryModel, SuperCategory>(query, GetSuperCategories()));
+            Test(await GetUsingCustomNameSpace<SuperCategoryModel, SuperCategory>(query, GetSuperCategories()));
+            Test(Get<SuperCategoryModel, SuperCategory>(query, GetSuperCategories()));
+
+            static void Test(ICollection<SuperCategoryModel> collection)
+            {
+                Assert.NotEmpty(collection.First().Categories);
+                Assert.Empty(collection.Last().Categories);
+            }
+        }
+
+        [Fact]
+        public async void ExpandChildCollectionWithNoDefaultConstructorNestedFilter()
+        {
+            const string query = "/SuperCategoryModel?$expand=Categories($filter=CategoryName eq 'CategoryOne')";
+            Test(await GetAsync<SuperCategoryModel, SuperCategory>(query, GetSuperCategories()));
+            Test(await GetUsingCustomNameSpace<SuperCategoryModel, SuperCategory>(query, GetSuperCategories()));
+            Test(Get<SuperCategoryModel, SuperCategory>(query, GetSuperCategories()));
+
+            static void Test(ICollection<SuperCategoryModel> collection)
+            {
+                Assert.Single(collection.First().Categories);
+                Assert.Empty(collection.Last().Categories);
+            }
+        }
+
         [Fact]
         public async Task CancellationThrowsException()
         {

diff --git a/AutoMapper.OData.EFCore.Tests/Mappings/ObjectMappings.cs b/AutoMapper.OData.EFCore.Tests/Mappings/ObjectMappings.cs
@@ -15,6 +15,8 @@ public ObjectMappings()
                 .ForAllMembers(o => o.ExplicitExpansion());
             CreateMap<Category, CategoryModel>()
                 .ForAllMembers(o => o.ExplicitExpansion());
+            CreateMap<SuperCategory, SuperCategoryModel>()
+                .ForAllMembers(o => o.ExplicitExpansion());
             CreateMap<DataTypes, DataTypesModel>()
                 .ForAllMembers(o => o.ExplicitExpansion());
             CreateMap<DerivedCategory, DerivedCategoryModel>()

diff --git a/AutoMapper.OData.EFCore.Tests/Model/ModelClasses.cs b/AutoMapper.OData.EFCore.Tests/Model/ModelClasses.cs
@@ -69,6 +69,19 @@ public class CategoryModel
         public IQueryable<ProductModel> QueryableProducts { get; set; }
     }
 
+    public class SuperCategoryModel
+    {
+        public SuperCategoryModel(string superCategoryName)
+        {
+            SuperCategoryName = superCategoryName;
+        }
+
+        [Key]
+        public int SuperCategoryID { get; set; }
+        public string SuperCategoryName { get; set; }
+        public IEnumerable<CategoryModel> Categories { get; set; }
+    }
+
     public class CompositeKeyModel
     {
         [Key]