B2B-2257: availableStores GraphQl query has no cache identity

Author: joanhe

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

@@ -27,6 +27,16 @@ public function afterGetIdentities(\Magento\Store\Model\Group $subject, array $r
         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()
+            );
+        }
         return $result;
     }
 }

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

@@ -24,11 +24,29 @@ class Store
     public function afterGetIdentities(\Magento\Store\Model\Store $subject, array $result): array
     {
         $result[] = sprintf('%s_%s', ConfigIdentity::CACHE_TAG, $subject->getId());
-        if ($subject->getOrigData('is_active') !== $subject->getIsActive() && $subject->getIsActive()) {
+        $origStoreGroupId = $subject->getOrigData('group_id');
+        $origIsActive = $subject->getOrigData('is_active');
+        // An existing active store switches store group
+        if ($origIsActive && $origStoreGroupId != null && $origStoreGroupId != $subject->getStoreGroupId()) {
+            $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();
+        if ($isActive && (
+            $subject->getOrigData('is_active') !== $isActive
+            || ($origStoreGroupId != null && $origStoreGroupId != $storeGroupId)
+            )
+        ) {
             $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',
@@ -37,7 +55,6 @@ public function afterGetIdentities(\Magento\Store\Model\Store $subject, array $r
                     );
                 }
             }
-
         }
 
         return $result;