magento#12063

Author: Stanislav Idolov

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilder.php

@@ -9,15 +9,14 @@
 use Magento\CatalogInventory\Model\Configuration as CatalogInventoryConfiguration;
 use Magento\CatalogInventory\Model\Stock;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Request\BucketInterface;
 
 /**
- *  Class for query building for Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider.
+ *  Attribute query builder
  */
 class QueryBuilder
 {
@@ -36,27 +35,19 @@ class QueryBuilder
      */
     private $inventoryConfig;
 
-    /**
-     * @var AdapterInterface
-     */
-    private $connection;
-
     /**
      * @param ResourceConnection $resource
      * @param ScopeResolverInterface $scopeResolver
-     * @param CatalogInventoryConfiguration|null $inventoryConfig
+     * @param CatalogInventoryConfiguration $inventoryConfig
      */
     public function __construct(
         ResourceConnection $resource,
         ScopeResolverInterface $scopeResolver,
-        CatalogInventoryConfiguration $inventoryConfig = null
+        CatalogInventoryConfiguration $inventoryConfig
     ) {
         $this->resource = $resource;
         $this->scopeResolver = $scopeResolver;
-        $this->inventoryConfig = $inventoryConfig ?: ObjectManager::getInstance()->get(
-            CatalogInventoryConfiguration::class
-        );
-        $this->connection = $resource->getConnection();
+        $this->inventoryConfig = $inventoryConfig;
     }
 
     /**
@@ -71,86 +62,72 @@ public function __construct(
      */
     public function build(
         AbstractAttribute $attribute,
-        $tableName,
-        $currentScope,
-        $customerGroupId
-    ) {
-        $select = $this->getSelect();
-
+        string $tableName,
+        int $currentScope,
+        int $customerGroupId
+    ) : Select {
+        $select = $this->resource->getConnection()->select();
         $select->joinInner(
             ['entities' => $tableName],
             'main_table.entity_id  = entities.entity_id',
             []
         );
 
         if ($attribute->getAttributeCode() === 'price') {
-            /** @var \Magento\Store\Model\Store $store */
-            $store = $this->scopeResolver->getScope($currentScope);
-            if (!$store instanceof \Magento\Store\Model\Store) {
-                throw new \RuntimeException('Illegal scope resolved');
-            }
-
-            $select = $this->buildIfPrice(
-                $store->getWebsiteId(),
-                $customerGroupId,
-                $select
-            );
-        } else {
-            $currentScopeId = $this->scopeResolver->getScope($currentScope)
-                ->getId();
-
-            $select = $this->buildIfNotPrice(
-                $currentScopeId,
-                $attribute,
-                $select
-            );
+            return $this->buildQueryForPriceAttribute($currentScope, $customerGroupId, $select);
         }
 
-        return $select;
+        return $this->buildQueryForAttribute($currentScope, $attribute, $select);
     }
 
     /**
-     * Build select if it is price attribute.
+     * Build select for price attribute.
      *
-     * @param int $websiteId
+     * @param int $currentScope
      * @param int $customerGroupId
      * @param Select $select
      *
      * @return Select
      */
-    private function buildIfPrice(
-        $websiteId,
-        $customerGroupId,
+    private function buildQueryForPriceAttribute(
+        int $currentScope,
+        int $customerGroupId,
         Select $select
-    ) {
+    ) : Select {
+        /** @var \Magento\Store\Model\Store $store */
+        $store = $this->scopeResolver->getScope($currentScope);
+        if (!$store instanceof \Magento\Store\Model\Store) {
+            throw new \RuntimeException('Illegal scope resolved');
+        }
+
         $table = $this->resource->getTableName('catalog_product_index_price');
         $select->from(['main_table' => $table], null)
             ->columns([BucketInterface::FIELD_VALUE => 'main_table.min_price'])
             ->where('main_table.customer_group_id = ?', $customerGroupId)
-            ->where('main_table.website_id = ?', $websiteId);
+            ->where('main_table.website_id = ?', $store->getWebsiteId());
 
         return $select;
     }
 
     /**
-     * Build select if it is not price attribute.
+     * Build select for attribute.
      *
-     * @param int $currentScopeId
+     * @param int $currentScope
      * @param AbstractAttribute $attribute
      * @param Select $select
      *
      * @return Select
      */
-    private function buildIfNotPrice(
-        $currentScopeId,
+    private function buildQueryForAttribute(
+        int $currentScope,
         AbstractAttribute $attribute,
         Select $select
-    ) {
+    ) : Select {
+        $currentScopeId = $this->scopeResolver->getScope($currentScope)->getId();
         $table = $this->resource->getTableName(
             'catalog_product_index_eav' . ($attribute->getBackendType() === 'decimal' ? '_decimal' : '')
         );
-        $subSelect = $select;
-        $subSelect->from(['main_table' => $table], ['main_table.entity_id', 'main_table.value'])
+        $select->from(['main_table' => $table], ['main_table.entity_id', 'main_table.value'])
             ->distinct()
             ->joinLeft(
                 ['stock_index' => $this->resource->getTableName('cataloginventory_stock_status')],
@@ -161,23 +138,11 @@ private function buildIfNotPrice(
             ->where('main_table.store_id = ? ', $currentScopeId);
 
         if (!$this->inventoryConfig->isShowOutOfStock($currentScopeId)) {
-            $subSelect->where('stock_index.stock_status = ?', Stock::STOCK_IN_STOCK);
+            $select->where('stock_index.stock_status = ?', Stock::STOCK_IN_STOCK);
         }
 
-        $parentSelect = $this->getSelect();
-        $parentSelect->from(['main_table' => $subSelect], ['main_table.value']);
-        $select = $parentSelect;
-
-        return $select;
-    }
-
-    /**
-     * Get empty select.
-     *
-     * @return Select
-     */
-    private function getSelect()
-    {
-        return $this->connection->select();
+        $parentSelect = $this->resource->getConnection()->select();
+        $parentSelect->from(['main_table' => $select], ['main_table.value']);
+        return $parentSelect;
     }
 }

app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilderTest.php

@@ -53,7 +53,9 @@ protected function setUp()
         $this->adapterMock = $this->createMock(AdapterInterface::class);
         $this->inventoryConfigMock = $this->createMock(CatalogInventoryConfiguration::class);
 
-        $this->resourceConnectionMock->expects($this->once())->method('getConnection')->willReturn($this->adapterMock);
+        $this->resourceConnectionMock->expects($this->atLeastOnce())
+            ->method('getConnection')
+            ->willReturn($this->adapterMock);
 
         $this->model = new QueryBuilder(
             $this->resourceConnectionMock,