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

dhorytskyi · dhorytskyi · commit 40a433bf1211 · 2019-08-15T18:44:38.000-05:00
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleProduct.php b/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleProduct.php
@@ -8,18 +8,15 @@
 
 use Magento\CatalogRule\Model\Indexer\IndexerTableSwapperInterface as TableSwapper;
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
-use Magento\CatalogRule\Model\Rule;
-use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Reindex rule relations with products.
  */
 class ReindexRuleProduct
 {
     /**
-     * @var ResourceConnection
+     * @var \Magento\Framework\App\ResourceConnection
      */
     private $resource;
 
@@ -34,40 +31,36 @@ class ReindexRuleProduct
     private $tableSwapper;
 
     /**
-     * @var TimezoneInterface
-     */
-    private $localeDate;
-
-    /**
-     * @param ResourceConnection $resource
+     * @param \Magento\Framework\App\ResourceConnection $resource
      * @param ActiveTableSwitcher $activeTableSwitcher
-     * @param TableSwapper $tableSwapper
-     * @param TimezoneInterface $localeDate
+     * @param TableSwapper|null $tableSwapper
      */
     public function __construct(
-        ResourceConnection $resource,
+        \Magento\Framework\App\ResourceConnection $resource,
         ActiveTableSwitcher $activeTableSwitcher,
-        TableSwapper $tableSwapper,
-        TimezoneInterface $localeDate
+        TableSwapper $tableSwapper = null
     ) {
         $this->resource = $resource;
         $this->activeTableSwitcher = $activeTableSwitcher;
-        $this->tableSwapper = $tableSwapper;
-        $this->localeDate = $localeDate;
+        $this->tableSwapper = $tableSwapper ??
+            ObjectManager::getInstance()->get(TableSwapper::class);
     }
 
     /**
      * Reindex information about rule relations with products.
      *
-     * @param Rule $rule
+     * @param \Magento\CatalogRule\Model\Rule $rule
      * @param int $batchCount
      * @param bool $useAdditionalTable
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function execute(Rule $rule, $batchCount, $useAdditionalTable = false)
-    {
+    public function execute(
+        \Magento\CatalogRule\Model\Rule $rule,
+        $batchCount,
+        $useAdditionalTable = false
+    ) {
         if (!$rule->getIsActive() || empty($rule->getWebsiteIds())) {
             return false;
         }
@@ -91,26 +84,21 @@ public function execute(Rule $rule, $batchCount, $useAdditionalTable = false)
 
         $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 ($productIds as $productId => $validationByWebsite) {
+            foreach ($websiteIds as $websiteId) {
                 if (empty($validationByWebsite[$websiteId])) {
                     continue;
                 }
-
                 foreach ($customerGroupIds as $customerGroupId) {
                     $rows[] = [
                         'rule_id' => $ruleId,
@@ -135,7 +123,6 @@ public function execute(Rule $rule, $batchCount, $useAdditionalTable = false)
         if (!empty($rows)) {
             $connection->insertMultiple($indexTable, $rows);
         }
-
         return true;
     }
 }
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleProductPrice.php b/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleProductPrice.php
@@ -6,72 +6,82 @@
 
 namespace Magento\CatalogRule\Model\Indexer;
 
-use Magento\Catalog\Model\Product;
-use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
-use Magento\Store\Model\StoreManagerInterface;
-
 /**
  * Reindex product prices according rule settings.
  */
 class ReindexRuleProductPrice
 {
     /**
-     * @var StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     private $storeManager;
 
     /**
-     * @var RuleProductsSelectBuilder
+     * @var \Magento\CatalogRule\Model\Indexer\RuleProductsSelectBuilder
      */
     private $ruleProductsSelectBuilder;
 
     /**
-     * @var ProductPriceCalculator
+     * @var \Magento\CatalogRule\Model\Indexer\ProductPriceCalculator
      */
     private $productPriceCalculator;
 
     /**
-     * @var TimezoneInterface
+     * @var \Magento\Framework\Stdlib\DateTime\DateTime
      */
-    private $localeDate;
+    private $dateTime;
 
     /**
-     * @var RuleProductPricesPersistor
+     * @var \Magento\CatalogRule\Model\Indexer\RuleProductPricesPersistor
      */
     private $pricesPersistor;
 
     /**
-     * @param StoreManagerInterface $storeManager
+     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
+     */
+    private $localeDate;
+
+    /**
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param RuleProductsSelectBuilder $ruleProductsSelectBuilder
      * @param ProductPriceCalculator $productPriceCalculator
-     * @param TimezoneInterface $localeDate
-     * @param RuleProductPricesPersistor $pricesPersistor
+     * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
+     * @param \Magento\CatalogRule\Model\Indexer\RuleProductPricesPersistor $pricesPersistor
+     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      */
     public function __construct(
-        StoreManagerInterface $storeManager,
-        RuleProductsSelectBuilder $ruleProductsSelectBuilder,
-        ProductPriceCalculator $productPriceCalculator,
-        TimezoneInterface $localeDate,
-        RuleProductPricesPersistor $pricesPersistor
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\CatalogRule\Model\Indexer\RuleProductsSelectBuilder $ruleProductsSelectBuilder,
+        \Magento\CatalogRule\Model\Indexer\ProductPriceCalculator $productPriceCalculator,
+        \Magento\Framework\Stdlib\DateTime\DateTime $dateTime,
+        \Magento\CatalogRule\Model\Indexer\RuleProductPricesPersistor $pricesPersistor,
+        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
     ) {
         $this->storeManager = $storeManager;
         $this->ruleProductsSelectBuilder = $ruleProductsSelectBuilder;
         $this->productPriceCalculator = $productPriceCalculator;
-        $this->localeDate = $localeDate;
+        $this->dateTime = $dateTime;
         $this->pricesPersistor = $pricesPersistor;
+        $this->localeDate = $localeDate;
     }
 
     /**
      * Reindex product prices.
      *
      * @param int $batchCount
-     * @param Product|null $product
+     * @param \Magento\Catalog\Model\Product|null $product
      * @param bool $useAdditionalTable
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function execute($batchCount, Product $product = null, $useAdditionalTable = false)
-    {
+    public function execute(
+        $batchCount,
+        \Magento\Catalog\Model\Product $product = null,
+        $useAdditionalTable = false
+    ) {
+        $fromDate = mktime(0, 0, 0, date('m'), date('d') - 1);
+        $toDate = mktime(0, 0, 0, date('m'), date('d') + 1);
+
         /**
          * Update products rules prices per each website separately
          * because for each website date in website's timezone should be used
@@ -81,13 +91,8 @@ public function execute($batchCount, Product $product = null, $useAdditionalTabl
             $dayPrices = [];
             $stopFlags = [];
             $prevKey = null;
-
             $storeGroup = $this->storeManager->getGroup($website->getDefaultGroupId());
-            $currentDate = $this->localeDate->scopeDate($storeGroup->getDefaultStoreId(), null, true);
-            $previousDate = (clone $currentDate)->modify('-1 day');
-            $previousDate->setTime(23, 59, 59);
-            $nextDate = (clone $currentDate)->modify('+1 day');
-            $nextDate->setTime(0, 0, 0);
+            $storeId = $storeGroup->getDefaultStoreId();
 
             while ($ruleData = $productsStmt->fetch()) {
                 $ruleProductId = $ruleData['product_id'];
@@ -105,24 +110,24 @@ public function execute($batchCount, Product $product = null, $useAdditionalTabl
                     }
                 }
 
+                $ruleData['from_time'] = $this->roundTime($ruleData['from_time']);
+                $ruleData['to_time'] = $this->roundTime($ruleData['to_time']);
                 /**
                  * Build prices for each day
                  */
-                foreach ([$previousDate, $currentDate, $nextDate] as $date) {
-                    $time = $date->getTimestamp();
+                for ($time = $fromDate; $time <= $toDate; $time += IndexBuilder::SECONDS_IN_DAY) {
                     if (($ruleData['from_time'] == 0 ||
                             $time >= $ruleData['from_time']) && ($ruleData['to_time'] == 0 ||
                             $time <= $ruleData['to_time'])
                     ) {
                         $priceKey = $time . '_' . $productKey;
-
                         if (isset($stopFlags[$priceKey])) {
                             continue;
                         }
 
                         if (!isset($dayPrices[$priceKey])) {
                             $dayPrices[$priceKey] = [
-                                'rule_date' => $date,
+                                'rule_date' => $this->localeDate->scopeDate($storeId, $time),
                                 'website_id' => $ruleData['website_id'],
                                 'customer_group_id' => $ruleData['customer_group_id'],
                                 'product_id' => $ruleProductId,
@@ -155,6 +160,19 @@ public function execute($batchCount, Product $product = null, $useAdditionalTabl
             }
             $this->pricesPersistor->execute($dayPrices, $useAdditionalTable);
         }
+
         return true;
     }
+
+    /**
+     * @param int $timeStamp
+     * @return int
+     */
+    private function roundTime($timeStamp)
+    {
+        if (is_numeric($timeStamp) && $timeStamp != 0) {
+            $timeStamp = $this->dateTime->timestamp($this->dateTime->date('Y-m-d 00:00:00', $timeStamp));
+        }
+        return $timeStamp;
+    }
 }
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductPriceTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductPriceTest.php
@@ -11,6 +11,7 @@
 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;
@@ -40,60 +41,65 @@ class ReindexRuleProductPriceTest extends \PHPUnit\Framework\TestCase
     private $productPriceCalculatorMock;
 
     /**
-     * @var TimezoneInterface|MockObject
+     * @var DateTime|MockObject
      */
-    private $localeDate;
+    private $dateTimeMock;
 
     /**
      * @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->localeDate = $this->createMock(TimezoneInterface::class);
+        $this->dateTimeMock = $this->createMock(DateTime::class);
         $this->pricesPersistorMock = $this->createMock(RuleProductPricesPersistor::class);
+        $this->localeDate = $this->createMock(TimezoneInterface::class);
 
         $this->model = new ReindexRuleProductPrice(
             $this->storeManagerMock,
             $this->ruleProductsSelectBuilderMock,
             $this->productPriceCalculatorMock,
-            $this->localeDate,
-            $this->pricesPersistorMock
+            $this->dateTimeMock,
+            $this->pricesPersistorMock,
+            $this->localeDate
         );
     }
 
     public function testExecute()
     {
         $websiteId = 234;
-        $defaultGroupId = 11;
-        $defaultStoreId = 22;
+        $storeGroupId = 30;
+        $storeId = 40;
+        $productMock = $this->createMock(Product::class);
 
         $websiteMock = $this->createMock(WebsiteInterface::class);
         $websiteMock->expects($this->once())
             ->method('getId')
             ->willReturn($websiteId);
         $websiteMock->expects($this->once())
             ->method('getDefaultGroupId')
-            ->willReturn($defaultGroupId);
+            ->willReturn($storeGroupId);
         $this->storeManagerMock->expects($this->once())
             ->method('getWebsites')
             ->willReturn([$websiteMock]);
-        $groupMock = $this->createMock(GroupInterface::class);
-        $groupMock->method('getId')
-            ->willReturn($defaultStoreId);
-        $groupMock->expects($this->once())
+        $storeGroupMock = $this->createMock(GroupInterface::class);
+        $storeGroupMock->expects($this->once())
             ->method('getDefaultStoreId')
-            ->willReturn($defaultStoreId);
+            ->willReturn($storeId);
         $this->storeManagerMock->expects($this->once())
             ->method('getGroup')
-            ->with($defaultGroupId)
-            ->willReturn($groupMock);
+            ->with($storeGroupId)
+            ->willReturn($storeGroupMock);
 
-        $productMock = $this->createMock(Product::class);
         $statementMock = $this->createMock(\Zend_Db_Statement_Interface::class);
         $this->ruleProductsSelectBuilderMock->expects($this->once())
             ->method('build')
@@ -109,10 +115,22 @@ public function testExecute()
             'action_stop' => true
         ];
 
-        $this->localeDate->expects($this->once())
-            ->method('scopeDate')
-            ->with($defaultStoreId, null, true)
-            ->willReturn(new \DateTime());
+        $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']);
 
         $statementMock->expects($this->at(0))
             ->method('fetch')
