Fix issues with offset-based pagination

woohoolabs · May 28, 2019 · f417f66 · f417f66
1 parent 57313e2
commit f417f66
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/JsonApi/Schema/Pagination/OffsetBasedPaginationLinkProviderTrait.php b/src/JsonApi/Schema/Pagination/OffsetBasedPaginationLinkProviderTrait.php
@@ -33,12 +33,12 @@ public function getFirstLink(string $uri, string $queryString): ?Link
 
     public function getLastLink(string $uri, string $queryString): ?Link
     {
-        return $this->createPaginatedLink($uri, $queryString, $this->getTotalItems() - $this->getLimit() - 1, $this->getLimit());
+        return $this->createPaginatedLink($uri, $queryString, max($this->getTotalItems() - $this->getLimit(), 0), $this->getLimit());
     }
 
     public function getPrevLink(string $uri, string $queryString): ?Link
     {
-        if ($this->getOffset() <= 0 || $this->getOffset() + $this->getLimit() >= $this->getTotalItems()) {
+        if ($this->getOffset() <= 0 || $this->getOffset() + $this->getLimit() > $this->getTotalItems()) {
             return null;
         }
 

diff --git a/tests/JsonApi/Schema/Pagination/OffsetBasedPaginationProviderTraitTest.php b/tests/JsonApi/Schema/Pagination/OffsetBasedPaginationProviderTraitTest.php
@@ -210,7 +210,7 @@ public function getLastLinkWhenQueryStringIsProvided()
 
         $link = $provider->getLastLink("https://example.com/api/users?a=b", "");
 
-        $this->assertEquals("https://example.com/api/users?a=b&page[offset]=39&page[limit]=10", urldecode($link->getHref()));
+        $this->assertEquals("https://example.com/api/users?a=b&page[offset]=40&page[limit]=10", urldecode($link->getHref()));
     }
 
     /**