MC-18254: Catalog rule indexer works incorrectly if Magento timezone offset is greater then system timezone offset

Author: dhorytskyi

app/code/Magento/CatalogRule/Observer/PrepareCatalogProductCollectionPricesObserver.php

@@ -12,11 +12,10 @@
 namespace Magento\CatalogRule\Observer;
 
 use Magento\Catalog\Model\Product;
-use Magento\CatalogRule\Model\Rule;
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Customer\Model\Session as CustomerModelSession;
-use Magento\Framework\Event\Observer as EventObserver;
 use Magento\Customer\Api\GroupManagementInterface;
 use Magento\Framework\Event\ObserverInterface;
 
@@ -90,7 +89,7 @@ public function __construct(
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
-        /* @var $collection ProductCollection */
+        /** @var ProductCollection $collection */
         $collection = $observer->getEvent()->getCollection();
         $store = $this->storeManager->getStore($observer->getEvent()->getStoreId());
         $websiteId = $store->getWebsiteId();

app/code/Magento/CatalogRule/Observer/ProcessAdminFinalPriceObserver.php

@@ -7,11 +7,7 @@
 
 namespace Magento\CatalogRule\Observer;
 
-use Magento\Catalog\Model\Product;
-use Magento\CatalogRule\Model\Rule;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
-use Magento\Customer\Model\Session as CustomerModelSession;
-use Magento\Framework\Event\Observer as EventObserver;
 use Magento\Framework\Registry;
 use Magento\Framework\Event\ObserverInterface;
 

app/code/Magento/CatalogRule/Observer/ProcessFrontFinalPriceObserver.php

@@ -8,12 +8,9 @@
 namespace Magento\CatalogRule\Observer;
 
 use Magento\Framework\Event\ObserverInterface;
-use Magento\Catalog\Model\Product;
-use Magento\CatalogRule\Model\Rule;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Customer\Model\Session as CustomerModelSession;
-use Magento\Framework\Event\Observer as EventObserver;
 
 /**
  * Observer for applying catalog rules on product for frontend area

app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php

@@ -9,14 +9,13 @@
 
 use Magento\Catalog\Model\Product;
 use Magento\CatalogRule\Model\ResourceModel\Rule;
-use Magento\CatalogRule\Model\ResourceModel\RuleFactory;
 use Magento\Customer\Model\Session;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Pricing\Adjustment\Calculator;
 use Magento\Framework\Pricing\Price\AbstractPrice;
 use Magento\Framework\Pricing\Price\BasePriceProviderInterface;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
-use Magento\Store\Model\StoreManager;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class CatalogRulePrice
@@ -31,56 +30,50 @@ class CatalogRulePrice extends AbstractPrice implements BasePriceProviderInterfa
     const PRICE_CODE = 'catalog_rule_price';
 
     /**
-     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
+     * @var TimezoneInterface
      */
     protected $dateTime;
 
     /**
-     * @var \Magento\Store\Model\StoreManager
+     * @var StoreManagerInterface
      */
     protected $storeManager;
 
     /**
-     * @var \Magento\Customer\Model\Session
+     * @var Session
      */
     protected $customerSession;
 
     /**
-     * @var \Magento\CatalogRule\Model\ResourceModel\RuleFactory
-     * @deprecated 100.1.1
-     */
-    protected $resourceRuleFactory;
-
-    /**
-     * @var \Magento\CatalogRule\Model\ResourceModel\Rule
+     * @var Rule
      */
     private $ruleResource;
 
     /**
      * @param Product $saleableItem
      * @param float $quantity
      * @param Calculator $calculator
-     * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
+     * @param PriceCurrencyInterface $priceCurrency
      * @param TimezoneInterface $dateTime
-     * @param StoreManager $storeManager
+     * @param StoreManagerInterface $storeManager
      * @param Session $customerSession
-     * @param RuleFactory $catalogRuleResourceFactory
+     * @param Rule $ruleResource
      */
     public function __construct(
         Product $saleableItem,
         $quantity,
         Calculator $calculator,
-        \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
+        PriceCurrencyInterface $priceCurrency,
         TimezoneInterface $dateTime,
-        StoreManager $storeManager,
+        StoreManagerInterface $storeManager,
         Session $customerSession,
-        RuleFactory $catalogRuleResourceFactory
+        Rule $ruleResource
     ) {
         parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
         $this->dateTime = $dateTime;
         $this->storeManager = $storeManager;
         $this->customerSession = $customerSession;
-        $this->resourceRuleFactory = $catalogRuleResourceFactory;
+        $this->ruleResource = $ruleResource;
     }
 
     /**
@@ -94,13 +87,12 @@ public function getValue()
             if ($this->product->hasData(self::PRICE_CODE)) {
                 $this->value = (float)$this->product->getData(self::PRICE_CODE) ?: false;
             } else {
-                $this->value = $this->getRuleResource()
-                    ->getRulePrice(
-                        $this->dateTime->date(null, null, false),
-                        $this->storeManager->getStore()->getWebsiteId(),
-                        $this->customerSession->getCustomerGroupId(),
-                        $this->product->getId()
-                    );
+                $this->value = $this->ruleResource->getRulePrice(
+                    $this->dateTime->date(null, null, false),
+                    $this->storeManager->getStore()->getWebsiteId(),
+                    $this->customerSession->getCustomerGroupId(),
+                    $this->product->getId()
+                );
                 $this->value = $this->value ? (float)$this->value : false;
             }
             if ($this->value) {
@@ -110,19 +102,4 @@ public function getValue()
 
         return $this->value;
     }
-
-    /**
-     * Retrieve rule resource
-     *
-     * @return Rule
-     * @deprecated 100.1.1
-     */
-    private function getRuleResource()
-    {
-        if (null === $this->ruleResource) {
-            $this->ruleResource = ObjectManager::getInstance()->get(Rule::class);
-        }
-
-        return $this->ruleResource;
-    }
 }