B2B-2659: Implement GraphQL Resolver Cache for cmsBlocks query

Author: danmooney2

app/code/Magento/CmsGraphQl/Model/Resolver/Block/ResolverCacheIdentity.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CmsGraphQl\Model\Resolver\Block;
+
+use Magento\Cms\Api\Data\BlockInterface;
+use Magento\Cms\Model\Block;
+use Magento\Framework\GraphQl\Query\Resolver\IdentityInterface;
+
+class ResolverCacheIdentity implements IdentityInterface
+{
+    /**
+     * @var string
+     */
+    private $cacheTag = Block::CACHE_TAG;
+
+    /**
+     * Get block identities from resolved data
+     *
+     * @param array $resolvedData
+     * @return string[]
+     */
+    public function getIdentities(array $resolvedData): array
+    {
+        $ids = [];
+        $items = $resolvedData['items'] ?? [];
+        foreach ($items as $item) {
+            if (is_array($item) && !empty($item[BlockInterface::BLOCK_ID])) {
+                $ids[] = sprintf('%s_%s', $this->cacheTag, $item[BlockInterface::BLOCK_ID]);
+                $ids[] = sprintf('%s_%s', $this->cacheTag, $item[BlockInterface::IDENTIFIER]);
+            }
+        }
+
+        return $ids;
+    }
+}

app/code/Magento/CmsGraphQl/etc/graphql/di.xml

@@ -25,7 +25,7 @@
                     Magento\CmsGraphQl\Model\Resolver\Page\ResolverCacheIdentity
                 </item>
                 <item name="Magento\CmsGraphQl\Model\Resolver\Blocks" xsi:type="string">
-                    Magento\CmsGraphQl\Model\Resolver\Block\Identity
+                    Magento\CmsGraphQl\Model\Resolver\Block\ResolverCacheIdentity
                 </item>
             </argument>
         </arguments>

dev/tests/api-functional/testsuite/Magento/GraphQl/CmsGraphQl/Model/Resolver/BlockTest.php

@@ -272,8 +272,6 @@ public function testCmsBlockResolverCacheDoesNotSaveNonExistentCmsBlock()
             // expected exception
         }
 
-        print_r($e->getResponseData());
-
         $response['headers'] = $e->getResponseHeaders();
 
         $cacheIdentityString = $this->getResolverCacheKeyFromResponseAndBlocks($response, [$nonExistentBlock]);
@@ -283,6 +281,62 @@ public function testCmsBlockResolverCacheDoesNotSaveNonExistentCmsBlock()
         );
     }
 
+    /**
+     * @magentoConfigFixture default/system/full_page_cache/caching_application 2
+     * @magentoDataFixture Magento/Cms/_files/block.php
+     * @magentoDataFixture Magento/Cms/_files/blocks.php
+     */
+    public function testCmsBlockResolverCacheRetainsEntriesThatHaveNotBeenUpdated()
+    {
+        // query block1
+        $block1 = $this->blockRepository->getById('fixture_block');
+
+        $queryBlock1 = $this->getQuery([
+            $block1->getIdentifier(),
+        ]);
+
+        $responseBlock1 = $this->graphQlQueryWithResponseHeaders($queryBlock1);
+
+        $cacheIdentityStringBlock1 = $this->getResolverCacheKeyFromResponseAndBlocks($responseBlock1, [$block1]);
+
+        // query block2
+        $block2 = $this->blockRepository->getById('enabled_block');
+
+        $queryBlock2 = $this->getQuery([
+            $block2->getIdentifier(),
+        ]);
+
+        $responseBlock2 = $this->graphQlQueryWithResponseHeaders($queryBlock2);
+
+        $cacheIdentityStringBlock2 = $this->getResolverCacheKeyFromResponseAndBlocks($responseBlock2, [$block2]);
+
+        // assert both cache entries are present
+        $this->assertIsNumeric(
+            $this->graphQlResolverCache->test($cacheIdentityStringBlock1),
+            'Cache entry for block1 should be present'
+        );
+
+        $this->assertIsNumeric(
+            $this->graphQlResolverCache->test($cacheIdentityStringBlock2),
+            'Cache entry for block2 should be present'
+        );
+
+        // assert that cache is invalidated after block1 update
+        $block1->setContent('Updated content');
+        $this->blockRepository->save($block1);
+
+        $this->assertFalse(
+            $this->graphQlResolverCache->test($cacheIdentityStringBlock1),
+            'Cache entry for block1 should be invalidated after block1 update'
+        );
+
+        // assert that cache is not invalidated after block1 update
+        $this->assertIsNumeric(
+            $this->graphQlResolverCache->test($cacheIdentityStringBlock2),
+            'Cache entry for block2 should be present after block1 update'
+        );
+    }
+
     private function getQuery(array $identifiers): string
     {
         $identifiersStr = $this->getQuotedBlockIdentifiersListAsString($identifiers);
@@ -347,7 +401,6 @@ private function assertTagsByCacheIdentityAndBlocks(string $cacheIdentityString,
         $tags = $metadatas['tags'];
 
         $expectedTags = [
-            $cacheIdPrefix . strtoupper(Block::CACHE_TAG),
             $cacheIdPrefix . strtoupper(GraphQlResolverCache::CACHE_TAG),
             $cacheIdPrefix . 'MAGE',
         ];