B2B-2255: "Currency" GraphQl query has no cache identity

Author: joanhe

app/code/Magento/DirectoryGraphQl/Model/Cache/Tag/Strategy/CurrencyConfig.php

@@ -10,6 +10,8 @@
 use Magento\DirectoryGraphQl\Model\Resolver\Currency\Identity;
 use Magento\Framework\App\Cache\Tag\StrategyInterface;
 use Magento\Framework\App\Config\ValueInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Produce cache tags for currency config.
@@ -26,6 +28,20 @@ class CurrencyConfig implements StrategyInterface
         'currency/options/customsymbol'
     ];
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        StoreManagerInterface $storeManager
+    ) {
+        $this->storeManager = $storeManager;
+    }
+
     /**
      * @inheritdoc
      */
@@ -39,7 +55,19 @@ public function getTags($object): array
             && in_array($object->getPath(), $this->currencyConfigPaths)
             && $object->isValueChanged()
         ) {
-            return [Identity::CACHE_TAG];
+            if ($object->getScope() == ScopeInterface::SCOPE_WEBSITES) {
+                $website = $this->storeManager->getWebsite($object->getScopeId());
+                $storeIds = $website->getStoreIds();
+            } elseif ($object->getScope() == ScopeInterface::SCOPE_STORES) {
+                $storeIds = [$object->getScopeId()];
+            } else {
+                $storeIds = array_keys($this->storeManager->getStores());
+            }
+            $ids = [];
+            foreach ($storeIds as $storeId) {
+                $ids[] = sprintf('%s_%s', Identity::CACHE_TAG, $storeId);
+            }
+            return $ids;
         }
 
         return [];

app/code/Magento/DirectoryGraphQl/Model/Resolver/Currency/Identity.php

@@ -8,6 +8,7 @@
 namespace Magento\DirectoryGraphQl\Model\Resolver\Currency;
 
 use Magento\Framework\GraphQl\Query\Resolver\IdentityInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 class Identity implements IdentityInterface
 {
@@ -16,12 +17,26 @@ class Identity implements IdentityInterface
      */
     public const CACHE_TAG = 'gql_currency';
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(StoreManagerInterface $storeManager)
+    {
+        $this->storeManager = $storeManager;
+    }
+
     /**
      * @inheritdoc
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function getIdentities(array $resolvedData): array
     {
-        return [self::CACHE_TAG];
+        $storeId = $this->storeManager->getStore()->getId();
+        return [self::CACHE_TAG, sprintf('%s_%s', self::CACHE_TAG, $storeId)];
     }
 }

app/code/Magento/DirectoryGraphQl/Plugin/Currency.php

@@ -40,7 +40,7 @@ public function __construct(ManagerInterface $eventManager)
      */
     public function afterSaveRates(CurrencyModel $subject, CurrencyModel $result): CurrencyModel
     {
-        $this->eventManager->dispatch('clean_cache_by_tags', ['object' => $this]);
+        $this->eventManager->dispatch('clean_cache_by_tags', ['object' => $result]);
         return $result;
     }
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/Directory/CurrencyTest.php

@@ -14,7 +14,46 @@
  */
 class CurrencyTest extends GraphQlAbstract
 {
+    /**
+     * Test stores set up:
+     *      STORE - WEBSITE - STORE GROUP
+     *      default - base - main_website_store
+     *      test - base - main_website_store
+     *
+     * @magentoApiDataFixture Magento/Store/_files/store.php
+     * @magentoConfigFixture test_store currency/options/base USD
+     * @magentoConfigFixture test_store currency/options/default CNY
+     * @magentoConfigFixture test_store currency/options/allow CNY,USD
+     * @magentoDataFixture Magento/Directory/_files/usd_cny_rate.php
+     */
     public function testGetCurrency()
+    {
+        $result = $this->graphQlQuery($this->getQuery());
+        $this->assertArrayHasKey('currency', $result);
+        $this->assertEquals('USD', $result['currency']['base_currency_code']);
+        $this->assertEquals('USD', $result['currency']['default_display_currency_code']);
+        $this->assertEquals(['USD'], $result['currency']['available_currency_codes']);
+        $this->assertEquals('USD', $result['currency']['exchange_rates'][0]['currency_to']);
+        $this->assertEquals(1, $result['currency']['exchange_rates'][0]['rate']);
+
+        $result = $this->graphQlQuery(
+            $this->getQuery(),
+            [],
+            '',
+            ['Store' => 'test']
+        );
+        $this->assertArrayHasKey('currency', $result);
+        $this->assertEquals('USD', $result['currency']['base_currency_code']);
+        $this->assertEquals('CNY', $result['currency']['default_display_currency_code']);
+        $this->assertEquals(['CNY','USD'], $result['currency']['available_currency_codes']);
+    }
+
+    /**
+     * Get query
+     *
+     * @return string
+     */
+    private function getQuery(): string
     {
         $query = <<<QUERY
 query {
@@ -31,14 +70,6 @@ public function testGetCurrency()
     }
 }
 QUERY;
-
-        $result = $this->graphQlQuery($query);
-        $this->assertArrayHasKey('currency', $result);
-        $this->assertArrayHasKey('base_currency_code', $result['currency']);
-        $this->assertArrayHasKey('base_currency_symbol', $result['currency']);
-        $this->assertArrayHasKey('default_display_currency_code', $result['currency']);
-        $this->assertArrayHasKey('default_display_currency_symbol', $result['currency']);
-        $this->assertArrayHasKey('available_currency_codes', $result['currency']);
-        $this->assertArrayHasKey('exchange_rates', $result['currency']);
+        return $query;
     }
 }