MAGETWO-35632: Refactor queries for Magento\Reports\Model\Resource\Quote\Collection

Author: valdislav

app/code/Magento/Reports/Model/Resource/Quote/Collection.php

@@ -39,12 +39,17 @@ class Collection extends \Magento\Quote\Model\Resource\Quote\Collection
     /**
      * @var \Magento\Catalog\Model\Resource\Product\Collection
      */
-    protected $_productResource;
+    protected $productResource;
 
     /**
      * @var \Magento\Customer\Model\Resource\Customer
      */
-    protected $_customerResource;
+    protected $customerResource;
+
+    /**
+     * @var \Magento\Sales\Model\Resource\Order\Collection
+     */
+    protected $orderResource;
 
     /**
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
@@ -53,6 +58,7 @@ class Collection extends \Magento\Quote\Model\Resource\Quote\Collection
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Catalog\Model\Resource\Product\Collection $productResource
      * @param \Magento\Customer\Model\Resource\Customer $customerResource
+     * @param \Magento\Sales\Model\Resource\Order\Collection $orderResource
      * @param null $connection
      * @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
      */
@@ -63,12 +69,14 @@ public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Catalog\Model\Resource\Product\Collection $productResource,
         \Magento\Customer\Model\Resource\Customer $customerResource,
+        \Magento\Sales\Model\Resource\Order\Collection $orderResource,
         $connection = null,
         \Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
     ) {
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);
-        $this->_productResource = $productResource;
-        $this->_customerResource = $customerResource;
+        $this->productResource = $productResource;
+        $this->customerResource = $customerResource;
+        $this->orderResource = $orderResource;
     }
 
     /**
@@ -145,21 +153,22 @@ public function prepareActiveCartItems()
     }
 
     /**
-     * Orders quantity subselect
+     * Orders quantity data
      *
-     * @return \Magento\Framework\DB\Select
+     * @param array $productIds
+     * @return array
      */
-    protected function getOrdersSubSelect()
+    protected function getOrdersData(array $productIds)
     {
-        $ordersSubSelect = clone $this->getSelect();
+        $ordersSubSelect = clone $this->orderResource->getSelect();
         $ordersSubSelect->reset()->from(
             ['oi' => $this->getTable('sales_order_item')],
             ['orders' => new \Zend_Db_Expr('COUNT(1)'), 'product_id']
-        )->group(
+        )->where('oi.product_id IN (?)', $productIds)->group(
             'oi.product_id'
         );
 
-        return $ordersSubSelect;
+        return $this->orderResource->getConnection()->fetchAssoc($ordersSubSelect);
     }
 
     /**
@@ -182,7 +191,7 @@ public function addStoreFilter($storeIds)
      */
     public function addCustomerData($filter = null)
     {
-        $customersSelect = $this->_customerResource->getReadConnection()->select();
+        $customersSelect = $this->customerResource->getReadConnection()->select();
         $customersSelect->from(['customer' => 'customer_entity'], 'entity_id');
         if (isset($filter['customer_name'])) {
             $customersSelect = $this->getCustomerNames($customersSelect);
@@ -194,7 +203,7 @@ public function addCustomerData($filter = null)
         if (isset($filter['email'])) {
             $customersSelect->where('customer.email LIKE ?', '%' . $filter['email'] . '%');
         }
-        $filteredCustomers = $this->_customerResource->getReadConnection()->fetchCol($customersSelect);
+        $filteredCustomers = $this->customerResource->getReadConnection()->fetchCol($customersSelect);
         $this->getSelect()->where('main_table.customer_id IN (?)', $filteredCustomers);
         return $this;
     }
@@ -258,10 +267,10 @@ public function getSelectCountSql()
      */
     protected function getCustomerNames($select)
     {
-        $attrFirstname = $this->_customerResource->getAttribute('firstname');
+        $attrFirstname = $this->customerResource->getAttribute('firstname');
         $attrFirstnameId = (int)$attrFirstname->getAttributeId();
         $attrFirstnameTableName = $attrFirstname->getBackend()->getTable();
-        $attrLastname = $this->_customerResource->getAttribute('lastname');
+        $attrLastname = $this->customerResource->getAttribute('lastname');
         $attrLastnameId = (int)$attrLastname->getAttributeId();
         $attrLastnameTableName = $attrLastname->getBackend()->getTable();
         $select->joinInner(
@@ -287,7 +296,7 @@ protected function getCustomerNames($select)
      */
     public function resolveCustomerNames()
     {
-        $select = $this->_customerResource->getReadConnection()->select();
+        $select = $this->customerResource->getReadConnection()->select();
         $customerName = $select->getAdapter()->getConcatSql(['cust_fname.value', 'cust_lname.value'], ' ');
 
         $select->from(
@@ -313,13 +322,13 @@ public function resolveCustomerNames()
      */
     protected function getProductData()
     {
-        $productConnection = $this->_productResource->getConnection('read');
-        $productAttrName = $this->_productResource->getAttribute('name');
+        $productConnection = $this->productResource->getConnection('read');
+        $productAttrName = $this->productResource->getAttribute('name');
         $productAttrNameId = (int)$productAttrName->getAttributeId();
-        $productAttrPrice = $this->_productResource->getAttribute('price');
+        $productAttrPrice = $this->productResource->getAttribute('price');
         $productAttrPriceId = (int)$productAttrPrice->getAttributeId();
 
-        $select = clone $this->_productResource->getSelect();
+        $select = clone $this->productResource->getSelect();
         $select->reset();
         $select->from(
             ['main_table' => $this->getTable('catalog_product_entity')]
@@ -335,14 +344,7 @@ protected function getProductData()
             ['product_price' => $productAttrPrice->getBackend()->getTable()],
             "product_price.entity_id = main_table.entity_id AND product_price.attribute_id = {$productAttrPriceId}",
             ['price' => new \Zend_Db_Expr('product_price.value')]
-        )->joinLeft(
-            ['order_items' => new \Zend_Db_Expr(sprintf('(%s)', $this->getOrdersSubSelect()))],
-            'order_items.product_id = main_table.entity_id',
-            []
-        )->columns(
-            'order_items.orders'
         );
-
         $productData = $productConnection->fetchAssoc($select);
         return $productData;
     }
@@ -356,12 +358,14 @@ protected function _afterLoad()
     {
         parent::_afterLoad();
         $productData = $this->getProductData();
+        $productIds = array_keys($productData);
+        $orderData = $this->getOrdersData($productIds);
         $items = $this->getItems();
         foreach ($items as $item) {
             $item->setId($item->getProductId());
             $item->setPrice($productData[$item->getProductId()]['price'] * $item->getBaseToGlobalRate());
             $item->setName($productData[$item->getProductId()]['name']);
-            $item->setOrders($productData[$item->getProductId()]['orders']);
+            $item->setOrders($orderData[$item->getProductId()]['orders']);
         }
 
         return $this;

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php

@@ -2155,4 +2155,6 @@
     ['_isCacheEnabled', 'Magento\Eav\Model\Config'],
     ['_createCustomerAttribute', '\Magento\Customer\Model\Customer'],
     ['prepareCatalogProductPriceIndexTable', 'Magento\CatalogRule\Model\Observer'],
+    ['prepareForProductsInCarts', 'Magento\Reports\Model\Resource\Quote\Collection'],
+    ['getOrdersSubSelect', 'Magento\Reports\Model\Resource\Quote\Collection'],
 ];