magento/graphql-ce#463: Query category for disabled catalog with products returns the products count

Author: lenaorobei

app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CheckCategoryIsActive.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogGraphQl\Model\Resolver\Category;
+
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\Category;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
+
+/**
+ * Check if category is active.
+ */
+class CheckCategoryIsActive
+{
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadata;
+
+    /**
+     * @param CollectionFactory $collectionFactory
+     * @param MetadataPool $metadata
+     */
+    public function __construct(
+        CollectionFactory $collectionFactory,
+        MetadataPool $metadata
+    )
+    {
+        $this->collectionFactory = $collectionFactory;
+        $this->metadata = $metadata;
+    }
+
+    /**
+     * Check if category is active.
+     *
+     * @param int $rootCategoryId
+     * @throws GraphQlNoSuchEntityException
+     */
+    public function execute(int $rootCategoryId): void
+    {
+        $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
+            );
+
+        if ($collection->count() === 0) {
+            throw new GraphQlNoSuchEntityException(__('Category doesn\'t exist'));
+        }
+    }
+}

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

@@ -7,6 +7,8 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver;
 
+use Magento\Catalog\Model\Category;
+use Magento\CatalogGraphQl\Model\Resolver\Category\CheckCategoryIsActive;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\ExtractDataFromCategoryTree;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
@@ -34,16 +36,25 @@ class CategoryTree implements ResolverInterface
      */
     private $extractDataFromCategoryTree;
 
+    /**
+     * @var CheckCategoryIsActive
+     */
+    private $checkCategoryIsActive;
+
     /**
      * @param \Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\CategoryTree $categoryTree
      * @param ExtractDataFromCategoryTree $extractDataFromCategoryTree
+     * @param CheckCategoryIsActive $checkCategoryIsActive
      */
     public function __construct(
         \Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\CategoryTree $categoryTree,
-        ExtractDataFromCategoryTree $extractDataFromCategoryTree
-    ) {
+        ExtractDataFromCategoryTree $extractDataFromCategoryTree,
+        CheckCategoryIsActive $checkCategoryIsActive
+    )
+    {
         $this->categoryTree = $categoryTree;
         $this->extractDataFromCategoryTree = $extractDataFromCategoryTree;
+        $this->checkCategoryIsActive = $checkCategoryIsActive;
     }
 
     /**
@@ -72,6 +83,9 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         }
 
         $rootCategoryId = $this->getCategoryId($args);
+        if ($rootCategoryId !== Category::TREE_ROOT_ID) {
+            $this->checkCategoryIsActive->execute($rootCategoryId);
+        }
         $categoriesTree = $this->categoryTree->getTree($info, $rootCategoryId);
 
         if (empty($categoriesTree) || ($categoriesTree->count() == 0)) {

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

@@ -11,7 +11,6 @@
 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;
@@ -85,10 +84,6 @@ public function __construct(
     public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId): \Iterator
     {
         $categoryQuery = $resolveInfo->fieldNodes[0];
-        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);
@@ -149,30 +144,4 @@ private function joinAttributesRecursively(Collection $collection, FieldNode $fi
             $this->joinAttributesRecursively($collection, $node);
         }
     }
-
-    /**
-     * Check if provided category active
-     *
-     * @param int $rootCategoryId
-     * @return bool
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
-    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
-            );
-        return (bool)$collection->count();
-    }
 }