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

Author: valdislav

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

@@ -241,18 +241,14 @@ public function addSubtotal($storeIds = '', $filter = null)
     /**
      * Get select count sql
      *
-     * @return string
+     * @return \Magento\Framework\DB\Select
      */
     public function getSelectCountSql()
     {
-        $countSelect = clone $this->getSelect();
-        $countSelect->reset(\Zend_Db_Select::ORDER);
-        $countSelect->reset(\Zend_Db_Select::LIMIT_COUNT);
-        $countSelect->reset(\Zend_Db_Select::LIMIT_OFFSET);
-        $countSelect->reset(\Zend_Db_Select::COLUMNS);
-        $countSelect->reset(\Zend_Db_Select::GROUP);
-        $countSelect->resetJoinLeft();
-        $countSelect->columns("COUNT(DISTINCT main_table.entity_id)");
+        $countSelect = clone $this->prepareActiveCartItems();
+        $countSelect->reset(\Zend_Db_Select::COLUMNS)
+            ->reset(\Zend_Db_Select::GROUP)
+            ->columns('COUNT(DISTINCT quote_items.product_id)');
         return $countSelect;
     }
 

app/code/Magento/Reports/Test/Unit/Model/Resource/Report/Quote/CollectionTest.php

@@ -39,11 +39,11 @@ public function testGetSelectCountSql()
             false
         );
 
-        $collection->expects($this->once())->method('getSelect')->willReturn($this->selectMock);
+        $collection->expects($this->once())->method('prepareActiveCartItems')->willReturn($this->selectMock);
         $this->selectMock->expects($this->atLeastOnce())->method('reset')->willReturnSelf();
         $this->selectMock->expects($this->once())
             ->method('columns')
-            ->with('COUNT(DISTINCT main_table.entity_id)')
+            ->with('COUNT(DISTINCT quote_items.product_id)')
             ->willReturnSelf();
         $this->assertEquals($this->selectMock, $collection->getSelectCountSql());
     }