Issue 36049: Catalog Price Rule single product reindex works incorrectly

Author: rogerdz

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

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\CatalogRule\Model\Indexer;
 
@@ -42,6 +43,7 @@ class IndexBuilder
      * @var \Magento\Framework\EntityManager\MetadataPool
      * @deprecated 101.0.0
      * @since 100.1.0
+     * @see Not used anymore
      */
     protected $metadataPool;
 
@@ -52,6 +54,7 @@ class IndexBuilder
      *
      * @var array
      * @deprecated 101.0.0
+     * @see Not used anymore
      */
     protected $_catalogRuleGroupWebsiteColumnsList = ['rule_id', 'customer_group_id', 'website_id'];
 
@@ -265,12 +268,15 @@ public function reindexById($id)
         try {
             $this->cleanProductIndex([$id]);
 
-            $products = $this->productLoader->getProducts([$id]);
             $activeRules = $this->getActiveRules();
-            foreach ($products as $product) {
-                $this->applyRules($activeRules, $product);
+            foreach ($activeRules as $rule) {
+                $rule->setProductsFilter([$id]);
+                $this->reindexRuleProduct->execute($rule, $this->batchCount);
             }
 
+            $this->cleanProductPriceIndex([$id]);
+            $this->reindexRuleProductPrice->execute($this->batchCount, $id);
+
             $this->reindexRuleGroupWebsite->execute();
         } catch (\Exception $e) {
             $this->critical($e);
@@ -486,28 +492,6 @@ 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/ReindexRuleProduct.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\CatalogRule\Model\Indexer;
 
@@ -124,7 +125,7 @@ public function execute(Rule $rule, $batchCount, $useAdditionalTable = false)
                 : $toTimeInAdminTz;
 
             foreach ($productIds as $productId => $validationByWebsite) {
-                if (!isset($validationByWebsite[$websiteId]) || $validationByWebsite[$websiteId] === null) {
+                if (empty($validationByWebsite[$websiteId])) {
                     continue;
                 }
 

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

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\CatalogRule\Model;
 
 use Magento\Catalog\Model\Product;
@@ -13,6 +15,7 @@
 use Magento\CatalogRule\Helper\Data;
 use Magento\CatalogRule\Model\Data\Condition\Converter;
 use Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor;
+use Magento\CatalogRule\Model\ResourceModel\Product\ConditionsToCollectionApplier;
 use Magento\CatalogRule\Model\ResourceModel\Rule as RuleResourceModel;
 use Magento\CatalogRule\Model\Rule\Action\CollectionFactory as RuleCollectionFactory;
 use Magento\CatalogRule\Model\Rule\Condition\CombineFactory;
@@ -33,7 +36,6 @@
 use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\CatalogRule\Model\ResourceModel\Product\ConditionsToCollectionApplier;
 
 /**
  * Catalog Rule data model
@@ -95,7 +97,7 @@ class Rule extends \Magento\Rule\Model\AbstractModel implements RuleInterface, I
     protected static $_priceRulesData = [];
 
     /**
-     * Catalog rule data
+     * Catalog rule data class
      *
      * @var \Magento\CatalogRule\Helper\Data
      */
@@ -348,6 +350,7 @@ public function getMatchingProductIds()
             if ($this->getWebsiteIds()) {
                 /** @var $productCollection \Magento\Catalog\Model\ResourceModel\Product\Collection */
                 $productCollection = $this->_productCollectionFactory->create();
+                $productCollection->setStoreId($this->_storeManager->getDefaultStoreView()->getId());
                 $productCollection->addWebsiteFilter($this->getWebsiteIds());
                 if ($this->_productsFilter) {
                     $productCollection->addIdFilter($this->_productsFilter);
@@ -879,6 +882,7 @@ public function setExtensionAttributes(RuleExtensionInterface $extensionAttribut
      *
      * @return Data\Condition\Converter
      * @deprecated 100.1.0
+     * @see getRuleCondition, setRuleCondition
      */
     private function getRuleConditionConverter()
     {