refactor(graphql): share private field extraction logic

Signed-off-by: psihius <arvids.godjuks@gmail.com>

Author: psihius

src/GraphQl/Serializer/ItemNormalizer.php

@@ -133,37 +133,34 @@ protected function normalizeCollectionOfRelations(ApiProperty $propertyMetadata,
         // Handle relationships for mercure subscriptions
         if ($operation instanceof QueryCollection && 'mercure_subscription' === $context['graphql_operation_name'] && $attributeValue instanceof Collection && !$attributeValue->isEmpty()) {
             $relationContext = $context;
-            // Grab collection attributes
             $relationContext['attributes'] = $context['attributes']['collection'];
-            // Iterate over the collection and normalize each item
-            $data['collection'] = $attributeValue
-                ->map(fn ($item) => $this->normalize($item, $format, $relationContext))
-                // Convert the collection to an array
-                ->toArray();
-
-            // Handle pagination if it's enabled in the query
-            return $this->addPagination($attributeValue, $data, $context);
+            $data['collection'] = [];
+            foreach ($attributeValue as $item) {
+                $data['collection'][] = $this->normalize($item, $format, $relationContext);
+            }
+
+            return $this->addPagination($attributeValue->count(), $data, $context);
         }
 
         // to-many are handled directly by the GraphQL resolver
         return [];
     }
 
-    private function addPagination(Collection $collection, array $data, array $context): array
+    private function addPagination(int $totalCount, array $data, array $context): array
     {
         if ($context['attributes']['paginationInfo'] ?? false) {
             $data['paginationInfo'] = [];
             if (\array_key_exists('hasNextPage', $context['attributes']['paginationInfo'])) {
-                $data['paginationInfo']['hasNextPage'] = $collection->count() > ($context['pagination']['itemsPerPage'] ?? 10);
+                $data['paginationInfo']['hasNextPage'] = $totalCount > ($context['pagination']['itemsPerPage'] ?? 10);
             }
             if (\array_key_exists('itemsPerPage', $context['attributes']['paginationInfo'])) {
                 $data['paginationInfo']['itemsPerPage'] = $context['pagination']['itemsPerPage'] ?? 10;
             }
             if (\array_key_exists('lastPage', $context['attributes']['paginationInfo'])) {
-                $data['paginationInfo']['lastPage'] = (int) ceil($collection->count() / ($context['pagination']['itemsPerPage'] ?? 10));
+                $data['paginationInfo']['lastPage'] = (int) ceil($totalCount / ($context['pagination']['itemsPerPage'] ?? 10));
             }
             if (\array_key_exists('totalCount', $context['attributes']['paginationInfo'])) {
-                $data['paginationInfo']['totalCount'] = $collection->count();
+                $data['paginationInfo']['totalCount'] = $totalCount;
             }
         }
 

src/GraphQl/State/Processor/SubscriptionProcessor.php

@@ -16,7 +16,6 @@
 use ApiPlatform\GraphQl\Subscription\MercureSubscriptionIriGeneratorInterface;
 use ApiPlatform\GraphQl\Subscription\OperationAwareSubscriptionManagerInterface;
 use ApiPlatform\GraphQl\Subscription\SubscriptionManagerInterface;
-use ApiPlatform\Metadata\GraphQl\Operation as GraphQlOperation;
 use ApiPlatform\Metadata\GraphQl\Subscription;
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProcessorInterface;
@@ -50,9 +49,6 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
 
             $hub = \is_array($mercure) ? ($mercure['hub'] ?? null) : null;
             $data['mercureUrl'] = $this->mercureSubscriptionIriGenerator->generateMercureUrl($subscriptionId, $hub);
-            if ($operation instanceof Subscription) {
-                $data['isCollection'] = $operation->isCollection();
-            }
         }
 
         return $data;