Allow to use multiple fields

Author: sroze

src/Hydra/Serializer/PartialCollectionViewNormalizer.php

@@ -79,37 +79,26 @@ public function normalize($object, $format = null, array $context = [])
         }
 
         $metadata = isset($context['resource_class']) && null !== $this->resourceMetadataFactory ? $this->resourceMetadataFactory->create($context['resource_class']) : null;
-        $isPaginatedWithCursor = $paginated && null !== $metadata && null !== $cursorPaginationAttribute = $metadata->getCollectionOperationAttribute('pagination_via_cursor');
+        $isPaginatedWithCursor = $paginated && null !== $metadata && null !== $cursorPaginationAttribute = $metadata->getCollectionOperationAttribute($context['collection_operation_name'], 'pagination_via_cursor', null, true);
 
         $data['hydra:view'] = [
             '@id' => IriHelper::createIri($parsed['parts'], $parsed['parameters'], $this->pageParameterName, $paginated && !$isPaginatedWithCursor ? $currentPage : null),
             '@type' => 'hydra:PartialCollectionView',
         ];
 
         if ($isPaginatedWithCursor) {
-            $forwardRangeOperator = 'desc' === strtolower($cursorPaginationAttribute['direction']) ? 'lt' : 'gt';
-            $backwardRangeOperator = 'gt' === $forwardRangeOperator ? 'lt' : 'gt';
-
             $objects = iterator_to_array($object);
             $firstObject = current($objects);
             $lastObject = end($objects);
 
             $data['hydra:view']['@id'] = IriHelper::createIri($parsed['parts'], $parsed['parameters']);
 
             if (false !== $lastObject) {
-                $data['hydra:view']['hydra:next'] = IriHelper::createIri($parsed['parts'], array_merge($parsed['parameters'], [
-                    $cursorPaginationAttribute['field'] => [
-                        $forwardRangeOperator => (string) $this->propertyAccessor->getValue($lastObject, $cursorPaginationAttribute['field']),
-                    ],
-                ]));
+                $data['hydra:view']['hydra:next'] = IriHelper::createIri($parsed['parts'], array_merge($parsed['parameters'], $this->cursorPaginationFields($cursorPaginationAttribute, 1, $lastObject)));
             }
 
             if (false !== $firstObject) {
-                $data['hydra:view']['hydra:previous'] = IriHelper::createIri($parsed['parts'], array_merge($parsed['parameters'], [
-                    $cursorPaginationAttribute['field'] => [
-                        $backwardRangeOperator => (string) $this->propertyAccessor->getValue($firstObject, $cursorPaginationAttribute['field']),
-                    ],
-                ]));
+                $data['hydra:view']['hydra:previous'] = IriHelper::createIri($parsed['parts'], array_merge($parsed['parameters'], $this->cursorPaginationFields($cursorPaginationAttribute, -1, $firstObject)));
             }
         } elseif ($paginated) {
             if (null !== $lastPage) {
@@ -146,4 +135,22 @@ public function setNormalizer(NormalizerInterface $normalizer)
             $this->collectionNormalizer->setNormalizer($normalizer);
         }
     }
+
+    private function cursorPaginationFields(array $fields, int $direction, $object)
+    {
+        $paginationFilters = [];
+
+        foreach ($fields as $field) {
+            $forwardRangeOperator = 'desc' === strtolower($field['direction']) ? 'lt' : 'gt';
+            $backwardRangeOperator = 'gt' === $forwardRangeOperator ? 'lt' : 'gt';
+
+            $operator = $direction > 0 ? $forwardRangeOperator : $backwardRangeOperator;
+
+            $paginationFilters[$field['field']] = [
+                $operator => (string) $this->propertyAccessor->getValue($object, $field['field']),
+            ];
+        }
+
+        return $paginationFilters;
+    }
 }

tests/Fixtures/TestBundle/Entity/SoMany.php

@@ -24,8 +24,7 @@
  * @ApiResource(attributes={
  *     "pagination_partial"=true,
  *     "pagination_via_cursor"={
- *         "field"="id",
- *         "direction"="DESC"
+ *         {"field"="id", "direction"="DESC"}
  *     }
  * })
  *

tests/Hydra/Serializer/PartialCollectionViewNormalizerTest.php

@@ -33,7 +33,7 @@ public function testNormalizeDoesNotChangeSubLevel()
         $decoratedNormalizerProphecy->normalize(Argument::any(), null, ['jsonld_sub_level' => true])->willReturn(['foo' => 'bar'])->shouldBeCalled();
         $resourceMetadataFactory = $this->prophesize(ResourceMetadataFactoryInterface::class);
 
-        $normalizer = new PartialCollectionViewNormalizer($decoratedNormalizerProphecy->reveal(), $resourceMetadataFactory->reveal());
+        $normalizer = new PartialCollectionViewNormalizer($decoratedNormalizerProphecy->reveal(), 'page', 'pagination', $resourceMetadataFactory->reveal());
         $this->assertEquals(['foo' => 'bar'], $normalizer->normalize(new \stdClass(), null, ['jsonld_sub_level' => true]));
     }
 
@@ -43,7 +43,7 @@ public function testNormalizeDoesNotChangeWhenNoFilterNorPagination()
         $decoratedNormalizerProphecy->normalize(Argument::any(), null, Argument::type('array'))->willReturn(['foo' => 'bar'])->shouldBeCalled();
         $resourceMetadataFactory = $this->prophesize(ResourceMetadataFactoryInterface::class);
 
-        $normalizer = new PartialCollectionViewNormalizer($decoratedNormalizerProphecy->reveal(), $resourceMetadataFactory->reveal());
+        $normalizer = new PartialCollectionViewNormalizer($decoratedNormalizerProphecy->reveal(), 'page', 'pagination', $resourceMetadataFactory->reveal());
         $this->assertEquals(['foo' => 'bar'], $normalizer->normalize(new \stdClass(), null, ['request_uri' => '/?page=1&pagination=1']));
     }