ACP2E-1569: Elasticsearch Indexer document version changes version when new/existing products are imported

Author: o-iegorov

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

@@ -31,7 +31,6 @@
 use Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor;
 use Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface;
 use Magento\Framework\Stdlib\DateTime;
-use Magento\Framework\Indexer\Config\DependencyInfoProviderInterface;
 use Magento\ImportExport\Model\Import;
 use Magento\ImportExport\Model\Import\Entity\AbstractEntity;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError;
@@ -768,11 +767,6 @@ class Product extends AbstractEntity
      */
     private $stockItemProcessor;
 
-    /**
-     * @var DependencyInfoProviderInterface
-     */
-    private $dependencyInfoProvider;
-
     /**
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param \Magento\ImportExport\Helper\Data $importExportData
@@ -823,7 +817,6 @@ class Product extends AbstractEntity
      * @param LinkProcessor|null $linkProcessor
      * @param File|null $fileDriver
      * @param StockItemProcessorInterface|null $stockItemProcessor
-     * @param DependencyInfoProviderInterface|null $dependencyInfoProvider
      * @throws LocalizedException
      * @throws \Magento\Framework\Exception\FileSystemException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -879,8 +872,7 @@ public function __construct(
         StockProcessor $stockProcessor = null,
         LinkProcessor $linkProcessor = null,
         ?File $fileDriver = null,
-        ?StockItemProcessorInterface $stockItemProcessor = null,
-        ?DependencyInfoProviderInterface $dependencyInfoProvider = null
+        ?StockItemProcessorInterface $stockItemProcessor = null
     ) {
         $this->_eventManager = $eventManager;
         $this->stockRegistry = $stockRegistry;
@@ -946,8 +938,6 @@ public function __construct(
                 ->get(ProductRepositoryInterface::class);
         $this->stockItemProcessor = $stockItemProcessor ?? ObjectManager::getInstance()
             ->get(StockItemProcessorInterface::class);
-        $this->dependencyInfoProvider = $dependencyInfoProvider ?? ObjectManager::getInstance()
-            ->get(DependencyInfoProviderInterface::class);
     }
 
     /**
@@ -2483,15 +2473,6 @@ private function reindexProducts($productIdsToReindex = [])
             foreach ($indexersToReindex as $id) {
                 $indexer = $this->indexerRegistry->get($id);
                 if (!$indexer->isScheduled()) {
-                    //trick for dependent indexers in scheduled mode
-                    //related issue: AC-7851
-                    $idsToRunBefore = $this->dependencyInfoProvider->getIndexerIdsToRunBefore($id);
-                    foreach ($idsToRunBefore as $dependentId) {
-                        $dependentIndexer = $this->indexerRegistry->get($dependentId);
-                        if ($dependentIndexer->isScheduled()) {
-                            $dependentIndexer->reindexList($productIdsToReindex);
-                        }
-                    }
                     $indexer->reindexList($productIdsToReindex);
                 }
             }

app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php

@@ -9,6 +9,8 @@
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ProductFactory;
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\Catalog\Model\Indexer\Product\Price\Processor as PriceIndexProcessor;
+use Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor;
 use Magento\CatalogRule\Model\Indexer\IndexBuilder\ProductLoader;
 use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface as TableSwapper;
 use Magento\CatalogRule\Model\ResourceModel\Rule\Collection as RuleCollection;
@@ -18,6 +20,7 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Indexer\IndexerRegistry;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
@@ -167,6 +170,11 @@ class IndexBuilder
      */
     private $productLoader;
 
+    /**
+     * @var IndexerRegistry
+     */
+    private $indexerRegistry;
+
     /**
      * @param RuleCollectionFactory $ruleCollectionFactory
      * @param PriceCurrencyInterface $priceCurrency
@@ -188,6 +196,7 @@ class IndexBuilder
      * @param ProductLoader|null $productLoader
      * @param TableSwapper|null $tableSwapper
      * @param TimezoneInterface|null $localeDate
+     * @param IndexerRegistry|null $indexerRegistry
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -211,7 +220,8 @@ public function __construct(
         ActiveTableSwitcher $activeTableSwitcher = null,
         ProductLoader $productLoader = null,
         TableSwapper $tableSwapper = null,
-        TimezoneInterface $localeDate = null
+        TimezoneInterface $localeDate = null,
+        IndexerRegistry $indexerRegistry = null
     ) {
         $this->resource = $resource;
         $this->connection = $resource->getConnection();
@@ -253,6 +263,8 @@ public function __construct(
             ObjectManager::getInstance()->get(TableSwapper::class);
         $this->localeDate = $localeDate ??
             ObjectManager::getInstance()->get(TimezoneInterface::class);
+        $this->indexerRegistry = $indexerRegistry ??
+            ObjectManager::getInstance()->get(IndexerRegistry::class);
     }
 
     /**
@@ -323,6 +335,15 @@ protected function doReindexByIds($ids)
             $this->reindexRuleProductPrice->execute($this->batchCount, $productId);
         }
 
+        //the case was not handled via indexer dependency decorator or via mview configuration
+        $ruleIndexer = $this->indexerRegistry->get(RuleProductProcessor::INDEXER_ID);
+        if ($ruleIndexer->isScheduled()) {
+            $priceIndexer = $this->indexerRegistry->get(PriceIndexProcessor::INDEXER_ID);
+            if (!$priceIndexer->isScheduled()) {
+                $priceIndexer->reindexList($ids);
+            }
+        }
+
         $this->reindexRuleGroupWebsite->execute();
     }