#29549: Scheduled price rule time zone correction - refactoring.

Author: engcom-Foxtrot

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\CatalogRule\Model\Indexer\IndexBuilder\ProductLoader;
+use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface as TableSwapper;
 use Magento\CatalogRule\Model\ResourceModel\Rule\Collection as RuleCollection;
 use Magento\CatalogRule\Model\ResourceModel\Rule\CollectionFactory as RuleCollectionFactory;
 use Magento\CatalogRule\Model\Rule;
@@ -17,9 +19,9 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
-use Magento\CatalogRule\Model\Indexer\IndexBuilder\ProductLoader;
-use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface as TableSwapper;
 use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Psr\Log\LoggerInterface;
 
@@ -143,11 +145,26 @@ class IndexBuilder
      */
     private $pricesPersistor;
 
+    /**
+     * @var TimezoneInterface|mixed
+     */
+    private $localeDate;
+
+    /**
+     * @var ActiveTableSwitcher|mixed
+     */
+    private $activeTableSwitcher;
+
     /**
      * @var TableSwapper
      */
     private $tableSwapper;
 
+    /**
+     * @var ProductLoader|mixed
+     */
+    private $productLoader;
+
     /**
      * @param RuleCollectionFactory $ruleCollectionFactory
      * @param PriceCurrencyInterface $priceCurrency
@@ -168,6 +185,7 @@ class IndexBuilder
      * @param ActiveTableSwitcher|null $activeTableSwitcher
      * @param ProductLoader|null $productLoader
      * @param TableSwapper|null $tableSwapper
+     * @param TimezoneInterface|null $localeDate
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -190,7 +208,8 @@ public function __construct(
         RuleProductPricesPersistor $pricesPersistor = null,
         ActiveTableSwitcher $activeTableSwitcher = null,
         ProductLoader $productLoader = null,
-        TableSwapper $tableSwapper = null
+        TableSwapper $tableSwapper = null,
+        TimezoneInterface $localeDate = null
     ) {
         $this->resource = $resource;
         $this->connection = $resource->getConnection();
@@ -222,8 +241,16 @@ public function __construct(
         $this->pricesPersistor = $pricesPersistor ?? ObjectManager::getInstance()->get(
             RuleProductPricesPersistor::class
         );
+        $this->activeTableSwitcher = $activeTableSwitcher ?? ObjectManager::getInstance()->get(
+            ActiveTableSwitcher::class
+        );
+        $this->productLoader = $productLoader ?? ObjectManager::getInstance()->get(
+            ProductLoader::class
+        );
         $this->tableSwapper = $tableSwapper ??
             ObjectManager::getInstance()->get(TableSwapper::class);
+        $this->localeDate = $localeDate ??
+            ObjectManager::getInstance()->get(TimezoneInterface::class);
     }
 
     /**
@@ -237,11 +264,19 @@ public function __construct(
     public function reindexById($id)
     {
         try {
-            $this->doReindexByIds([$id]);
+            $this->cleanProductIndex([$id]);
+
+            $products = $this->productLoader->getProducts([$id]);
+            $activeRules = $this->getActiveRules();
+            foreach ($products as $product) {
+                $this->applyRules($activeRules, $product);
+            }
+
+            $this->reindexRuleGroupWebsite->execute();
         } catch (\Exception $e) {
             $this->critical($e);
             throw new LocalizedException(
-                __("Catalog rule indexing failed. See details in exception log.")
+                __('Catalog rule indexing failed. See details in exception log.')
             );
         }
     }
@@ -369,6 +404,68 @@ protected function cleanByIds($productIds)
         $this->cleanProductPriceIndex($productIds);
     }
 
+    /**
+     * Assign product to rule
+     *
+     * @param Rule $rule
+     * @param int $productEntityId
+     * @param array $websiteIds
+     * @return void
+     */
+    private function assignProductToRule(Rule $rule, int $productEntityId, array $websiteIds): void
+    {
+        $ruleId = (int) $rule->getId();
+        $ruleProductTable = $this->getTable('catalogrule_product');
+        $this->connection->delete(
+            $ruleProductTable,
+            [
+                'rule_id = ?' => $ruleId,
+                'product_id = ?' => $productEntityId,
+            ]
+        );
+
+        $customerGroupIds = $rule->getCustomerGroupIds();
+        $sortOrder = (int)$rule->getSortOrder();
+        $actionOperator = $rule->getSimpleAction();
+        $actionAmount = $rule->getDiscountAmount();
+        $actionStop = $rule->getStopRulesProcessing();
+
+        $rows = [];
+        foreach ($websiteIds as $websiteId) {
+            $scopeTz = new \DateTimeZone(
+                $this->localeDate->getConfigTimezone(ScopeInterface::SCOPE_WEBSITE, $websiteId)
+            );
+            $fromTime = $rule->getFromDate()
+                ? (new \DateTime($rule->getFromDate(), $scopeTz))->getTimestamp()
+                : 0;
+            $toTime = $rule->getToDate()
+                ? (new \DateTime($rule->getToDate(), $scopeTz))->getTimestamp() + IndexBuilder::SECONDS_IN_DAY - 1
+                : 0;
+            foreach ($customerGroupIds as $customerGroupId) {
+                $rows[] = [
+                    'rule_id' => $ruleId,
+                    'from_time' => $fromTime,
+                    'to_time' => $toTime,
+                    'website_id' => $websiteId,
+                    'customer_group_id' => $customerGroupId,
+                    'product_id' => $productEntityId,
+                    'action_operator' => $actionOperator,
+                    'action_amount' => $actionAmount,
+                    'action_stop' => $actionStop,
+                    'sort_order' => $sortOrder,
+                ];
+
+                if (count($rows) == $this->batchCount) {
+                    $this->connection->insertMultiple($ruleProductTable, $rows);
+                    $rows = [];
+                }
+            }
+        }
+        if ($rows) {
+            $this->connection->insertMultiple($ruleProductTable, $rows);
+        }
+    }
+
     /**
      * Apply rule
      *
@@ -392,6 +489,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
      *