Merge branch 'B2B-2471' into B2B-2459

Author: dhaecker

app/code/Magento/CatalogUrlRewriteGraphQl/Model/Resolver/UrlRewrite/CatalogUrlResolverIdentity.php

@@ -29,11 +29,12 @@ class CatalogUrlResolverIdentity implements IdentityInterface
     public function getIdentities(array $resolvedData): array
     {
         $ids = [];
-        if (isset($resolvedData['id'])) {
+        $entity_id = $resolvedData['id'] ?? $resolvedData['entity_id'] ?? null;
+        if (isset($entity_id)) {
             $selectedCacheTag = isset($resolvedData['type']) ?
                 $this->getTagFromEntityType($resolvedData['type']) : '';
             if (!empty($selectedCacheTag)) {
-                $ids = [$selectedCacheTag, sprintf('%s_%s', $selectedCacheTag, $resolvedData['id'])];
+                $ids = [$selectedCacheTag, sprintf('%s_%s', $selectedCacheTag, $entity_id)];
             }
         }
         return $ids;

app/code/Magento/CmsUrlRewriteGraphQl/Model/Resolver/UrlRewrite/CmsUrlResolverIdentity.php

@@ -26,9 +26,10 @@ class CmsUrlResolverIdentity implements IdentityInterface
     public function getIdentities(array $resolvedData): array
     {
         $ids = [];
-        if (isset($resolvedData['id'])) {
+        $id = $resolvedData['id'] ?? $resolvedData['page_id'] ?? null;
+        if (isset($id)) {
             $selectedCacheTag = $this->cacheTag;
-            $ids =  [$selectedCacheTag, sprintf('%s_%s', $selectedCacheTag, $resolvedData['id'])];
+            $ids =  [$selectedCacheTag, sprintf('%s_%s', $selectedCacheTag, $id)];
         }
         return $ids;
     }

dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/GraphQLPageCacheAbstract.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\PageCache;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Abstract class for GraphQL page cache test
+ */
+class GraphQLPageCacheAbstract extends GraphQlAbstract
+{
+    /**
+     * Assert that we obtain a cache MISS when sending the provided query & headers.
+     *
+     * @param string $query
+     * @param array $headers
+     * @return array
+     */
+    protected function assertCacheMissAndReturnResponse(string $query, array $headers) :array
+    {
+        $responseMiss = $this->graphQlQueryWithResponseHeaders($query, [], '', $headers);
+        $this->assertArrayHasKey('X-Magento-Cache-Debug', $responseMiss['headers']);
+        $this->assertEquals('MISS', $responseMiss['headers']['X-Magento-Cache-Debug']);
+        return $responseMiss;
+    }
+
+    /**
+     * Assert that we obtain a cache HIT when sending the provided query & headers.
+     *
+     * @param string $query
+     * @param array $headers
+     * @return array
+     */
+    protected function assertCacheHitAndReturnResponse(string $query, array $headers) :array
+    {
+        $responseHit = $this->graphQlQueryWithResponseHeaders($query, [], '', $headers);
+        $this->assertArrayHasKey('X-Magento-Cache-Debug', $responseHit['headers']);
+        $this->assertEquals('HIT', $responseHit['headers']['X-Magento-Cache-Debug']);
+        return $responseHit;
+    }
+}