B2B-2451: Implement GraphQL Resolver Cache for CMS Page Type

Author: danmooney2

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

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\GraphQlCache\Observer\InvalidateGraphQlResolverCacheObserver">
+    <type name="Magento\GraphQlCache\Model\Cache\Query\Resolver\TagResolver">
         <arguments>
             <argument name="invalidatableObjectTypes" xsi:type="array">
                 <item name="Magento\Cms\Api\Data\PageInterface" xsi:type="string">

app/code/Magento/GraphQlCache/Model/Cache/Query/Resolver/TagResolver.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQlCache\Model\Cache\Query\Resolver;
+
+use Magento\Framework\App\Cache\Tag\Resolver;
+use Magento\Framework\App\Cache\Tag\Strategy\Factory as StrategyFactory;
+
+class TagResolver extends Resolver
+{
+    /**
+     * @var array
+     */
+    private $invalidatableObjectTypes;
+
+    /**
+     * GraphQL Resolver cache-specific tag resolver for the purpose of invalidation
+     *
+     * @param StrategyFactory $factory
+     * @param array $invalidatableObjectTypes
+     */
+    public function __construct(
+        StrategyFactory $factory,
+        array $invalidatableObjectTypes = []
+    ) {
+        $this->invalidatableObjectTypes = $invalidatableObjectTypes;
+
+        parent::__construct($factory);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getTags($object)
+    {
+        $isInvalidatable = false;
+
+        foreach ($this->invalidatableObjectTypes as $invalidatableObjectType) {
+            $isInvalidatable = $object instanceof $invalidatableObjectType;
+
+            if ($isInvalidatable) {
+                break;
+            }
+        }
+
+        if (!$isInvalidatable) {
+            return [];
+        }
+
+        return parent::getTags($object);
+    }
+}

app/code/Magento/GraphQlCache/Observer/InvalidateGraphQlResolverCacheObserver.php

@@ -8,9 +8,9 @@
 namespace Magento\GraphQlCache\Observer;
 
 use Magento\Framework\App\Cache\StateInterface as CacheState;
-use Magento\Framework\App\Cache\Tag\Resolver as TagResolver;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Event\Observer;
+use Magento\GraphQlCache\Model\Cache\Query\Resolver\TagResolver as TagResolver;
 use Magento\GraphQlCache\Model\Cache\Query\Resolver\Result\Type as GraphQlResolverCache;
 
 class InvalidateGraphQlResolverCacheObserver implements ObserverInterface
@@ -72,20 +72,6 @@ public function execute(Observer $observer)
             return;
         }
 
-        $isInvalidatable = false;
-
-        foreach ($this->invalidatableObjectTypes as $invalidatableObjectType) {
-            $isInvalidatable = $object instanceof $invalidatableObjectType;
-
-            if ($isInvalidatable) {
-                break;
-            }
-        }
-
-        if (!$isInvalidatable) {
-            return;
-        }
-
         $tags = $this->tagResolver->getTags($object);
 
         if (!empty($tags)) {