AC-9569:: [GraphQL Resolver] Customer Resolver Data is Not Invalidated From Import

Author: glo17720

app/code/Magento/ImportExport/Plugin/DeferCacheCleaningUntilImportIsComplete.php

@@ -7,22 +7,38 @@
 
 namespace Magento\ImportExport\Plugin;
 
+use Magento\Framework\App\Cache\TypeListInterface;
 use Magento\Framework\Indexer\DeferredCacheCleanerInterface;
 use Magento\ImportExport\Model\Import;
 
 class DeferCacheCleaningUntilImportIsComplete
 {
+    private const BEHAVIOR_ADD_UPDATE = 'add_update';
+    private const ENTITY_CUSTOMER = 'customer';
+    private const CACHE_TYPE_GRAPHQL_QUERY_RESOLVER_RESULT = 'graphql_query_resolver_result';
+
     /**
      * @var DeferredCacheCleanerInterface
      */
     private $cacheCleaner;
 
+    /**
+     * TypeListInterface
+     *
+     * @var TypeListInterface
+     */
+    private $cacheTypeList;
+
     /**
      * @param DeferredCacheCleanerInterface $cacheCleaner
+     * @param TypeListInterface $cacheTypeList
      */
-    public function __construct(DeferredCacheCleanerInterface $cacheCleaner)
-    {
+    public function __construct(
+        DeferredCacheCleanerInterface $cacheCleaner,
+        TypeListInterface $cacheTypeList
+    ) {
         $this->cacheCleaner = $cacheCleaner;
+        $this->cacheTypeList = $cacheTypeList;
     }
 
     /**
@@ -47,6 +63,15 @@ public function beforeImportSource(Import $subject): void
      */
     public function afterImportSource(Import $subject, bool $result): bool
     {
+        $behavior = $this->request->getParam('behavior');
+        $entity = $this->request->getParam('entity');
+        $files = $this->request->getFiles();
+
+        if ($behavior === self::BEHAVIOR_ADD_UPDATE &&
+            $entity === self::ENTITY_CUSTOMER &&
+            !empty($files)) {
+            $this->cacheTypeList->cleanType(self::CACHE_TYPE_GRAPHQL_QUERY_RESOLVER_RESULT);
+        }
         $this->cacheCleaner->flush();
         return $result;
     }

app/code/Magento/Indexer/Model/Indexer/DeferredCacheCleaner.php

@@ -7,7 +7,6 @@
 
 namespace Magento\Indexer\Model\Indexer;
 
-use Magento\Framework\App\Cache\TypeListInterface;
 use Magento\Framework\App\CacheInterface;
 use Magento\Framework\Event\Manager as EventManager;
 use Magento\Framework\Indexer\CacheContext;
@@ -38,32 +37,22 @@ class DeferredCacheCleaner implements DeferredCacheCleanerInterface
      */
     private $cacheContext;
 
-    /**
-     * TypeListInterface
-     *
-     * @var TypeListInterface
-     */
-    private $cacheTypeList;
-
     /**
      * @param EventManager $eventManager
      * @param CacheInterface $appCache
      * @param DeferredCacheContext $deferredCacheContext
      * @param CacheContext $cacheContext
-     * @param TypeListInterface $cacheTypeList
      */
     public function __construct(
         EventManager $eventManager,
         CacheInterface $appCache,
         DeferredCacheContext $deferredCacheContext,
-        CacheContext $cacheContext,
-        TypeListInterface $cacheTypeList
+        CacheContext $cacheContext
     ) {
         $this->eventManager = $eventManager;
         $this->deferredCacheContext = $deferredCacheContext;
         $this->appCache = $appCache;
         $this->cacheContext = $cacheContext;
-        $this->cacheTypeList = $cacheTypeList;
     }
 
     /**
@@ -84,7 +73,6 @@ public function flush(): void
         $this->deferredCacheContext->commit();
         $this->eventManager->dispatch('clean_cache_by_tags', ['object' => $this->cacheContext]);
         $identities = $this->cacheContext->getIdentities();
-        $this->cacheTypeList->cleanType('graphql_query_resolver_result');
         if (!empty($identities)) {
             $this->appCache->clean($identities);
             $this->cacheContext->flush();