Fixed endCursor (was pointing to end of collection)

Author: TomHAnderson

src/Resolve/ResolveCollectionFactory.php

@@ -190,7 +190,7 @@ protected function buildPagination(
             'edges' => $edgesAndCursors['edges'],
             'totalCount' => $itemCount,
             'pageInfo' => [
-                'endCursor' => $edgesAndCursors['cursors']['end'],
+                'endCursor' => $edgesAndCursors['cursors']['last'],
                 'startCursor' => $edgesAndCursors['cursors']['start'],
                 'hasNextPage' => $edgesAndCursors['cursors']['end'] !== $edgesAndCursors['cursors']['last'],
                 'hasPreviousPage' => $edgesAndCursors['cursors']['first'] !== null
@@ -230,7 +230,8 @@ protected function buildEdgesAndCursors(Collection $items, array $offsetAndLimit
             $index++;
         }
 
-        $cursors['end'] = $cursors['last'] ?? base64_encode('0');
+        $endIndex       = $itemCount ? $itemCount - 1 : 0;
+        $cursors['end'] = base64_encode((string) $endIndex);
 
         return [
             'cursors' => $cursors,

src/Resolve/ResolveEntityFactory.php

@@ -120,7 +120,7 @@ public function buildPagination(
             'edges' => $edgesAndCursors['edges'],
             'totalCount' => $edgesAndCursors['totalCount'],
             'pageInfo' => [
-                'endCursor' => $edgesAndCursors['cursors']['end'],
+                'endCursor' => $edgesAndCursors['cursors']['last'],
                 'startCursor' => $edgesAndCursors['cursors']['start'],
                 'hasNextPage' => $edgesAndCursors['cursors']['end'] !== $edgesAndCursors['cursors']['last'],
                 'hasPreviousPage' => $edgesAndCursors['cursors']['first'] !== null
@@ -170,7 +170,8 @@ protected function buildEdgesAndCursors(QueryBuilder $queryBuilder, array $offse
             $index++;
         }
 
-        $cursors['end'] = $cursors['last'] ?? base64_encode((string) 0);
+        $endIndex       = $paginator->count() ? $paginator->count() - 1 : 0;
+        $cursors['end'] = base64_encode((string) $endIndex);
 
         return [
             'cursors'    => $cursors,

test/Feature/Type/PageInfoTest.php

@@ -66,13 +66,13 @@ public function testPageInfoHasNextPage(): void
             'query' => new ObjectType([
                 'name' => 'query',
                 'fields' => [
-                    'performance' => $driver->completeConnection(Performance::class),
+                    'performances' => $driver->completeConnection(Performance::class),
                 ],
             ]),
         ]);
 
         $query  = '{
-            performance (pagination: { first: 2 }) {
+            performances (pagination: { first: 2 }) {
                 pageInfo {
                     hasNextPage
                     hasPreviousPage
@@ -88,8 +88,8 @@ public function testPageInfoHasNextPage(): void
 
         $data = $result->toArray()['data'];
 
-        $this->assertTrue($data['performance']['pageInfo']['hasNextPage']);
-        $this->assertFalse($data['performance']['pageInfo']['hasPreviousPage']);
+        $this->assertTrue($data['performances']['pageInfo']['hasNextPage']);
+        $this->assertFalse($data['performances']['pageInfo']['hasPreviousPage']);
     }
 
     public function testPageInfoHasPreviousPage(): void