Code review updates

Author: korovitskyi

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

@@ -79,7 +79,6 @@ public function __construct(
      *
      * @param array $categoryFilter
      * @param Bucket[] $bucketList
-     *
      * @return Aggregation
      */
     public function getResolvedCategoryAggregation(array $categoryFilter, array $bucketList): Aggregation
@@ -92,7 +91,6 @@ public function getResolvedCategoryAggregation(array $categoryFilter, array $buc
         if (!$searchableCategoryValue || empty($values)) {
             return $this->aggregationFactory->create([self::BUCKETS => $bucketList]);
         }
-
         $resolvedBucketList = $bucketList;
 
         try {
@@ -110,33 +108,29 @@ public function getResolvedCategoryAggregation(array $categoryFilter, array $buc
         } catch (NoSuchEntityException $e) {
             return $this->aggregationFactory->create([self::BUCKETS => $bucketList]);
         }
-
         $resolvedCategoryBucket = $this->bucketFactory->create(
             [
                 'name' => self::CATEGORY_BUCKET,
                 'values' => $resolvedValues
             ]
         );
-
         $resolvedBucketList[self::CATEGORY_BUCKET] = $resolvedCategoryBucket;
 
         return $this->aggregationFactory->create([self::BUCKETS => $resolvedBucketList]);
     }
 
     /**
-     * Check is valid searchable category children.
+     * Check is valid searchable category children, and return all aggregations with updated categories list.
      *
      * @param int $searchableCategoryId
      * @param AggregationValueInterface[] $aggregationValues
-     *
      * @return AggregationValueInterface[]
-     *
      * @throws NoSuchEntityException
      */
     private function getValidCategories(int $searchableCategoryId, array $aggregationValues): array
     {
-        $stareId = (int) $this->storeManager->getStore()->getId();
-        $searchableCategory = $this->categoryRepository->get($searchableCategoryId, $stareId);
+        $storeId = (int) $this->storeManager->getStore()->getId();
+        $searchableCategory = $this->categoryRepository->get($searchableCategoryId, $storeId);
         $childrenList = $searchableCategory->getChildrenCategories();
         $resolvedList = [];
         $validChildIdList = [];
@@ -152,8 +146,8 @@ private function getValidCategories(int $searchableCategoryId, array $aggregatio
         foreach ($aggregationValues as $bucketValue) {
             $childCategoryId = (int) $bucketValue->getValue();
 
-            if (!in_array($childCategoryId, $validChildIdList) ||
-                in_array($childCategoryId, $this->resolvedChildrenIds)
+            if (!in_array($childCategoryId, $validChildIdList)
+                || in_array($childCategoryId, $this->resolvedChildrenIds)
             ) {
                 continue;
             }

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

@@ -91,7 +91,8 @@ public function __construct(
         $this->fieldSelection = $fieldSelection;
         $this->productsProvider = $productsProvider;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
-        $this->resolveCategoryAggregation = $resolveCategoryAggregation;
+        $this->resolveCategoryAggregation = $resolveCategoryAggregation ?: ObjectManager::getInstance()
+            ->get(ResolveCategoryAggregation::class);
         $this->argsSelection = $argsSelection ?: ObjectManager::getInstance()
             ->get(ArgumentsProcessorInterface::class);
     }
@@ -102,9 +103,7 @@ public function __construct(
      * @param array $args
      * @param ResolveInfo $info
      * @param ContextInterface $context
-     *
      * @return SearchResult
-     *
      * @throws GraphQlInputException
      */
     public function getResult(
@@ -169,9 +168,7 @@ public function getResult(
      *
      * @param array $args
      * @param ResolveInfo $info
-     *
      * @return SearchCriteriaInterface
-     *
      * @throws GraphQlInputException
      */
     private function buildSearchCriteria(array $args, ResolveInfo $info): SearchCriteriaInterface