MAGETWO-35628: Refactor queries for Magento\Reports\Model\Resource\Customer\Collection - use order connnection for sales related tables

Author: valdislav

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

@@ -66,6 +66,11 @@ class Collection extends \Magento\Customer\Model\Resource\Customer\Collection
      */
     protected $_quoteItemFactory;
 
+    /**
+     * @var \Magento\Sales\Model\Resource\Order\Collection
+     */
+    protected $orderResource;
+
     /**
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
      * @param \Psr\Log\LoggerInterface $logger
@@ -79,6 +84,7 @@ class Collection extends \Magento\Customer\Model\Resource\Customer\Collection
      * @param \Magento\Framework\Object\Copy\Config $fieldsetConfig
      * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
      * @param \Magento\Quote\Model\Resource\Quote\Item\CollectionFactory $quoteItemFactory
+     * @param \Magento\Sales\Model\Resource\Order\Collection $orderResource
      * @param mixed $connection
      * @param string $modelName
      *
@@ -97,6 +103,7 @@ public function __construct(
         \Magento\Framework\Object\Copy\Config $fieldsetConfig,
         \Magento\Quote\Model\QuoteRepository $quoteRepository,
         \Magento\Quote\Model\Resource\Quote\Item\CollectionFactory $quoteItemFactory,
+        \Magento\Sales\Model\Resource\Order\Collection $orderResource,
         $connection = null,
         $modelName = self::CUSTOMER_MODEL_NAME
     ) {
@@ -114,6 +121,7 @@ public function __construct(
             $connection,
             $modelName
         );
+        $this->orderResource = $orderResource;
         $this->quoteRepository = $quoteRepository;
         $this->_quoteItemFactory = $quoteItemFactory;
     }
@@ -175,17 +183,17 @@ protected function _addOrdersStatistics()
         $customerIds = $this->getColumnValues($this->getResource()->getIdFieldName());
 
         if ($this->_addOrderStatistics && !empty($customerIds)) {
-            $adapter = $this->getConnection();
+            $adapter = $this->orderResource->getConnection();
             $baseSubtotalRefunded = $adapter->getIfNullSql('orders.base_subtotal_refunded', 0);
             $baseSubtotalCanceled = $adapter->getIfNullSql('orders.base_subtotal_canceled', 0);
 
             $totalExpr = $this->_addOrderStatFilter ?
                 "(orders.base_subtotal-{$baseSubtotalCanceled}-{$baseSubtotalRefunded})*orders.base_to_global_rate" :
                 "orders.base_subtotal-{$baseSubtotalCanceled}-{$baseSubtotalRefunded}";
 
-            $select = $this->getConnection()->select();
+            $select = $this->orderResource->getConnection()->select();
             $select->from(
-                ['orders' => $this->getTable('sales_order')],
+                ['orders' => $this->orderResource->getTable('sales_order')],
                 [
                     'orders_avg_amount' => "AVG({$totalExpr})",
                     'orders_sum_amount' => "SUM({$totalExpr})",
@@ -202,7 +210,7 @@ protected function _addOrdersStatistics()
                 'orders.customer_id'
             );
 
-            foreach ($this->getConnection()->fetchAll($select) as $ordersInfo) {
+            foreach ($this->orderResource->getConnection()->fetchAll($select) as $ordersInfo) {
                 $this->getItemById($ordersInfo['customer_id'])->addData($ordersInfo);
             }
         }