Merge remote-tracking branch 'XxXgeoXxX/2.3-devlop#463' into 2.3-devlop#463

Author: naydav

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

@@ -79,12 +79,6 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         }
 
         $result = $this->extractDataFromCategoryTree->execute($categoriesTree);
-
-        $category = current($result);
-        if ($category['is_active'] == false) {
-            throw new GraphQlNoSuchEntityException(__('Category doesn\'t exist'));
-        }
-
-        return $category;
+        return current($result);
     }
 }

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

@@ -85,6 +85,9 @@ public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId): \Iterato
     {
         $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'));
+        }
         $this->joinAttributesRecursively($collection, $categoryQuery);
         $depth = $this->depthCalculator->calculate($categoryQuery);
         $level = $this->levelCalculator->calculate($rootCategoryId);
@@ -144,4 +147,29 @@ private function joinAttributesRecursively(Collection $collection, FieldNode $fi
             $this->joinAttributesRecursively($collection, $node);
         }
     }
+
+    /**
+     * @param Collection $collection
+     * @param int $rootCategoryId
+     *
+     * @return bool
+     * @throws \Exception
+     */
+    private function isRootCategoryActive(Collection $collection, int $rootCategoryId) : bool
+    {
+        if ($rootCategoryId == Category::TREE_ROOT_ID) {
+            return true;
+        }
+        $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();
+    }
 }