fix regexp when category being filtered is root category

magento · Jul 12, 2018 · 7b1c4dd · 7b1c4dd
1 parent 6b7a9b3
commit 7b1c4dd
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
@@ -94,8 +94,17 @@ public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId) : array
         $this->joinAttributesRecursively($collection, $categoryQuery);
         $depth = $this->depthCalculator->calculate($categoryQuery);
         $level = $this->levelCalculator->calculate($rootCategoryId);
+
+        // If root category is being filter, we've to remove first slash
+        if($rootCategoryId == 1) {
+            $regExpPathFilter = sprintf('.*%s/[/0-9]*$', $rootCategoryId);
+        } else {
+            $regExpPathFilter = sprintf('.*/%s/[/0-9]*$', $rootCategoryId);
+        }
+
         //Search for desired part of category tree
-        $collection->addPathFilter(sprintf('.*/%s/[/0-9]*$', $rootCategoryId));
+        $collection->addPathFilter($regExpPathFilter);
+
         $collection->addFieldToFilter('level', ['gt' => $level]);
         $collection->addFieldToFilter('level', ['lteq' => $level + $depth - self::DEPTH_OFFSET]);
         $collection->setOrder('level');