Merge remote-tracking branch 'magento-l3/ACP2E-63' into L3_PR_21-10-19

Author: veloraven

app/code/Magento/Sales/Model/ResourceModel/Provider/Query/IdListBuilder.php

@@ -0,0 +1,117 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\ResourceModel\Provider\Query;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+
+/**
+ * Query builder for retrieving list of updated order ids that was not synced to grid table.
+ */
+class IdListBuilder
+{
+    /**
+     * @var array
+     */
+    private $additionalGridTables = [];
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * IdListBuilder. Builds query for getting updated id list.
+     *
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * Adding additional grid table where entities may already exist.
+     *
+     * @param string $table
+     * @return $this
+     */
+    public function addAdditionalGridTable(string $table): IdListBuilder
+    {
+        $this->additionalGridTables[] = $table;
+
+        return $this;
+    }
+
+    /**
+     * Returns connection.
+     *
+     * @return AdapterInterface
+     */
+    private function getConnection(): AdapterInterface
+    {
+        if (!$this->connection) {
+            $this->connection = $this->resourceConnection->getConnection('sales');
+        }
+
+        return $this->connection;
+    }
+
+    /**
+     * Returns update time of the last row in the grid.
+     *
+     * @param string $gridTableName
+     * @return string
+     */
+    private function getLastUpdatedAtValue(string $gridTableName): string
+    {
+        $select = $this->getConnection()->select()
+            ->from($this->getConnection()->getTableName($gridTableName), ['updated_at'])
+            ->order('updated_at DESC')
+            ->limit(1);
+        $row = $this->getConnection()->fetchRow($select);
+
+        return $row['updated_at'] ?? '0000-00-00 00:00:00';
+    }
+
+    /**
+     * Builds select object.
+     *
+     * @param string $mainTableName
+     * @param string $gridTableName
+     * @return Select
+     */
+    public function build(string $mainTableName, string $gridTableName): Select
+    {
+        $select = $this->getConnection()->select()
+            ->from($mainTableName, [$mainTableName . '.entity_id']);
+        $lastUpdateTime = $this->getLastUpdatedAtValue($gridTableName);
+        $select->where($mainTableName . '.updated_at >= ?', $lastUpdateTime);
+        foreach ($this->additionalGridTables as $table) {
+            $select->joinLeft(
+                [$table => $table],
+                sprintf(
+                    '%s.%s = %s.%s',
+                    $mainTableName,
+                    'entity_id',
+                    $table,
+                    'entity_id'
+                ),
+                []
+            )
+                ->where($table . '.entity_id IS NULL');
+        }
+        return $select;
+    }
+}

app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedIdListProvider.php

@@ -5,8 +5,10 @@
  */
 namespace Magento\Sales\Model\ResourceModel\Provider;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Sales\Model\ResourceModel\Provider\Query\IdListBuilder;
 
 /**
  * Provides latest updated entities ids list
@@ -23,14 +25,22 @@ class UpdatedIdListProvider implements NotSyncedDataProviderInterface
      */
     private $connection;
 
+    /**
+     * @var IdListBuilder
+     */
+    private $idListQueryBuilder;
+
     /**
      * NotSyncedDataProvider constructor.
      * @param ResourceConnection $resourceConnection
+     * @param IdListBuilder|null $idListQueryBuilder
      */
     public function __construct(
-        ResourceConnection $resourceConnection
+        ResourceConnection $resourceConnection,
+        ?IdListBuilder $idListQueryBuilder = null
     ) {
         $this->resourceConnection = $resourceConnection;
+        $this->idListQueryBuilder = $idListQueryBuilder ?? ObjectManager::getInstance()->get(IdListBuilder::class);
     }
 
     /**
@@ -40,21 +50,7 @@ public function getIds($mainTableName, $gridTableName)
     {
         $mainTableName = $this->resourceConnection->getTableName($mainTableName);
         $gridTableName = $this->resourceConnection->getTableName($gridTableName);
-        $select = $this->getConnection()->select()
-            ->from($mainTableName, [$mainTableName . '.entity_id'])
-            ->joinLeft(
-                [$gridTableName => $gridTableName],
-                sprintf(
-                    '%s.%s = %s.%s',
-                    $mainTableName,
-                    'entity_id',
-                    $gridTableName,
-                    'entity_id'
-                ),
-                []
-            )
-            ->where($gridTableName . '.entity_id IS NULL');
-
+        $select = $this->idListQueryBuilder->build($mainTableName, $gridTableName);
         return $this->getConnection()->fetchAll($select, [], \Zend_Db::FETCH_COLUMN);
     }