MC-15986: Category Filtering

- added resolver changes on filter

Author: avattam06

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

@@ -32,24 +32,24 @@ public function __construct(
      * Filter for filtering the requested categories id's based on url_key, ids, name in the result.
      *
      * @param array $args
-     * @return array
+     * @param \Magento\Catalog\Model\ResourceModel\Category\Collection $categoryCollection
+     * @return bool
      */
-    public function applyFilters(array $args): array
-    {
-        $categoryCollection = $this->collectionFactory->create();
+    public function applyFilters(
+        array $args,
+        \Magento\Catalog\Model\ResourceModel\Category\Collection $categoryCollection
+    ): bool {
         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]);
                 }
             }
         }
-        $categoryIds = [];
-        foreach ($categoryCollection as $category) {
-            $categoryIds[] = (int)$category->getId();
-        }
-        return $categoryIds;
+        return true;
     }
 }

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

@@ -16,6 +16,7 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\CategoryTree;
 use Magento\CatalogGraphQl\Model\Category\CategoryFilter;
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
 
 /**
  * Category List resolver, used for GraphQL category data request processing.
@@ -27,6 +28,11 @@ class CategoryList implements ResolverInterface
      */
     private $categoryTree;
 
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
     /**
      * @var CategoryFilter
      */
@@ -47,17 +53,20 @@ class CategoryList implements ResolverInterface
      * @param ExtractDataFromCategoryTree $extractDataFromCategoryTree
      * @param CheckCategoryIsActive $checkCategoryIsActive
      * @param CategoryFilter $categoryFilter
+     * @param CollectionFactory $collectionFactory
      */
     public function __construct(
         CategoryTree $categoryTree,
         ExtractDataFromCategoryTree $extractDataFromCategoryTree,
         CheckCategoryIsActive $checkCategoryIsActive,
-        CategoryFilter $categoryFilter
+        CategoryFilter $categoryFilter,
+        CollectionFactory $collectionFactory
     ) {
         $this->categoryTree = $categoryTree;
         $this->extractDataFromCategoryTree = $extractDataFromCategoryTree;
         $this->checkCategoryIsActive = $checkCategoryIsActive;
         $this->categoryFilter = $categoryFilter;
+        $this->collectionFactory = $collectionFactory;
     }
 
     /**
@@ -69,10 +78,18 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             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()];
         } else {
-            $rootCategoryIds = $this->categoryFilter->applyFilters($args);
+            $this->categoryFilter->applyFilters($args, $categoryCollection);
+            $rootCategoryIds = [];
+            foreach ($categoryCollection as $category) {
+                $rootCategoryIds[] = (int)$category->getId();
+            }
         }
 
         $result = [];
@@ -81,7 +98,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
                 $this->checkCategoryIsActive->execute($rootCategoryId);
             }
             $categoryTree = $this->categoryTree->getTree($info, $rootCategoryId);
-            if (empty($categoryTree)) {
+            if (empty($categoryTree) || ($categoryTree->count() == 0)) {
                 throw new GraphQlNoSuchEntityException(__('Category doesn\'t exist'));
             }
             $result[] = current($this->extractDataFromCategoryTree->execute($categoryTree));