AC-6810: Catalog Price Rule single product reindex works incorrectly - 02

Author: glo35082

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

@@ -133,10 +133,10 @@ public function executeRow($id)
      * Execute partial indexation by ID. Template method
      *
      * @param int $id
+     * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
-     *@throws \Magento\Framework\Exception\LocalizedException
      */
-    abstract protected function doExecuteRow(int $id);
+    abstract protected function doExecuteRow($id);
 
     /**
      * Get cache manager

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

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types=1);
 
 namespace Magento\CatalogRule\Model\Indexer;
 
@@ -43,7 +42,6 @@ class IndexBuilder
      * @var \Magento\Framework\EntityManager\MetadataPool
      * @deprecated 101.0.0
      * @since 100.1.0
-     * @see Not used anymore
      */
     protected $metadataPool;
 
@@ -54,7 +52,6 @@ class IndexBuilder
      *
      * @var array
      * @deprecated 101.0.0
-     * @see Not used anymore
      */
     protected $_catalogRuleGroupWebsiteColumnsList = ['rule_id', 'customer_group_id', 'website_id'];
 
@@ -260,23 +257,20 @@ public function __construct(
      * Reindex by id
      *
      * @param int $id
+     * @throws LocalizedException
      * @return void
-     *@throws LocalizedException
      */
-    public function reindexById(int $id)
+    public function reindexById($id)
     {
         try {
             $this->cleanProductIndex([$id]);
 
+            $products = $this->productLoader->getProducts([$id]);
             $activeRules = $this->getActiveRules();
-            foreach ($activeRules as $rule) {
-                $rule->setProductsFilter([$id]);
-                $this->reindexRuleProduct->execute($rule, $this->batchCount);
+            foreach ($products as $product) {
+                $this->applyRules($activeRules, $product);
             }
 
-            $this->cleanProductPriceIndex([$id]);
-            $this->reindexRuleProductPrice->execute($this->batchCount, $id);
-
             $this->reindexRuleGroupWebsite->execute();
         } catch (\Exception $e) {
             $this->critical($e);
@@ -492,6 +486,28 @@ protected function applyRule(Rule $rule, $product)
         return $this;
     }
 
+    /**
+     * Apply rules
+     *
+     * @param RuleCollection $ruleCollection
+     * @param Product $product
+     * @return void
+     */
+    private function applyRules(RuleCollection $ruleCollection, Product $product): void
+    {
+        foreach ($ruleCollection as $rule) {
+            if (!$rule->validate($product)) {
+                continue;
+            }
+
+            $websiteIds = array_intersect($product->getWebsiteIds(), $rule->getWebsiteIds());
+            $this->assignProductToRule($rule, $product->getId(), $websiteIds);
+        }
+
+        $this->cleanProductPriceIndex([$product->getId()]);
+        $this->reindexRuleProductPrice->execute($this->batchCount, $product->getId());
+    }
+
     /**
      * Retrieve table name
      *

app/code/Magento/CatalogRule/Model/Indexer/Product/ProductRuleIndexer.php

@@ -21,7 +21,7 @@ protected function doExecuteList($ids)
     /**
      * {@inheritdoc}
      */
-    protected function doExecuteRow(int $id)
+    protected function doExecuteRow($id)
     {
         $this->indexBuilder->reindexById($id);
     }

app/code/Magento/CatalogRule/Model/Indexer/Rule/RuleProductIndexer.php

@@ -25,7 +25,7 @@ protected function doExecuteList($ids)
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    protected function doExecuteRow(int $id)
+    protected function doExecuteRow($id)
     {
         $this->indexBuilder->reindexFull();
     }