B2B-2677: [MediaGallery] Implement data caching for GraphQL results on resolver level

- Fix replace/delete strategies retaining media gallery cache records

Author: danmooney2

app/code/Magento/CatalogGraphQl/Observer/AfterImportDataObserver.php

@@ -54,11 +54,13 @@ public function __construct(
      */
     public function execute(Observer $observer)
     {
-        $mediaGalleryEntriesChanged = $observer->getEvent()->getMediaGallery();
-        $mediaGalleryLabelsChanged = $observer->getEvent()->getMediaGalleryLabels();
+        $mediaGalleryEntriesChanged = (array) $observer->getEvent()->getMediaGallery();
+        $mediaGalleryLabelsChanged = (array) $observer->getEvent()->getMediaGalleryLabels();
+        $productIdsToDelete = (array) $observer->getEvent()->getIdsToDelete();
 
         if (empty($mediaGalleryEntriesChanged) &&
-            empty($mediaGalleryLabelsChanged)
+            empty($mediaGalleryLabelsChanged) &&
+            empty($productIdsToDelete)
         ) {
             return;
         }
@@ -78,10 +80,16 @@ public function execute(Observer $observer)
             $this->criteriaBuilder->addFilter('sku', $productSkusToInvalidate, 'in')->create()
         )->getItems();
 
-        $tags = array_map(function ($product) {
-            return sprintf('%s_%s', ResolverCacheIdentity::CACHE_TAG, $product->getId());
+        $productIds = array_map(function ($product) {
+            return $product->getId();
         }, $products);
 
+        $productIdsToInvalidate = array_unique(array_merge($productIds, $productIdsToDelete));
+
+        $tags = array_map(function ($productId) {
+            return sprintf('%s_%s', ResolverCacheIdentity::CACHE_TAG, $productId);
+        }, $productIdsToInvalidate);
+
         $this->graphQlResolverCache->clean(
             \Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG,
             $tags

app/code/Magento/CatalogGraphQl/etc/events.xml

@@ -9,4 +9,7 @@
     <event name="catalog_product_import_bunch_save_after">
         <observer name="invalidate_media_gallery_resolver_cache" instance="Magento\CatalogGraphQl\Observer\AfterImportDataObserver"/>
     </event>
+    <event name="catalog_product_import_bunch_delete_after">
+        <observer name="invalidate_media_gallery_resolver_cache" instance="Magento\CatalogGraphQl\Observer\AfterImportDataObserver"/>
+    </event>
 </config>

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -1104,7 +1104,11 @@ protected function _deleteProducts()
                 }
                 $this->_eventManager->dispatch(
                     'catalog_product_import_bunch_delete_after',
-                    ['adapter' => $this, 'bunch' => $bunch]
+                    [
+                        'adapter' => $this,
+                        'bunch' => $bunch,
+                        'ids_to_delete' => $idsToDelete,
+                    ]
                 );
                 $this->reindexProducts($idsToDelete);
             }