Fixed pagination when endpoint uses custom PagedResult<T> type (jouke…

…vandermaas#227)

Saule/Queries/Pagination/PagedResultQuery.cs

@@ -37,13 +37,20 @@ private static bool IsPagedResult(object obj)
                 return false;
             }
 
-            if (!obj.GetType().IsGenericType
-                || obj.GetType().GetGenericTypeDefinition() != typeof(PagedResult<>))
+            // we need to check the whole hierarchy of classes
+            var type = obj.GetType();
+            while (type != null)
             {
-                return false;
+                if (type.IsGenericType
+                    && type.GetGenericTypeDefinition() == typeof(PagedResult<>))
+                {
+                    return true;
+                }
+
+                type = type.BaseType;
             }
 
-            return true;
+            return false;
         }
 
         private static object UnwrapPagedResult(object obj)

Tests/Controllers/CompaniesController.cs

@@ -89,6 +89,19 @@ public PagedResult<Company> GetCompaniesWithPaging()
             };
         }
 
+        [HttpGet]
+        [Paginated(PerPage = 20, PageSizeLimit = 20)]
+        [Route("companies/paged-result-custom")]
+        [ReturnsResource(typeof(CompanyResource))]
+        public PagedResult<Company> GetCompaniesWithCustomPaging()
+        {
+            return new CustomPagedResult<Company>()
+            {
+                TotalResultsCount = 100,
+                Data = Get.Companies(100).ToList()
+            };
+        }
+
         [HttpGet]
         [Paginated(PerPage = 20, PageSizeLimit = 20, FirstPageNumber = 1)]
         [Route("companies/paged-result-first-page")]

Tests/Integration/JsonApiMediaTypeFormatterTests.cs

@@ -434,6 +434,7 @@ public async Task LimitsPageSizeIsNotSet()
         }
 
         [InlineData("api/companies/paged-result", 0)]
+        [InlineData("api/companies/paged-result-custom", 0)]
         [InlineData("api/companies/paged-result-first-page", 1)]
         [Theory(DisplayName = "Paged result calculates page counts")]
         public async Task PagedResult(object baseUrl, int firstPageNumber)

Tests/Models/CustomPagedResult.cs

@@ -0,0 +1,9 @@
+using Saule.Queries.Pagination;
+
+namespace Tests.Models
+{
+    public class CustomPagedResult<T>: PagedResult<T>
+    {
+        public int IgnoredValue { get; set; }
+    }
+}

Tests/Tests.csproj

@@ -131,6 +131,7 @@
     <Compile Include="Models\CompanyWithCustomersResource.cs" />
     <Compile Include="Models\Customer.cs" />
     <Compile Include="Models\CustomerResource.cs" />
+    <Compile Include="Models\CustomPagedResult.cs" />
     <Compile Include="Models\GuidAsRelation.cs" />
     <Compile Include="Models\GuidAsId.cs" />
     <Compile Include="Helpers\ObsoleteSetupJsonApiServer.cs" />