Merge remote-tracking branch 'origin/MC-40384' into 2.4-develop-pr50

Author: Serhii Balko

app/code/Magento/Sales/Model/ResourceModel/Order/Grid/Collection.php

@@ -5,16 +5,25 @@
  */
 namespace Magento\Sales\Model\ResourceModel\Order\Grid;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
 use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
 use Magento\Framework\Event\ManagerInterface as EventManager;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult;
+use Magento\Sales\Model\ResourceModel\Order;
 use Psr\Log\LoggerInterface as Logger;
 
 /**
  * Order grid collection
  */
-class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
+class Collection extends SearchResult
 {
+    /**
+     * @var TimezoneInterface
+     */
+    private $timeZone;
+
     /**
      * Initialize dependencies.
      *
@@ -24,16 +33,20 @@ class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvide
      * @param EventManager $eventManager
      * @param string $mainTable
      * @param string $resourceModel
+     * @param TimezoneInterface|null $timeZone
      */
     public function __construct(
         EntityFactory $entityFactory,
         Logger $logger,
         FetchStrategy $fetchStrategy,
         EventManager $eventManager,
         $mainTable = 'sales_order_grid',
-        $resourceModel = \Magento\Sales\Model\ResourceModel\Order::class
+        $resourceModel = Order::class,
+        TimezoneInterface $timeZone = null
     ) {
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
+        $this->timeZone = $timeZone ?: ObjectManager::getInstance()
+            ->get(TimezoneInterface::class);
     }
 
     /**
@@ -50,4 +63,20 @@ protected function _initSelect()
 
         return $this;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function addFieldToFilter($field, $condition = null)
+    {
+        if ($field === 'created_at') {
+            if (is_array($condition)) {
+                foreach ($condition as $key => $value) {
+                    $condition[$key] = $this->timeZone->convertConfigTimeToUtc($value);
+                }
+            }
+        }
+
+        return parent::addFieldToFilter($field, $condition);
+    }
 }

dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/Grid/CollectionTest.php

@@ -7,10 +7,26 @@
 
 namespace Magento\Sales\Model\ResourceModel\Order\Grid;
 
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
 
-class CollectionTest extends \PHPUnit\Framework\TestCase
+class CollectionTest extends TestCase
 {
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+    }
+
     /**
      * Tests collection properties.
      *
@@ -19,10 +35,8 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
      */
     public function testCollectionCreate(): void
     {
-        $objectManager = Bootstrap::getObjectManager();
-
         /** @var Collection $gridCollection */
-        $gridCollection = $objectManager->get(Collection::class);
+        $gridCollection = $this->objectManager->get(Collection::class);
         $tableDescription = $gridCollection->getConnection()
             ->describeTable($gridCollection->getMainTable());
 
@@ -42,4 +56,25 @@ public function testCollectionCreate(): void
             self::assertStringContainsString('main_table.', $mappedName);
         }
     }
+
+    /**
+     * Verifies that filter condition date is being converted to config timezone before select sql query
+     *
+     * @return void
+     */
+    public function testAddFieldToFilter(): void
+    {
+        $filterDate = "2021-01-19 00:00:00";
+        /** @var TimezoneInterface $timeZone */
+        $timeZone = $this->objectManager->get(TimezoneInterface::class);
+        /** @var Collection $gridCollection */
+        $gridCollection = $this->objectManager->get(Collection::class);
+        $convertedDate = $timeZone->convertConfigTimeToUtc($filterDate);
+
+        $collection = $gridCollection->addFieldToFilter('created_at', ['qteq' => $filterDate]);
+        $expectedSelect = "SELECT `main_table`.* FROM `sales_order_grid` AS `main_table` " .
+            "WHERE (((`main_table`.`created_at` = '{$convertedDate}')))";
+
+        $this->assertEquals($expectedSelect, $collection->getSelectSql(true));
+    }
 }