Corrected collection limits

API-Skeletons · May 27, 2023 · d1a7e46 · d1a7e46
1 parent 415611b
commit d1a7e46
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/Resolve/ResolveCollectionFactory.php b/src/Resolve/ResolveCollectionFactory.php
@@ -63,15 +63,15 @@ public function get(Entity $entity): Closure
 
             $entityClass = ClassUtils::getRealClass($source::class);
 
+            $targetClassName = (string) $this->entityManager->getMetadataFactory()
+                ->getMetadataFor($entityClass)
+                ->getAssociationTargetClass($info->fieldName);
+
             $collectionMetadata = $this->entityManager->getMetadataFactory()
-                ->getMetadataFor(
-                    (string) $this->entityManager->getMetadataFactory()
-                        ->getMetadataFor($entityClass)
-                        ->getAssociationTargetClass($info->fieldName),
-                );
+                ->getMetadataFor($targetClassName);
 
             return $this->buildPagination(
-                $entityClass,
+                $targetClassName,
                 $args['pagination'] ?? [],
                 $collection,
                 $this->buildCriteria($args['filter'] ?? [], $collectionMetadata),
@@ -131,7 +131,7 @@ private function buildCriteria(array $filter, ClassMetadata $collectionMetadata)
      * @return mixed[]
      */
     private function buildPagination(
-        string $entityClass,
+        string $targetClassName,
         array $pagination,
         PersistentCollection $collection,
         Criteria $criteria,
@@ -163,7 +163,7 @@ private function buildPagination(
 
         $itemCount = count($collection->matching($criteria));
 
-        $offsetAndLimit = $this->calculateOffsetAndLimit($entityClass, $paginationFields, $itemCount);
+        $offsetAndLimit = $this->calculateOffsetAndLimit($targetClassName, $paginationFields, $itemCount);
         if ($offsetAndLimit['offset']) {
             $criteria->setFirstResult($offsetAndLimit['offset']);
         }
@@ -246,11 +246,11 @@ protected function buildEdgesAndCursors(Collection $items, array $offsetAndLimit
      *
      * @return array<string, int>
      */
-    protected function calculateOffsetAndLimit(string $entityClass, array $paginationFields, int $itemCount): array
+    protected function calculateOffsetAndLimit(string $targetClassName, array $paginationFields, int $itemCount): array
     {
         $offset = 0;
 
-        $limit = $this->metadata[$entityClass]['limit'];
+        $limit = $this->metadata[$targetClassName]['limit'];
 
         if (! $limit) {
             $limit  = $this->config->getLimit();

diff --git a/test/Feature/Metadata/LimitTest.php b/test/Feature/Metadata/LimitTest.php
@@ -61,6 +61,7 @@ public function testEntityLimit(): void
 
         $data = $result->toArray()['data'];
         $this->assertEquals(2, count($data['artist']['edges']));
-        $this->assertEquals(9, count($data['artist']['edges'][0]['node']['performances']['edges']));
+        $this->assertEquals(5, count($data['artist']['edges'][0]['node']['performances']['edges']));
+        $this->assertEquals(2, count($data['artist']['edges'][1]['node']['performances']['edges']));
     }
 }