GraphQL-463: Query category for disabled catalog with products returns the products count

Author: naydav

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

@@ -11,6 +11,7 @@
 use Magento\CatalogGraphQl\Model\Category\DepthCalculator;
 use Magento\CatalogGraphQl\Model\Category\LevelCalculator;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Model\ResourceModel\Category\Collection;
@@ -84,10 +85,11 @@ public function __construct(
     public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId): \Iterator
     {
         $categoryQuery = $resolveInfo->fieldNodes[0];
-        $collection = $this->collectionFactory->create();
-        if ($this->isRootCategoryActive($collection, $rootCategoryId) == false) {
-            throw new \Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException(__('Category doesn\'t exist'));
+        if ($this->isCategoryActive($rootCategoryId) == false) {
+            throw new GraphQlNoSuchEntityException(__('Category doesn\'t exist'));
         }
+
+        $collection = $this->collectionFactory->create();
         $this->joinAttributesRecursively($collection, $categoryQuery);
         $depth = $this->depthCalculator->calculate($categoryQuery);
         $level = $this->levelCalculator->calculate($rootCategoryId);
@@ -149,27 +151,26 @@ private function joinAttributesRecursively(Collection $collection, FieldNode $fi
     }
 
     /**
-     * @param Collection $collection
      * @param int $rootCategoryId
-     *
      * @return bool
      * @throws \Exception
      */
-    private function isRootCategoryActive(Collection $collection, int $rootCategoryId) : bool
+    private function isCategoryActive(int $rootCategoryId) : bool
     {
         if ($rootCategoryId == Category::TREE_ROOT_ID) {
             return true;
         }
+        $collection = $this->collectionFactory->create();
         $collection->addAttributeToFilter(Category::KEY_IS_ACTIVE, ['eq' => 1])
             ->getSelect()
             ->where(
                 $collection->getSelect()
-                               ->getConnection()
-                               ->quoteIdentifier(
-                                   'e.' . $this->metadata->getMetadata(CategoryInterface::class)->getIdentifierField()
-                               ) . ' = ?',
-                    $rootCategoryId
+                    ->getConnection()
+                    ->quoteIdentifier(
+                        'e.' . $this->metadata->getMetadata(CategoryInterface::class)->getIdentifierField()
+                    ) . ' = ?',
+                $rootCategoryId
             );
-        return (bool) $collection->count();
+        return (bool)$collection->count();
     }
 }