B2B-2469: Improve category children loading

Author: rganin

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

@@ -7,8 +7,6 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\CategoryTree\Wrapper;
 
-use Magento\Catalog\Model\Category;
-
 /**
  * Category tree node wrapper.
  */
@@ -39,7 +37,7 @@ public function __construct(int $id)
 
     /**
      * Set category model data for node.
-     * 
+     *
      * @param array|null $modelData
      *
      * @return $this

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree/Wrapper/Forgery.php renamed to app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree/Wrapper/NodeWrapper.php

@@ -14,7 +14,7 @@
 /**
  * Tree node forgery for category tree wrapper.
  */
-class Forgery
+class NodeWrapper
 {
     /**
      * Most top node id in the tree structure.
@@ -26,7 +26,7 @@ class Forgery
      *
      * @var array
      */
-    private array $indexById = [];
+    private array $index = [];
 
     /**
      * @var Hydrator
@@ -47,25 +47,23 @@ public function __construct(Hydrator $hydrator)
      * @param Category $category
      * @return void
      */
-    public function forge(Category $category): void
+    public function wrap(Category $category): void
     {
-        if (!$this->hasNodeById(self::TOP_NODE_ID)) {
-            $this->indexById[self::TOP_NODE_ID] = new Node(self::TOP_NODE_ID);
+        if (!$this->hasNode(self::TOP_NODE_ID)) {
+            $this->index[self::TOP_NODE_ID] = new Node(self::TOP_NODE_ID);
         }
         $parentId = self::TOP_NODE_ID;
         array_map(
             function ($id) use (&$parentId, $category) {
                 $id = (int)$id;
-                if (!$this->hasNodeById($id)) {
-                    $this->indexById[$id] = new Node($id);
+                if (!$this->hasNode($id)) {
+                    $this->index[$id] = new Node($id);
                 }
-                if ($this->hasNodeById($parentId)) {
-                    $this->getNodeById($parentId)->addChild($this->indexById[$id]);
-                    if ($category->getId() == $id) {
-                        $this->indexById[$id]->setModelData(
-                            $this->hydrator->hydrateCategory($category)
-                        );
-                    }
+                $this->index[$parentId]->addChild($this->index[$id]);
+                if ($category->getId() == $id) {
+                    $this->index[$id]->setModelData(
+                        $this->hydrator->hydrateCategory($category)
+                    );
                 }
                 $parentId = $id;
             },
@@ -79,9 +77,9 @@ function ($id) use (&$parentId, $category) {
      * @param int $id
      * @return Node|null
      */
-    public function getNodeById(int $id) : ?Node
+    public function getNode(int $id) : ?Node
     {
-        return $this->indexById[$id] ?? null;
+        return $this->index[$id] ?? null;
     }
 
     /**
@@ -90,8 +88,8 @@ public function getNodeById(int $id) : ?Node
      * @param int $id
      * @return bool
      */
-    public function hasNodeById(int $id) : bool
+    public function hasNode(int $id) : bool
     {
-        return isset($this->indexById[$id]);
+        return isset($this->index[$id]);
     }
 }

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

@@ -9,25 +9,24 @@
 
 use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\ResourceModel\Category\Collection;
-use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\CategoryTree\Wrapper\Forgery;
-use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\CategoryTree\Wrapper\ForgeryFactory;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\CategoryTree\Wrapper\NodeWrapperFactory;
 
 /**
  * Data extractor for category tree processing in GraphQL resolvers.
  */
 class ExtractDataFromCategoryTree
 {
     /**
-     * @var ForgeryFactory
+     * @var NodeWrapperFactory
      */
-    private $resultTreeForgeryFactory;
+    private $nodeWrapperFactory;
 
     /**
-     * @param ForgeryFactory $resultTreeForgeryFactory
+     * @param NodeWrapperFactory $nodeWrapperFactory
      */
-    public function __construct(ForgeryFactory $resultTreeForgeryFactory)
+    public function __construct(NodeWrapperFactory $nodeWrapperFactory)
     {
-        $this->resultTreeForgeryFactory = $resultTreeForgeryFactory;
+        $this->nodeWrapperFactory = $nodeWrapperFactory;
     }
 
     /**
@@ -39,15 +38,14 @@ public function __construct(ForgeryFactory $resultTreeForgeryFactory)
      */
     public function buildTree(Collection $collection, array $topLevelCategories) : array
     {
-        /** @var Forgery $forgery */
-        $forgery = $this->resultTreeForgeryFactory->create();
+        $wrapper = $this->nodeWrapperFactory->create();
         /** @var Category $item */
         foreach ($collection->getItems() as $item) {
-            $forgery->forge($item);
+            $wrapper->wrap($item);
         }
         $tree = [];
         foreach ($topLevelCategories as $topLevelCategory) {
-            $tree[] = $forgery->getNodeById($topLevelCategory)->renderArray();
+            $tree[] = $wrapper->getNode($topLevelCategory)->renderArray();
         }
         return $this->sortTree($tree);
     }