Web and EF6 tests for $orderby filtered count. (#129)

* Web and EF6 tests for orderby filtered count. * PackageReleaseNotes
AutoMapper · Apr 5, 2022 · 5ea5f64 · 5ea5f64
1 parent e179606
commit 5ea5f64
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 4 deletions.
diff --git a/AutoMapper.AspNetCore.OData.EF6/AutoMapper.AspNetCore.OData.EF6.csproj b/AutoMapper.AspNetCore.OData.EF6/AutoMapper.AspNetCore.OData.EF6.csproj
@@ -6,7 +6,7 @@
     <PackageId>AutoMapper.AspNetCore.OData.EF6</PackageId>
     <Description>Creates LINQ expressions from ODataQueryOptions and executes the query.</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageReleaseNotes>Supporting $skip and $top without $orderby.</PackageReleaseNotes>
+    <PackageReleaseNotes>Adding filter to $orderby $count.</PackageReleaseNotes>
     <PackageTags>linq expressions odata efcore</PackageTags>
 	<PackageIcon>icon.png</PackageIcon>
     <RepositoryUrl>https://github.com/AutoMapper/AutoMapper.Extensions.OData</RepositoryUrl>

diff --git a/AutoMapper.AspNetCore.OData.EFCore/AutoMapper.AspNetCore.OData.EFCore.csproj b/AutoMapper.AspNetCore.OData.EFCore/AutoMapper.AspNetCore.OData.EFCore.csproj
@@ -6,7 +6,7 @@
     <PackageId>AutoMapper.AspNetCore.OData.EFCore</PackageId>
     <Description>Creates LINQ expressions from ODataQueryOptions and executes the query.</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageReleaseNotes>Supporting $skip and $top without $orderby.</PackageReleaseNotes>
+    <PackageReleaseNotes>Adding filter to $orderby $count.</PackageReleaseNotes>
     <PackageTags>linq expressions odata efcore</PackageTags>
 	<PackageIcon>icon.png</PackageIcon>
     <RepositoryUrl>https://github.com/AutoMapper/AutoMapper.Extensions.OData</RepositoryUrl>

diff --git a/AutoMapper.AspNetCore.OData.EFCore/LinqExtensions.cs b/AutoMapper.AspNetCore.OData.EFCore/LinqExtensions.cs
@@ -390,9 +390,10 @@ public static Expression GetOrderByCountCall(this Expression expression, CountNo
 
             if (countNode.FilterClause is not null)
             {
-                Type filterType = TypeExtensions.GetClrType(countNode.FilterClause.ItemType, TypeExtensions.GetEdmToClrTypeMappings());
+                string memberFullName = countNode.GetPropertyPath();
+                Type filterType = sourceType.GetMemberInfoFromFullName(memberFullName).GetMemberType().GetUnderlyingElementType();
                 LambdaExpression filterExpression = countNode.FilterClause.GetFilterExpression(filterType);
-                countSelector = param.MakeSelector(countNode.GetPropertyPath()).GetCountCall(filterExpression);
+                countSelector = param.MakeSelector(memberFullName).GetCountCall(filterExpression);
             }
             else
             {

diff --git a/AutoMapper.OData.EF6.Tests/GetQueryTests.cs b/AutoMapper.OData.EF6.Tests/GetQueryTests.cs
@@ -566,6 +566,22 @@ void Test(ICollection<OpsTenant> collection)
             }
         }
 
+        [Fact]
+        public async void OpsTenantOrderByFilteredCount()
+        {
+            Test(Get<OpsTenant, TMandator>("/opstenant?$expand=Buildings&$orderby=Buildings/$count($filter=Name eq 'One L1') desc"));
+            Test(await GetAsync<OpsTenant, TMandator>("/opstenant?$expand=Buildings&$orderby=Buildings/$count($filter=Name eq 'One L1') desc"));
+
+            void Test(ICollection<OpsTenant> collection)
+            {
+                Assert.Equal(2, collection.Count);
+                Assert.NotNull(collection.First().Buildings);
+                Assert.Equal("One", collection.First().Name);
+                Assert.Equal(2, collection.First().Buildings.Count);
+                Assert.Equal(3, collection.Last().Buildings.Count);
+            }
+        }
+
         //System.NotSupportedException
         /*
          *  StackTrace:

diff --git a/AutoMapper.OData.EF6.Tests/GetTests.cs b/AutoMapper.OData.EF6.Tests/GetTests.cs
@@ -435,6 +435,22 @@ void Test(ICollection<OpsTenant> collection)
             }
         }
 
+        [Fact]
+        public async void OpsTenantOrderByFilteredCount()
+        {
+            Test(Get<OpsTenant, TMandator>("/opstenant?$expand=Buildings&$orderby=Buildings/$count($filter=Name eq 'One L1') desc"));
+            Test(await GetAsync<OpsTenant, TMandator>("/opstenant?$expand=Buildings&$orderby=Buildings/$count($filter=Name eq 'One L1') desc"));
+
+            void Test(ICollection<OpsTenant> collection)
+            {
+                Assert.Equal(2, collection.Count);
+                Assert.NotNull(collection.First().Buildings);
+                Assert.Equal("One", collection.First().Name);
+                Assert.Equal(2, collection.First().Buildings.Count);
+                Assert.Equal(3, collection.Last().Buildings.Count);
+            }
+        }
+
         //Exception: 'The Include path 'Mandator->Buildings' results in a cycle. 
         //Cycles are not allowed in no-tracking queries. Either use a tracking query or remove the cycle.'
         [Fact]

diff --git a/Web.Tests/GetTests.cs b/Web.Tests/GetTests.cs
@@ -430,6 +430,23 @@ void Test(ICollection<OpsTenant> collection)
             }
         }
 
+        [Theory]
+        [InlineData("16324")]
+        [InlineData("16325")]
+        public async void OpsTenantOrderByFilteredCount(string port)
+        {
+            Test(await Get<OpsTenant>("/opstenant?$expand=Buildings&$orderby=Buildings/$count($filter=Name eq 'One L1') desc", port));
+
+            void Test(ICollection<OpsTenant> collection)
+            {
+                Assert.Equal(2, collection.Count);
+                Assert.NotNull(collection.First().Buildings);
+                Assert.Equal("One", collection.First().Name);
+                Assert.Equal(2, collection.First().Buildings.Count);
+                Assert.Equal(3, collection.Last().Buildings.Count);
+            }
+        }
+
         [Theory]
         [InlineData("16324")]
         //EF 6 seems to have a problem with circular reference Building/Tenant/Buildings