Fix pagination (#2560)

Author: alanpoulain

features/graphql/collection.feature

@@ -197,12 +197,12 @@ Feature: GraphQL collection support
     Then the response status code should be 200
     And the response should be in JSON
     And the header "Content-Type" should be equal to "application/json"
-    And the JSON node "data.dummies.pageInfo.endCursor" should be equal to "Mw=="
+    And the JSON node "data.dummies.pageInfo.endCursor" should be equal to "MQ=="
     And the JSON node "data.dummies.pageInfo.hasNextPage" should be true
     And the JSON node "data.dummies.totalCount" should be equal to 4
     And the JSON node "data.dummies.edges[1].node.name" should be equal to "Dummy #2"
     And the JSON node "data.dummies.edges[1].cursor" should be equal to "MQ=="
-    And the JSON node "data.dummies.edges[1].node.relatedDummies.pageInfo.endCursor" should be equal to "Mw=="
+    And the JSON node "data.dummies.edges[1].node.relatedDummies.pageInfo.endCursor" should be equal to "MQ=="
     And the JSON node "data.dummies.edges[1].node.relatedDummies.pageInfo.hasNextPage" should be true
     And the JSON node "data.dummies.edges[1].node.relatedDummies.totalCount" should be equal to 4
     And the JSON node "data.dummies.edges[1].node.relatedDummies.edges[0].node.name" should be equal to "RelatedDummy12"
@@ -277,9 +277,11 @@ Feature: GraphQL collection support
     And the header "Content-Type" should be equal to "application/json"
     And the JSON node "data.dummies.edges" should have 1 element
     And the JSON node "data.dummies.pageInfo.hasNextPage" should be false
+    And the JSON node "data.dummies.pageInfo.endCursor" should be equal to "Mw=="
     And the JSON node "data.dummies.edges[0].node.name" should be equal to "Dummy #4"
     And the JSON node "data.dummies.edges[0].cursor" should be equal to "Mw=="
     And the JSON node "data.dummies.edges[0].node.relatedDummies.pageInfo.hasNextPage" should be false
+    And the JSON node "data.dummies.edges[0].node.relatedDummies.pageInfo.endCursor" should be equal to "Mw=="
     And the JSON node "data.dummies.edges[0].node.relatedDummies.edges" should have 2 elements
     And the JSON node "data.dummies.edges[0].node.relatedDummies.edges[1].node.name" should be equal to "RelatedDummy44"
     And the JSON node "data.dummies.edges[0].node.relatedDummies.edges[1].cursor" should be equal to "Mw=="

src/GraphQl/Resolver/Factory/CollectionResolverFactory.php

@@ -112,8 +112,9 @@ public function __invoke(string $resourceClass = null, string $rootClass = null,
 
             $data = ['totalCount' => 0.0, 'edges' => [], 'pageInfo' => ['endCursor' => null, 'hasNextPage' => false]];
             if ($collection instanceof PaginatorInterface && ($totalItems = $collection->getTotalItems()) > 0) {
-                $data['pageInfo']['endCursor'] = base64_encode((string) ($totalItems - 1));
-                $data['pageInfo']['hasNextPage'] = $collection->getCurrentPage() !== $collection->getLastPage() && (float) $collection->count() === $collection->getItemsPerPage();
+                $nbPageItems = $collection->count();
+                $data['pageInfo']['endCursor'] = base64_encode((string) ($offset + $nbPageItems - 1));
+                $data['pageInfo']['hasNextPage'] = $collection->getCurrentPage() !== $collection->getLastPage() && (float) $nbPageItems === $collection->getItemsPerPage();
                 $data['totalCount'] = $totalItems;
             }
 

tests/GraphQl/Resolver/Factory/CollectionResolverFactoryTest.php

@@ -165,7 +165,7 @@ public function testCreatePaginatorCollectionResolver()
         $resolveInfo = new ResolveInfo('relatedDummies', [], null, new ObjectType(['name' => '']), '', new Schema([]), null, null, null, null);
 
         $this->assertEquals(
-            ['edges' => [['node' => 'normalizedObject1', 'cursor' => 'Mg==']], 'pageInfo' => ['endCursor' => 'MTY=', 'hasNextPage' => true], 'totalCount' => 17],
+            ['edges' => [['node' => 'normalizedObject1', 'cursor' => 'Mg==']], 'pageInfo' => ['endCursor' => 'OQ==', 'hasNextPage' => true], 'totalCount' => 17.],
             $resolver(null, ['after' => $cursor], null, $resolveInfo)
         );
     }