feat(graphql): fixing mercure subscription failing tests

Author: psihius

src/GraphQl/Subscription/SubscriptionManager.php

@@ -51,7 +51,7 @@ public function retrieveSubscriptionId(array $context, ?array $result, ?Operatio
             return null;
         }
 
-        $options = $operation->getMercure() ?? false;
+        $options = $operation ? ($operation->getMercure() ?? false) : false;
         $private = $options['private'] ?? false;
         $privateFields = $options['private_fields'] ?? [];
         $previousObject = $context['graphql_context']['previous_object'] ?? null;
@@ -60,7 +60,7 @@ public function retrieveSubscriptionId(array $context, ?array $result, ?Operatio
                 $fields['__private_field_'.$privateField] = $this->getResourceId($privateField, $previousObject);
             }
         }
-        if ($operation->isCollection()) {
+        if ($operation instanceof Subscription && $operation->isCollection()) {
             $subscriptionId = $this->updateSubscriptionCollectionCacheData(
                 $iri,
                 $fields,

src/GraphQl/Tests/Subscription/SubscriptionManagerTest.php

@@ -183,9 +183,11 @@ public function testGetPushPayloadsNoHit(): void
 
         $cacheItemProphecy = $this->prophesize(CacheItemInterface::class);
         $cacheItemProphecy->isHit()->willReturn(false);
+        $cacheItemProphecy->isHit()->willReturn(false);
         $this->subscriptionsCacheProphecy->getItem('_dummies_2')->willReturn($cacheItemProphecy->reveal());
+        $this->subscriptionsCacheProphecy->getItem('_dummies')->willReturn($cacheItemProphecy->reveal());
 
-        $this->assertEquals([], $this->subscriptionManager->getPushPayloads($object));
+        $this->assertEquals([], $this->subscriptionManager->getPushPayloads($object, 'update'));
     }
 
     public function testGetPushPayloadsHit(): void
@@ -199,16 +201,17 @@ public function testGetPushPayloadsHit(): void
         $this->iriConverterProphecy->getIriFromResource($object)->willReturn('/dummies/2');
 
         $cacheItemProphecy = $this->prophesize(CacheItemInterface::class);
-        $cacheItemProphecy->isHit()->willReturn(true);
+        $cacheItemProphecy->isHit()->willReturn(true)->shouldBeCalledTimes(2);
         $cacheItemProphecy->get()->willReturn([
             ['subscriptionIdFoo', ['fieldsFoo'], ['resultFoo']],
             ['subscriptionIdBar', ['fieldsBar'], ['resultBar']],
         ]);
         $this->subscriptionsCacheProphecy->getItem('_dummies_2')->willReturn($cacheItemProphecy->reveal());
+        $this->subscriptionsCacheProphecy->getItem('_dummies')->willReturn($cacheItemProphecy->reveal());
 
         $this->normalizeProcessor->process(
             $object,
-            (new Subscription())->withName('update_subscription')->withShortName('Dummy'),
+            (new Subscription())->withName('mercure_subscription')->withShortName('Dummy'),
             [],
             ['fields' => ['fieldsFoo'], 'is_collection' => false, 'is_mutation' => false, 'is_subscription' => true]
         )->willReturn(
@@ -217,13 +220,13 @@ public function testGetPushPayloadsHit(): void
 
         $this->normalizeProcessor->process(
             $object,
-            (new Subscription())->withName('update_subscription')->withShortName('Dummy'),
+            (new Subscription())->withName('mercure_subscription')->withShortName('Dummy'),
             [],
             ['fields' => ['fieldsBar'], 'is_collection' => false, 'is_mutation' => false, 'is_subscription' => true]
         )->willReturn(
             ['resultBar', 'clientSubscriptionId' => 'client-subscription-id']
         );
 
-        $this->assertEquals([['subscriptionIdFoo', ['newResultFoo']]], $this->subscriptionManager->getPushPayloads($object));
+        $this->assertEquals([['subscriptionIdFoo', ['newResultFoo']]], $this->subscriptionManager->getPushPayloads($object, 'update'));
     }
 }

src/Symfony/Tests/Doctrine/EventListener/PublishMercureUpdatesListenerTest.php

@@ -327,7 +327,7 @@ public function testPublishGraphQlUpdates(): void
         $graphQlSubscriptionManagerProphecy = $this->prophesize(GraphQlSubscriptionManagerInterface::class);
         $graphQlSubscriptionId = 'subscription-id';
         $graphQlSubscriptionData = ['data'];
-        $graphQlSubscriptionManagerProphecy->getPushPayloads($toUpdate)->willReturn([[$graphQlSubscriptionId, $graphQlSubscriptionData]]);
+        $graphQlSubscriptionManagerProphecy->getPushPayloads($toUpdate, 'update')->willReturn([[$graphQlSubscriptionId, $graphQlSubscriptionData]]);
         $graphQlMercureSubscriptionIriGenerator = $this->prophesize(GraphQlMercureSubscriptionIriGeneratorInterface::class);
         $topicIri = 'subscription-topic-iri';
         $graphQlMercureSubscriptionIriGenerator->generateTopicIri($graphQlSubscriptionId)->willReturn($topicIri);