MC-15986: Category Filtering

- add changes in category filter

Author: avattam06

app/code/Magento/CatalogGraphQl/Model/Category/CategoryFilter.php

@@ -7,7 +7,9 @@
 
 namespace Magento\CatalogGraphQl\Model\Category;
 
+use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
+use Magento\Catalog\Model\ResourceModel\Category\Collection;
 
 /**
  * Category filter allows to filter collection using 'id, url_key, name' from search criteria.
@@ -32,24 +34,47 @@ public function __construct(
      * Filter for filtering the requested categories id's based on url_key, ids, name in the result.
      *
      * @param array $args
-     * @param \Magento\Catalog\Model\ResourceModel\Category\Collection $categoryCollection
-     * @return bool
+     * @param Collection $categoryCollection
      */
     public function applyFilters(
         array $args,
-        \Magento\Catalog\Model\ResourceModel\Category\Collection $categoryCollection
-    ): bool {
+        Collection $categoryCollection
+    ): void {
+        $categoryCollection->addAttributeToFilter(CategoryInterface::KEY_IS_ACTIVE, ['eq' => 1]);
         foreach ($args['filters'] as $field => $cond) {
             foreach ($cond as $condType => $value) {
                 if ($field === 'ids') {
                     $categoryCollection->addIdFilter($value);
-                } elseif ($condType === 'match') {
-                    $categoryCollection->addAttributeToFilter($field, ['like' => "%{$value}%"]);
                 } else {
-                    $categoryCollection->addAttributeToFilter($field, [$condType => $value]);
+                    $this->addAttributeFilter($categoryCollection, $field, $condType, $value);
                 }
             }
         }
-        return true;
+    }
+
+    /**
+     * @param Collection $categoryCollection
+     * @param string $field
+     * @param string $condType
+     * @param string|array $value
+     */
+    private function addAttributeFilter($categoryCollection, $field, $condType, $value)
+    {
+        if ($condType === 'match') {
+            $this->addMatchFilter($categoryCollection, $field, $value);
+            return;
+        }
+        $categoryCollection->addAttributeToFilter($field, [$condType => $value]);
+    }
+
+    /**
+     *
+     * @param Collection $categoryCollection
+     * @param string $field
+     * @param string $value
+     */
+    private function addMatchFilter($categoryCollection, $field, $value)
+    {
+        $categoryCollection->addAttributeToFilter($field, ['like' => "%{$value}%"]);
     }
 }

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

@@ -7,7 +7,6 @@
 
 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\Config\Element\Field;
@@ -77,10 +76,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         if (isset($value[$field->getName()])) {
             return $value[$field->getName()];
         }
-
         $categoryCollection = $this->collectionFactory->create();
-        $categoryCollection->addAttributeToFilter('is_active', 1);
-        $categoryCollection->addAttributeToSelect(['name','url_key', 'ids']);
 
         if (!isset($args['filters'])) {
             $rootCategoryIds = [(int)$context->getExtensionAttributes()->getStore()->getRootCategoryId()];
@@ -91,14 +87,10 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
                 $rootCategoryIds[] = (int)$category->getId();
             }
         }
-
         $result = [];
         foreach ($rootCategoryIds as $rootCategoryId) {
-            if ($rootCategoryId !== Category::TREE_ROOT_ID) {
-                $this->checkCategoryIsActive->execute($rootCategoryId);
-            }
             $categoryTree = $this->categoryTree->getTree($info, $rootCategoryId);
-            if (empty($categoryTree) || ($categoryTree->count() == 0)) {
+            if (empty($categoryTree)) {
                 throw new GraphQlNoSuchEntityException(__('Category doesn\'t exist'));
             }
             $result[] = current($this->extractDataFromCategoryTree->execute($categoryTree));