ACP2E-1875: Products incorrectly showed Out of Stock then all products show in stock

Author: Anna Bukatar

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

@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ImportExport\Plugin;
+
+use Magento\Framework\Indexer\DeferredCacheCleanerInterface;
+use Magento\ImportExport\Model\Import;
+
+class DeferCacheCleaningUntilImportIsComplete
+{
+    /**
+     * @var DeferredCacheCleanerInterface
+     */
+    private $cacheCleaner;
+
+    /**
+     * @param DeferredCacheCleanerInterface $cacheCleaner
+     */
+    public function __construct(DeferredCacheCleanerInterface $cacheCleaner)
+    {
+        $this->cacheCleaner = $cacheCleaner;
+    }
+
+    /**
+     * Start deferred cache before stock items save
+     *
+     * @param Import $subject
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeImportSource(Import $subject): void
+    {
+        $this->cacheCleaner->start();
+    }
+
+    /**
+     * Flush deferred cache after stock items save
+     *
+     * @param Import $subject
+     * @param bool $result
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterImportSource(Import $subject, bool $result): void
+    {
+        $this->cacheCleaner->flush();
+    }
+}

app/code/Magento/ImportExport/etc/di.xml

@@ -39,4 +39,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\ImportExport\Model\Import">
+        <plugin name="import_defer_cache" type="Magento\ImportExport\Plugin\DeferCacheCleaningUntilImportIsComplete" sortOrder="1"/>
+    </type>
 </config>

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

@@ -10,11 +10,12 @@
 use Magento\Framework\App\CacheInterface;
 use Magento\Framework\Event\Manager as EventManager;
 use Magento\Framework\Indexer\CacheContext;
+use Magento\Framework\Indexer\DeferredCacheCleanerInterface;
 
 /**
  * Deferred cache cleaner for indexers
  */
-class DeferredCacheCleaner
+class DeferredCacheCleaner implements DeferredCacheCleanerInterface
 {
     /**
      * @var EventManager

app/code/Magento/Indexer/etc/di.xml

@@ -13,6 +13,7 @@
     <preference for="Magento\Framework\Indexer\Table\StrategyInterface" type="Magento\Framework\Indexer\Table\Strategy" />
     <preference for="Magento\Framework\Indexer\StateInterface" type="Magento\Indexer\Model\Indexer\State" />
     <preference for="Magento\Framework\Indexer\IndexMutexInterface" type="Magento\Indexer\Model\IndexMutex" />
+    <preference for="Magento\Framework\Indexer\DeferredCacheCleanerInterface" type="Magento\Indexer\Model\Indexer\DeferredCacheCleaner" />
     <type name="Magento\Framework\Indexer\Table\StrategyInterface" shared="false" />
     <type name="Magento\Indexer\Model\Indexer">
         <arguments>

lib/internal/Magento/Framework/Indexer/DeferredCacheCleanerInterface.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Indexer;
+
+interface DeferredCacheCleanerInterface
+{
+    /**
+     * Defer cache cleaning until flush() is called
+     *
+     * @see flush()
+     */
+    public function start(): void;
+
+    /**
+     * Flush cache
+     */
+    public function flush(): void;
+}