MC-40579: [Magento Cloud] Customer Account created time not filtered correctly

Author: yelahin-serhiy

app/code/Magento/Customer/Model/ResourceModel/Grid/Collection.php

@@ -7,10 +7,12 @@
 
 use Magento\Customer\Model\ResourceModel\Customer;
 use Magento\Customer\Ui\Component\DataProvider\Document;
+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\Locale\ResolverInterface;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult;
 use Psr\Log\LoggerInterface as Logger;
 
@@ -24,6 +26,11 @@ class Collection extends SearchResult
      */
     private $localeResolver;
 
+    /**
+     * @var TimezoneInterface
+     */
+    private $timeZone;
+
     /**
      * @inheritdoc
      */
@@ -42,6 +49,7 @@ class Collection extends SearchResult
      * @param ResolverInterface $localeResolver
      * @param string $mainTable
      * @param string $resourceModel
+     * @param TimezoneInterface|null $timeZone
      */
     public function __construct(
         EntityFactory $entityFactory,
@@ -50,10 +58,13 @@ public function __construct(
         EventManager $eventManager,
         ResolverInterface $localeResolver,
         $mainTable = 'customer_grid_flat',
-        $resourceModel = Customer::class
+        $resourceModel = Customer::class,
+        TimezoneInterface $timeZone = null
     ) {
         $this->localeResolver = $localeResolver;
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
+        $this->timeZone = $timeZone ?: ObjectManager::getInstance()
+            ->get(TimezoneInterface::class);
     }
 
     /**
@@ -81,6 +92,14 @@ public function addFieldToFilter($field, $condition = null)
             return $this;
         }
 
+        if ($field === 'created_at') {
+            if (is_array($condition)) {
+                foreach ($condition as $key => $value) {
+                    $condition[$key] = $this->timeZone->convertConfigTimeToUtc($value);
+                }
+            }
+        }
+
         if (is_string($field) && count(explode('.', $field)) === 1) {
             $field = 'main_table.' . $field;
         }

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

@@ -8,16 +8,19 @@
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Indexer\TestCase;
 
 /**
  * Customer grid collection tests.
  */
-class CollectionTest extends \Magento\TestFramework\Indexer\TestCase
+class CollectionTest extends TestCase
 {
     public static function setUpBeforeClass(): void
     {
-        $db = Bootstrap::getInstance()->getBootstrap()
+        $db = Bootstrap::getInstance()
+            ->getBootstrap()
             ->getApplication()
             ->getDbInstance();
         if (!$db->isDbDumpExists()) {
@@ -42,12 +45,10 @@ public static function setUpBeforeClass(): void
      */
     public function testGetItemByIdForUpdateOnSchedule()
     {
-        $targetObject = Bootstrap::getObjectManager()->create(
-            \Magento\Customer\Model\ResourceModel\Grid\Collection::class
-        );
-        $customerRepository = Bootstrap::getObjectManager()->create(
-            CustomerRepositoryInterface::class
-        );
+        $targetObject = Bootstrap::getObjectManager()
+            ->create(Collection::class);
+        $customerRepository = Bootstrap::getObjectManager()
+            ->create(CustomerRepositoryInterface::class);
         /** Verify after first save */
 
         /** @var CustomerInterface $newCustomer */
@@ -68,7 +69,28 @@ public function testGetItemByIdForUpdateOnSchedule()
     }
 
     /**
-     * teardown
+     * Verifies that filter condition date is being converted to config timezone before select sql query
+     *
+     * @return void
+     */
+    public function testAddFieldToFilter(): void
+    {
+        $filterDate = "2021-01-26 00:00:00";
+        /** @var TimezoneInterface $timeZone */
+        $timeZone = Bootstrap::getObjectManager()
+            ->get(TimezoneInterface::class);
+        /** @var Collection $gridCollection */
+        $gridCollection = Bootstrap::getObjectManager()
+            ->get(Collection::class);
+        $convertedDate = $timeZone->convertConfigTimeToUtc($filterDate);
+        $collection = $gridCollection->addFieldToFilter('created_at', ['qteq' => $filterDate]);
+        $expectedSelect = "WHERE (((`main_table`.`created_at` = '{$convertedDate}')))";
+
+        $this->assertStringContainsString($expectedSelect, $collection->getSelectSql(true));
+    }
+
+    /**
+     * @inheritDoc
      */
     protected function tearDown(): void
     {