B2B-2257: availableStores GraphQl query has no cache identity

Author: joanhe

app/code/Magento/StoreGraphQl/Plugin/Group.php

@@ -24,19 +24,17 @@ class Group
     public function afterGetIdentities(\Magento\Store\Model\Group $subject, array $result): array
     {
         $storeIds = $subject->getStoreIds();
-        foreach ($storeIds as $storeId) {
-            $result[] = sprintf('%s_%s', ConfigIdentity::CACHE_TAG, $storeId);
-        }
-        $origWebsiteId = $subject->getOrigData('website_id');
-        // An existing store group switches website
-        if ($origWebsiteId != null && $origWebsiteId != $subject->getWebsiteId()) {
-            $result[] = sprintf('%s_%s', ConfigIdentity::CACHE_TAG, 'website_' . $origWebsiteId);
-            $result[] = sprintf(
-                '%s_%s',
-                ConfigIdentity::CACHE_TAG,
-                'website_' . $origWebsiteId . 'group_' . $subject->getId()
-            );
+        if (count($storeIds) > 0) {
+            foreach ($storeIds as $storeId) {
+                $result[] = sprintf('%s_%s', ConfigIdentity::CACHE_TAG, $storeId);
+            }
+            $origWebsiteId = $subject->getOrigData('website_id');
+            $websiteId = $subject->getWebsiteId();
+            if ($origWebsiteId != $websiteId) { // Add or switch to a new website
+                $result[] = sprintf('%s_%s', ConfigIdentity::CACHE_TAG, 'website_' . $websiteId);
+            }
         }
+
         return $result;
     }
 }

app/code/Magento/StoreGraphQl/Plugin/Store.php

@@ -24,28 +24,16 @@ class Store
     public function afterGetIdentities(\Magento\Store\Model\Store $subject, array $result): array
     {
         $result[] = sprintf('%s_%s', ConfigIdentity::CACHE_TAG, $subject->getId());
-        $origStoreGroupId = $subject->getOrigData('group_id');
-        $origIsActive = $subject->getOrigData('is_active');
-        // An existing active store switches store group
-        if ($origIsActive && $this->isStoreGroupSwitched($subject)) {
-            $origWebsiteId = $subject->getOrigData('website_id');
-            $result[] = sprintf('%s_%s', ConfigIdentity::CACHE_TAG, 'website_' . $origWebsiteId);
-            $result[] = sprintf(
-                '%s_%s',
-                ConfigIdentity::CACHE_TAG,
-                'website_' . $origWebsiteId . 'group_' . $origStoreGroupId
-            );
-        }
 
-        // New active store or newly activated store or an active store switched store group
-        $storeGroupId = $subject->getStoreGroupId();
         $isActive = $subject->getIsActive();
+        // New active store or newly activated store or an active store switched store group
         if ($isActive
             && ($subject->getOrigData('is_active') !== $isActive || $this->isStoreGroupSwitched($subject))
         ) {
             $websiteId = $subject->getWebsiteId();
             if ($websiteId !== null) {
                 $result[] = sprintf('%s_%s', ConfigIdentity::CACHE_TAG, 'website_' . $websiteId);
+                $storeGroupId = $subject->getStoreGroupId();
                 if ($storeGroupId !== null) {
                     $result[] = sprintf(
                         '%s_%s',