-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1848 from magento-engcom/2.2-develop-prs
[EngCom] Public Pull Requests - 2.2-develop - MAGETWO-85583: #12378: Regions list in Directory module for India #1007 - MAGETWO-85580: Fixes #12660 invalid parameter configuration provided for argument #12661 - MAGETWO-85534: #8647: [GitHub] Order of how arguments are merged in multiple di.xml-… #995 - MAGETWO-84370: 11946: Layer navigation showing wrong product count #12063 Fixed issues: - #12378 Regions list in Directory module for India - #12452 ACL permissions issue - #12660 Invalid parameter configuration provided for $block argument upon no ACL permissions to the block - #8647 Order of how arguments are merged in multiple di.xml-files causes unexpected results - #11946 Layer navigation showing wrong product count
- Loading branch information
Showing
9 changed files
with
484 additions
and
116 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
148 changes: 148 additions & 0 deletions
148
app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilder.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| namespace Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider; | ||
|
|
||
| use Magento\CatalogInventory\Model\Configuration as CatalogInventoryConfiguration; | ||
| use Magento\CatalogInventory\Model\Stock; | ||
| use Magento\Eav\Model\Entity\Attribute\AbstractAttribute; | ||
| 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; | ||
|
|
||
| /** | ||
| * Attribute query builder | ||
| */ | ||
| class QueryBuilder | ||
| { | ||
| /** | ||
| * @var Resource | ||
| */ | ||
| private $resource; | ||
|
|
||
| /** | ||
| * @var ScopeResolverInterface | ||
| */ | ||
| private $scopeResolver; | ||
|
|
||
| /** | ||
| * @var CatalogInventoryConfiguration | ||
| */ | ||
| private $inventoryConfig; | ||
|
|
||
| /** | ||
| * @param ResourceConnection $resource | ||
| * @param ScopeResolverInterface $scopeResolver | ||
| * @param CatalogInventoryConfiguration $inventoryConfig | ||
| */ | ||
| public function __construct( | ||
| ResourceConnection $resource, | ||
| ScopeResolverInterface $scopeResolver, | ||
| CatalogInventoryConfiguration $inventoryConfig | ||
| ) { | ||
| $this->resource = $resource; | ||
| $this->scopeResolver = $scopeResolver; | ||
| $this->inventoryConfig = $inventoryConfig; | ||
| } | ||
|
|
||
| /** | ||
| * Build select. | ||
| * | ||
| * @param AbstractAttribute $attribute | ||
| * @param string $tableName | ||
| * @param int $currentScope | ||
| * @param int $customerGroupId | ||
| * | ||
| * @return Select | ||
| */ | ||
| public function build( | ||
| AbstractAttribute $attribute, | ||
| 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') { | ||
| return $this->buildQueryForPriceAttribute($currentScope, $customerGroupId, $select); | ||
| } | ||
|
|
||
| return $this->buildQueryForAttribute($currentScope, $attribute, $select); | ||
| } | ||
|
|
||
| /** | ||
| * Build select for price attribute. | ||
| * | ||
| * @param int $currentScope | ||
| * @param int $customerGroupId | ||
| * @param Select $select | ||
| * | ||
| * @return Select | ||
| */ | ||
| 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 = ?', $store->getWebsiteId()); | ||
|
|
||
| return $select; | ||
| } | ||
|
|
||
| /** | ||
| * Build select for attribute. | ||
| * | ||
| * @param int $currentScope | ||
| * @param AbstractAttribute $attribute | ||
| * @param Select $select | ||
| * | ||
| * @return Select | ||
| */ | ||
| 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' : '') | ||
| ); | ||
| $select->from(['main_table' => $table], ['main_table.entity_id', 'main_table.value']) | ||
| ->distinct() | ||
| ->joinLeft( | ||
| ['stock_index' => $this->resource->getTableName('cataloginventory_stock_status')], | ||
| 'main_table.source_id = stock_index.product_id', | ||
| [] | ||
| ) | ||
| ->where('main_table.attribute_id = ?', $attribute->getAttributeId()) | ||
| ->where('main_table.store_id = ? ', $currentScopeId); | ||
|
|
||
| if (!$this->inventoryConfig->isShowOutOfStock($currentScopeId)) { | ||
| $select->where('stock_index.stock_status = ?', Stock::STOCK_IN_STOCK); | ||
| } | ||
|
|
||
| $parentSelect = $this->resource->getConnection()->select(); | ||
| $parentSelect->from(['main_table' => $select], ['main_table.value']); | ||
| return $parentSelect; | ||
| } | ||
| } |
Oops, something went wrong.