MC-18954: Nightly build jobs were failing lately after un-skipping tests in MC-5777

Author: dhorytskyi

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

@@ -8,15 +8,18 @@
 
 use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface as TableSwapper;
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
-use Magento\Framework\App\ObjectManager;
+use Magento\CatalogRule\Model\Rule;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Reindex rule relations with products.
  */
 class ReindexRuleProduct
 {
     /**
-     * @var \Magento\Framework\App\ResourceConnection
+     * @var ResourceConnection
      */
     private $resource;
 
@@ -31,36 +34,40 @@ class ReindexRuleProduct
     private $tableSwapper;
 
     /**
-     * @param \Magento\Framework\App\ResourceConnection $resource
+     * @var TimezoneInterface
+     */
+    private $localeDate;
+
+    /**
+     * @param ResourceConnection $resource
      * @param ActiveTableSwitcher $activeTableSwitcher
-     * @param TableSwapper|null $tableSwapper
+     * @param TableSwapper $tableSwapper
+     * @param TimezoneInterface $localeDate
      */
     public function __construct(
-        \Magento\Framework\App\ResourceConnection $resource,
+        ResourceConnection $resource,
         ActiveTableSwitcher $activeTableSwitcher,
-        TableSwapper $tableSwapper = null
+        TableSwapper $tableSwapper,
+        TimezoneInterface $localeDate
     ) {
         $this->resource = $resource;
         $this->activeTableSwitcher = $activeTableSwitcher;
-        $this->tableSwapper = $tableSwapper ??
-            ObjectManager::getInstance()->get(TableSwapper::class);
+        $this->tableSwapper = $tableSwapper;
+        $this->localeDate = $localeDate;
     }
 
     /**
      * Reindex information about rule relations with products.
      *
-     * @param \Magento\CatalogRule\Model\Rule $rule
+     * @param Rule $rule
      * @param int $batchCount
      * @param bool $useAdditionalTable
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function execute(
-        \Magento\CatalogRule\Model\Rule $rule,
-        $batchCount,
-        $useAdditionalTable = false
-    ) {
+    public function execute(Rule $rule, $batchCount, $useAdditionalTable = false)
+    {
         if (!$rule->getIsActive() || empty($rule->getWebsiteIds())) {
             return false;
         }
@@ -84,21 +91,26 @@ public function execute(
 
         $ruleId = $rule->getId();
         $customerGroupIds = $rule->getCustomerGroupIds();
-        $fromTime = strtotime($rule->getFromDate());
-        $toTime = strtotime($rule->getToDate());
-        $toTime = $toTime ? $toTime + \Magento\CatalogRule\Model\Indexer\IndexBuilder::SECONDS_IN_DAY - 1 : 0;
         $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 = (new \DateTime($rule->getFromDate(), $scopeTz))->getTimestamp();
+            $toTime = $rule->getToDate()
+                ? (new \DateTime($rule->getToDate(), $scopeTz))->getTimestamp() + IndexBuilder::SECONDS_IN_DAY - 1
+                : 0;
 
-        foreach ($productIds as $productId => $validationByWebsite) {
-            foreach ($websiteIds as $websiteId) {
+            foreach ($productIds as $productId => $validationByWebsite) {
                 if (empty($validationByWebsite[$websiteId])) {
                     continue;
                 }
+
                 foreach ($customerGroupIds as $customerGroupId) {
                     $rows[] = [
                         'rule_id' => $ruleId,
@@ -123,6 +135,7 @@ public function execute(
         if (!empty($rows)) {
             $connection->insertMultiple($indexTable, $rows);
         }
+
         return true;
     }
 }

app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductPriceTest.php

@@ -11,7 +11,6 @@
 use Magento\CatalogRule\Model\Indexer\ReindexRuleProductPrice;
 use Magento\CatalogRule\Model\Indexer\RuleProductPricesPersistor;
 use Magento\CatalogRule\Model\Indexer\RuleProductsSelectBuilder;
-use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Store\Api\Data\GroupInterface;
 use Magento\Store\Api\Data\WebsiteInterface;
@@ -41,65 +40,60 @@ class ReindexRuleProductPriceTest extends \PHPUnit\Framework\TestCase
     private $productPriceCalculatorMock;
 
     /**
-     * @var DateTime|MockObject
+     * @var TimezoneInterface|MockObject
      */
-    private $dateTimeMock;
+    private $localeDate;
 
     /**
      * @var RuleProductPricesPersistor|MockObject
      */
     private $pricesPersistorMock;
 
-    /**
-     * @var TimezoneInterface|MockObject
-     */
-    private $localeDate;
-
     protected function setUp()
     {
         $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
         $this->ruleProductsSelectBuilderMock = $this->createMock(RuleProductsSelectBuilder::class);
         $this->productPriceCalculatorMock = $this->createMock(ProductPriceCalculator::class);
-        $this->dateTimeMock = $this->createMock(DateTime::class);
-        $this->pricesPersistorMock = $this->createMock(RuleProductPricesPersistor::class);
         $this->localeDate = $this->createMock(TimezoneInterface::class);
+        $this->pricesPersistorMock = $this->createMock(RuleProductPricesPersistor::class);
 
         $this->model = new ReindexRuleProductPrice(
             $this->storeManagerMock,
             $this->ruleProductsSelectBuilderMock,
             $this->productPriceCalculatorMock,
-            $this->dateTimeMock,
-            $this->pricesPersistorMock,
-            $this->localeDate
+            $this->localeDate,
+            $this->pricesPersistorMock
         );
     }
 
     public function testExecute()
     {
         $websiteId = 234;
-        $storeGroupId = 30;
-        $storeId = 40;
-        $productMock = $this->createMock(Product::class);
+        $defaultGroupId = 11;
+        $defaultStoreId = 22;
 
         $websiteMock = $this->createMock(WebsiteInterface::class);
         $websiteMock->expects($this->once())
             ->method('getId')
             ->willReturn($websiteId);
         $websiteMock->expects($this->once())
             ->method('getDefaultGroupId')
-            ->willReturn($storeGroupId);
+            ->willReturn($defaultGroupId);
         $this->storeManagerMock->expects($this->once())
             ->method('getWebsites')
             ->willReturn([$websiteMock]);
-        $storeGroupMock = $this->createMock(GroupInterface::class);
-        $storeGroupMock->expects($this->once())
+        $groupMock = $this->createMock(GroupInterface::class);
+        $groupMock->method('getId')
+            ->willReturn($defaultStoreId);
+        $groupMock->expects($this->once())
             ->method('getDefaultStoreId')
-            ->willReturn($storeId);
+            ->willReturn($defaultStoreId);
         $this->storeManagerMock->expects($this->once())
             ->method('getGroup')
-            ->with($storeGroupId)
-            ->willReturn($storeGroupMock);
+            ->with($defaultGroupId)
+            ->willReturn($groupMock);
 
+        $productMock = $this->createMock(Product::class);
         $statementMock = $this->createMock(\Zend_Db_Statement_Interface::class);
         $this->ruleProductsSelectBuilderMock->expects($this->once())
             ->method('build')
@@ -115,22 +109,10 @@ public function testExecute()
             'action_stop' => true
         ];
 
-        $this->dateTimeMock->expects($this->at(0))
-            ->method('date')
-            ->with('Y-m-d 00:00:00', $ruleData['from_time'])
-            ->willReturn($ruleData['from_time']);
-        $this->dateTimeMock->expects($this->at(1))
-            ->method('timestamp')
-            ->with($ruleData['from_time'])
-            ->willReturn($ruleData['from_time']);
-        $this->dateTimeMock->expects($this->at(2))
-            ->method('date')
-            ->with('Y-m-d 00:00:00', $ruleData['to_time'])
-            ->willReturn($ruleData['to_time']);
-        $this->dateTimeMock->expects($this->at(3))
-            ->method('timestamp')
-            ->with($ruleData['to_time'])
-            ->willReturn($ruleData['to_time']);
+        $this->localeDate->expects($this->once())
+            ->method('scopeDate')
+            ->with($defaultStoreId, null, true)
+            ->willReturn(new \DateTime());
 
         $statementMock->expects($this->at(0))
             ->method('fetch')