Merge remote-tracking branch 'origin/AC-9569' into spartans_pr_15042024

Author: glo60612

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

@@ -7,22 +7,45 @@
 
 namespace Magento\ImportExport\Plugin;
 
+use Magento\Framework\App\Cache\TypeListInterface;
+use Magento\Framework\App\RequestInterface;
 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;
 
+    /**
+     * @var TypeListInterface
+     */
+    private $cacheTypeList;
+
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
     /**
      * @param DeferredCacheCleanerInterface $cacheCleaner
+     * @param TypeListInterface $cacheTypeList
+     * @param RequestInterface $request
      */
-    public function __construct(DeferredCacheCleanerInterface $cacheCleaner)
-    {
+    public function __construct(
+        DeferredCacheCleanerInterface $cacheCleaner,
+        TypeListInterface $cacheTypeList,
+        RequestInterface $request
+    ) {
         $this->cacheCleaner = $cacheCleaner;
+        $this->cacheTypeList = $cacheTypeList;
+        $this->request = $request;
     }
 
     /**
@@ -47,6 +70,13 @@ public function beforeImportSource(Import $subject): void
      */
     public function afterImportSource(Import $subject, bool $result): bool
     {
+        $behavior = $this->request->getParam('behavior');
+        $entity = $this->request->getParam('entity');
+
+        if ($behavior === self::BEHAVIOR_ADD_UPDATE &&
+            $entity === self::ENTITY_CUSTOMER) {
+            $this->cacheTypeList->cleanType(self::CACHE_TYPE_GRAPHQL_QUERY_RESOLVER_RESULT);
+        }
         $this->cacheCleaner->flush();
         return $result;
     }

app/code/Magento/ImportExport/Test/Unit/Plugin/DeferCacheCleaningUntilImportIsCompleteTest.php

@@ -7,6 +7,8 @@
 
 namespace Magento\ImportExport\Test\Unit\Plugin;
 
+use Magento\Framework\App\Cache\TypeListInterface;
+use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Indexer\DeferredCacheCleanerInterface;
 use Magento\ImportExport\Model\Import;
 use Magento\ImportExport\Plugin\DeferCacheCleaningUntilImportIsComplete;
@@ -25,14 +27,30 @@ class DeferCacheCleaningUntilImportIsCompleteTest extends TestCase
      */
     private $cacheCleaner;
 
+    /**
+     * @var TypeListInterface|MockObject
+     */
+    private $cacheTypeList;
+
+    /**
+     * @var RequestInterface|MockObject
+     */
+    private $request;
+
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
         parent::setUp();
         $this->cacheCleaner = $this->getMockForAbstractClass(DeferredCacheCleanerInterface::class);
-        $this->plugin = new DeferCacheCleaningUntilImportIsComplete($this->cacheCleaner);
+        $this->cacheTypeList = $this->getMockForAbstractClass(TypeListInterface::class);
+        $this->request = $this->createMock(RequestInterface::class);
+        $this->plugin = new DeferCacheCleaningUntilImportIsComplete(
+            $this->cacheCleaner,
+            $this->cacheTypeList,
+            $this->request
+        );
     }
 
     /**
@@ -52,6 +70,11 @@ public function testAfterMethod()
     {
         $this->cacheCleaner->expects($this->once())->method('flush');
         $subject = $this->createMock(Import::class);
+        // Assuming 'behavior' and 'entity' are the parameter names
+        $this->request->expects($this->any())->method('getParam')->willReturnMap([
+            ['behavior', null, 'add_update'],
+            ['entity', null, 'customer'],
+        ]);
         $result = $this->plugin->afterImportSource($subject, true);
         $this->assertTrue($result);
     }