B2B-2469: Improve category children loading

- codestyle fixes:

Author: rganin

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

@@ -95,9 +95,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new GraphQlInputException(__($e->getMessage()));
         }
 
-        $result = $this->fetchCategoriesByTopLevelIds($topLevelCategoryIds, $info, $processedArgs, $store, [], $context);
-
-        return $result;
+        return $this->fetchCategoriesByTopLevelIds($topLevelCategoryIds, $info, $processedArgs, $store, [], $context);
     }
 
     /**
@@ -113,12 +111,12 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
      * @throws LocalizedException
      */
     private function fetchCategoriesByTopLevelIds(
-        array          $topLevelCategoryIds,
-        ResolveInfo    $info,
-        array          $criteria,
+        array $topLevelCategoryIds,
+        ResolveInfo $info,
+        array $criteria,
         StoreInterface $store,
-        array          $attributeNames,
-                       $context
+        array $attributeNames,
+        $context
     ) : array {
         $criteria['pageSize'] = 0;
         $searchCriteria = $this->searchCriteria->buildCriteria($criteria, $store);

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

@@ -24,7 +24,7 @@ class CategoryTree implements ResolverInterface
     /**
      * Name of type in GraphQL
      */
-    const CATEGORY_INTERFACE = 'CategoryInterface';
+    public const CATEGORY_INTERFACE = 'CategoryInterface';
 
     /**
      * @var CategoryTreeDataProvider
@@ -72,9 +72,9 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             $this->checkCategoryIsActive->execute($rootCategoryId);
         }
         $store = $context->getExtensionAttributes()->getStore();
-        $categoriesTree = $this->categoryTree->getTreeCollection($info, $rootCategoryId, (int)$store->getId());
+        $categoriesTree = $this->categoryTree->getTreeCollection($info, $rootCategoryId);
 
-        if (empty($categoriesTree) || ($categoriesTree->count() == 0)) {
+        if ($categoriesTree->count() == 0) {
             throw new GraphQlNoSuchEntityException(__('Category doesn\'t exist'));
         }
 

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

@@ -116,13 +116,12 @@ public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId, int $stor
      *
      * @param ResolveInfo $resolveInfo
      * @param int $rootCategoryId
-     * @param int $storeId
-     * @return Iterator
+     * @return Collection
      * @throws LocalizedException
      * @throws Exception
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function getTreeCollection(ResolveInfo $resolveInfo, int $rootCategoryId, int $storeId): Collection
+    public function getTreeCollection(ResolveInfo $resolveInfo, int $rootCategoryId): Collection
     {
         return $this->getRawCollection($resolveInfo, [$rootCategoryId]);
     }
@@ -237,14 +236,13 @@ public function getFilteredTree(
      * Returns categories tree starting from parent $rootCategoryId with filtration
      *
      * @param ResolveInfo $resolveInfo
-     * @param int $rootCategoryId
-     * @param array $criteria
+     * @param array $topLevelCategoryIds
+     * @param SearchCriteria $searchCriteria
      * @param StoreInterface $store
      * @param array $attributeNames
      * @param ContextInterface $context
      * @return Collection
      * @throws LocalizedException
-     * @throws Exception
      */
     public function getFlatCategoriesByRootIds(
         ResolveInfo $resolveInfo,

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

@@ -105,10 +105,11 @@ public function getId(): int
      */
     public function renderArray(): array
     {
-        return array_merge($this->forgery->getHydrator()->hydrateCategory($this->model),
+        return array_merge(
+            $this->forgery->getHydrator()->hydrateCategory($this->model),
             [
                 'children' => array_map(
-                    function($node) {
+                    function ($node) {
                         return $node->renderArray();
                     },
                     $this->children

app/code/Magento/CatalogUrlRewriteGraphQl/Model/DataProvider/UrlRewrite/CatalogTreeDataProvider.php

@@ -63,8 +63,8 @@ public function getData(
         int $storeId = null
     ): array {
         $categoryId = (int)$id;
-        $categoriesTree = $this->categoryTree->getTreeCollection($info, $categoryId, $storeId);
-        if (empty($categoriesTree) || ($categoriesTree->count() == 0)) {
+        $categoriesTree = $this->categoryTree->getTreeCollection($info, $categoryId);
+        if ($categoriesTree->count() == 0) {
             throw new GraphQlNoSuchEntityException(__('Category doesn\'t exist'));
         }
         $result = current($this->extractDataFromCategoryTree->buildTree($categoriesTree, [$categoryId]));