B2B-2256: "countries" and "country" GraphQl query has no cache identity

Author: joanhe

app/code/Magento/DirectoryGraphQl/Model/Cache/Tag/Strategy/CountryConfig.php renamed to app/code/Magento/DirectoryGraphQl/Model/Cache/Tag/Strategy/Config/CountryTagGenerator.php

@@ -5,18 +5,18 @@
  */
 declare(strict_types=1);
 
-namespace Magento\DirectoryGraphQl\Model\Cache\Tag\Strategy;
+namespace Magento\DirectoryGraphQl\Model\Cache\Tag\Strategy\Config;
 
 use Magento\DirectoryGraphQl\Model\Resolver\Country\Identity;
-use Magento\Framework\App\Cache\Tag\StrategyInterface;
 use Magento\Framework\App\Config\ValueInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\Config\Cache\Tag\Strategy\TagGeneratorInterface;
 
 /**
- * Produce cache tags for country config.
+ * Generator that generates cache tags for country configuration
  */
-class CountryConfig implements StrategyInterface
+class CountryTagGenerator implements TagGeneratorInterface
 {
     /**
      * @var string[]
@@ -43,31 +43,23 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function getTags($object): array
+    public function generateTags(ValueInterface $config): array
     {
-        if (!is_object($object)) {
-            throw new \InvalidArgumentException('Provided argument is not an object');
-        }
-
-        if ($object instanceof ValueInterface
-            && in_array($object->getPath(), $this->countryConfigPaths)
-            && $object->isValueChanged()
-        ) {
-            if ($object->getScope() == ScopeInterface::SCOPE_WEBSITES) {
-                $website = $this->storeManager->getWebsite($object->getScopeId());
+        if (in_array($config->getPath(), $this->countryConfigPaths)) {
+            if ($config->getScope() == ScopeInterface::SCOPE_WEBSITES) {
+                $website = $this->storeManager->getWebsite($config->getScopeId());
                 $storeIds = $website->getStoreIds();
-            } elseif ($object->getScope() == ScopeInterface::SCOPE_STORES) {
-                $storeIds = [$object->getScopeId()];
+            } elseif ($config->getScope() == ScopeInterface::SCOPE_STORES) {
+                $storeIds = [$config->getScopeId()];
             } else {
                 $storeIds = array_keys($this->storeManager->getStores());
             }
-            $ids = [];
+            $tags = [];
             foreach ($storeIds as $storeId) {
-                $ids[] = sprintf('%s_%s', Identity::CACHE_TAG, $storeId);
+                $tags[] = sprintf('%s_%s', Identity::CACHE_TAG, $storeId);
             }
-            return $ids;
+            return $tags;
         }
-
         return [];
     }
 }

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

@@ -12,14 +12,8 @@
                 <item name="currency_tag_generator" xsi:type="object">
                     Magento\DirectoryGraphQl\Model\Cache\Tag\Strategy\Config\CurrencyTagGenerator
                 </item>
-            </argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\App\Cache\Tag\Strategy\Factory">
-        <arguments>
-            <argument name="customStrategies" xsi:type="array">
-                <item name="Magento\Framework\App\Config\ValueInterface" xsi:type="object">
-                    Magento\DirectoryGraphQl\Model\Cache\Tag\Strategy\CountryConfig
+                <item name="country_tag_generator" xsi:type="object">
+                    Magento\DirectoryGraphQl\Model\Cache\Tag\Strategy\Config\CountryTagGenerator
                 </item>
             </argument>
         </arguments>