refactor: bump api + refactor pagination

Informatievlaanderen · Mar 13, 2023 · efd057d · efd057d
1 parent 0cec26e
commit efd057d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/paket.dependencies b/paket.dependencies
@@ -31,7 +31,7 @@ nuget Be.Vlaanderen.Basisregisters.AggregateSource.Testing.CommandHandling 8.0.0
 nuget Be.Vlaanderen.Basisregisters.AggregateSource.Testing.SqlStreamStore.Autofac 8.0.0
 nuget Be.Vlaanderen.Basisregisters.AggregateSource.Testing.Xunit 8.0.0
 
-nuget Be.Vlaanderen.Basisregisters.Api 19.1.0
+nuget Be.Vlaanderen.Basisregisters.Api 20.0.0
 
 nuget Be.Vlaanderen.Basisregisters.Aws.DistributedMutex 3.0.0
 

diff --git a/paket.lock b/paket.lock
@@ -71,7 +71,7 @@ NUGET
       Be.Vlaanderen.Basisregisters.AggregateSource.Testing (8.0)
       Microsoft.Extensions.Logging (>= 6.0)
       xunit (>= 2.4.1)
-    Be.Vlaanderen.Basisregisters.Api (19.1)
+    Be.Vlaanderen.Basisregisters.Api (20.0)
       Autofac (>= 6.3)
       Autofac.Extensions.DependencyInjection (>= 7.2)
       Be.Vlaanderen.Basisregisters.AggregateSource (>= 7.1.4)

diff --git a/src/PostalRegistry.Api.Legacy/PostalInformation/PostalInformationController.cs b/src/PostalRegistry.Api.Legacy/PostalInformation/PostalInformationController.cs
@@ -149,7 +149,7 @@ public async Task<IActionResult> List(
             return Ok(new PostalInformationListResponse
             {
                 PostInfoObjecten = items,
-                Volgende = BuildNextUri(pagedPostalInformationSet.PaginationInfo, reponseOptions.Value.VolgendeUrl)
+                Volgende = BuildNextUri(pagedPostalInformationSet.PaginationInfo, items.Count, reponseOptions.Value.VolgendeUrl)
             });
         }
 
@@ -274,12 +274,12 @@ private static async Task<string> BuildAtomFeed(
             return sw.ToString();
         }
 
-        private static Uri? BuildNextUri(PaginationInfo paginationInfo, string nextUrlBase)
+        private static Uri? BuildNextUri(PaginationInfo paginationInfo, int itemsInCollection, string nextUrlBase)
         {
             var offset = paginationInfo.Offset;
             var limit = paginationInfo.Limit;
 
-            return paginationInfo.HasNextPage
+            return paginationInfo.HasNextPage(itemsInCollection)
                 ? new Uri(string.Format(nextUrlBase, offset + limit, limit))
                 : null;
         }

diff --git a/src/PostalRegistry.Api.Oslo/PostalInformation/PostalInformationOsloController.cs b/src/PostalRegistry.Api.Oslo/PostalInformation/PostalInformationOsloController.cs
@@ -143,7 +143,7 @@ public async Task<IActionResult> List(
             return Ok(new PostalInformationListOsloResponse
             {
                 PostInfoObjecten = items,
-                Volgende = BuildNextUri(pagedPostalInformationSet.PaginationInfo, responseOptions.Value.VolgendeUrl),
+                Volgende = BuildNextUri(pagedPostalInformationSet.PaginationInfo, items.Count, responseOptions.Value.VolgendeUrl),
                 Context = responseOptions.Value.ContextUrlList
             });
         }
@@ -185,12 +185,12 @@ public async Task<IActionResult> Count(
                 });
         }
 
-        private static Uri? BuildNextUri(PaginationInfo paginationInfo, string nextUrlBase)
+        private static Uri? BuildNextUri(PaginationInfo paginationInfo, int itemsInCollection, string nextUrlBase)
         {
             var offset = paginationInfo.Offset;
             var limit = paginationInfo.Limit;
 
-            return paginationInfo.HasNextPage
+            return paginationInfo.HasNextPage(itemsInCollection)
                 ? new Uri(string.Format(nextUrlBase, offset + limit, limit))
                 : null;
         }