MC-42795: GraphQl products query layered navigation filters return incorrect child categories list

Author: victor-v-rad

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/ResolveCategoryAggregation.php

@@ -55,11 +55,6 @@ class Search implements ProductQueryInterface
      */
     private $productsProvider;
 
-    /**
-     * @var ResolveCategoryAggregation
-     */
-    private $resolveCategoryAggregation;
-
     /**
      * @var SearchCriteriaBuilder
      */
@@ -73,7 +68,6 @@ class Search implements ProductQueryInterface
      * @param ProductSearch $productsProvider
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param ArgumentsProcessorInterface|null $argsSelection
-     * @param ResolveCategoryAggregation $resolveCategoryAggregation
      */
     public function __construct(
         SearchInterface $search,
@@ -82,7 +76,6 @@ public function __construct(
         FieldSelection $fieldSelection,
         ProductSearch $productsProvider,
         SearchCriteriaBuilder $searchCriteriaBuilder,
-        ResolveCategoryAggregation $resolveCategoryAggregation,
         ArgumentsProcessorInterface $argsSelection = null
     ) {
         $this->search = $search;
@@ -91,8 +84,6 @@ public function __construct(
         $this->fieldSelection = $fieldSelection;
         $this->productsProvider = $productsProvider;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
-        $this->resolveCategoryAggregation = $resolveCategoryAggregation ?: ObjectManager::getInstance()
-            ->get(ResolveCategoryAggregation::class);
         $this->argsSelection = $argsSelection ?: ObjectManager::getInstance()
             ->get(ArgumentsProcessorInterface::class);
     }
@@ -133,17 +124,6 @@ public function getResult(
 
         $totalPages = $realPageSize ? ((int)ceil($searchResults->getTotalCount() / $realPageSize)) : 0;
 
-        $aggregations = $itemsResults->getAggregations();
-        $bucketList = $aggregations->getBuckets();
-        $categoryFilter = $args['filter']['category_id'] ?? [];
-
-        if (!empty($categoryFilter) && isset($bucketList[ResolveCategoryAggregation::CATEGORY_BUCKET])) {
-            $aggregations = $this->resolveCategoryAggregation->getResolvedCategoryAggregation(
-                $categoryFilter,
-                $bucketList
-            );
-        }
-
         $productArray = [];
         /** @var \Magento\Catalog\Model\Product $product */
         foreach ($searchResults->getItems() as $product) {
@@ -155,7 +135,7 @@ public function getResult(
             [
                 'totalCount' => $searchResults->getTotalCount(),
                 'productsSearchResult' => $productArray,
-                'searchAggregation' => $aggregations,
+                'searchAggregation' => $itemsResults->getAggregations(),
                 'pageSize' => $realPageSize,
                 'currentPage' => $realCurrentPage,
                 'totalPages' => $totalPages,
@@ -169,7 +149,6 @@ public function getResult(
      * @param array $args
      * @param ResolveInfo $info
      * @return SearchCriteriaInterface
-     * @throws GraphQlInputException
      */
     private function buildSearchCriteria(array $args, ResolveInfo $info): SearchCriteriaInterface
     {

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php

@@ -85,12 +85,6 @@
         </arguments>
     </type>
 
-    <type name="Magento\CatalogGraphQl\Model\Resolver\Products\Query\Search">
-        <arguments>
-            <argument name="resolveCategoryAggregation" xsi:type="object">Magento\CatalogGraphQl\Model\Resolver\Products\Query\ResolveCategoryAggregation\Proxy</argument>
-        </arguments>
-    </type>
-
     <type name="Magento\Framework\Search\Request\Config\FilesystemReader">
         <plugin name="productAttributesDynamicFields"  type="Magento\CatalogGraphQl\Plugin\Search\Request\ConfigReader" />
     </type>