B2B-2469: Improve category children loading

- functional fixes

Author: rganin

app/code/Magento/CatalogGraphQl/Model/Resolver/CategoriesQuery.php

@@ -98,7 +98,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
         $rootCategoryIds = $filterResult['category_ids'] ?? [];
 
-        $filterResult['items'] = $this->fetchCategories($rootCategoryIds, $info, $store, $context);
+        $filterResult['items'] = $this->fetchCategories($rootCategoryIds, $info, $context);
         return $filterResult;
     }
 
@@ -107,22 +107,19 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
      *
      * @param array $categoryIds
      * @param ResolveInfo $info
-     * @param StoreInterface $store
      * @param ContextInterface $context
      * @return array
      */
     private function fetchCategories(
         array $categoryIds,
         ResolveInfo $info,
-        StoreInterface $store,
         ContextInterface $context
     ) {
         $searchCriteria = $this->searchCriteriaFactory->create();
         $categoryCollection = $this->categoryTree->getFlatCategoriesByRootIds(
             $info,
             $categoryIds,
             $searchCriteria,
-            $store,
             [],
             $context
         );

app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryList.php

@@ -95,7 +95,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new GraphQlInputException(__($e->getMessage()));
         }
 
-        return $this->fetchCategoriesByTopLevelIds($topLevelCategoryIds, $info, $processedArgs, $store, [], $context);
+        return $this->fetchCategoriesByTopLevelIds($topLevelCategoryIds, $info, $processedArgs, [], $context);
     }
 
     /**
@@ -104,7 +104,6 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
      * @param array $topLevelCategoryIds
      * @param ResolveInfo $info
      * @param array $criteria
-     * @param StoreInterface $store
      * @param array $attributeNames
      * @param ContextInterface $context
      * @return array
@@ -114,17 +113,18 @@ private function fetchCategoriesByTopLevelIds(
         array $topLevelCategoryIds,
         ResolveInfo $info,
         array $criteria,
-        StoreInterface $store,
         array $attributeNames,
-        $context
+        ContextInterface $context
     ) : array {
         $criteria['pageSize'] = 0;
-        $searchCriteria = $this->searchCriteria->buildCriteria($criteria, $store);
+        $searchCriteria = $this->searchCriteria->buildCriteria(
+            $criteria,
+            $context->getExtensionAttributes()->getStore()
+        );
         $categoryCollection = $this->categoryTree->getFlatCategoriesByRootIds(
             $info,
             $topLevelCategoryIds,
             $searchCriteria,
-            $store,
             $attributeNames,
             $context
         );

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php

@@ -154,7 +154,6 @@ public function getFlatCategoriesByRootIds(
         ResolveInfo $resolveInfo,
         array $topLevelCategoryIds,
         SearchCriteria $searchCriteria,
-        StoreInterface $store,
         array $attributeNames,
         ContextInterface $context
     ): Collection {

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree/Wrapper/Node.php

@@ -99,8 +99,7 @@ public function getId(): int
     }
 
     /**
-     * Render node and its children as an array recursively.
-     * Returns null is node model is not set.
+     * Render node and its children as an array recursively, returns null is node model is not set.
      *
      * @return array|null
      */