MC-42795: GraphQl products query layered navigation filters return incorrect child categories list

victor-v-rad · victor-v-rad · commit 4f51da988014 · 2021-09-08T13:22:26.000-05:00
diff --git a/app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Aggregations/Category/IncludeDirectChildrenOnly.php b/app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Aggregations/Category/IncludeDirectChildrenOnly.php
@@ -150,8 +150,8 @@ private function filterBucketValues(
             if ($childrenIds) {
                 $categoryChildIds[] = explode(',', $childrenIds);
             }
-            $categoryChildIds = array_merge([], ...$categoryChildIds);
         }
+        $categoryChildIds = array_merge([], ...$categoryChildIds);
         foreach ($categoryBucketValues as $key => $bucketValue) {
             $categoryId = (int)$bucketValue->getValue();
             if (!in_array($categoryId, $categoryChildIds)) {
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Aggregations.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Aggregations.php
@@ -57,7 +57,7 @@ public function __construct(
         $this->layerBuilder = $layerBuilder;
         $this->priceCurrency = $priceCurrency ?: ObjectManager::getInstance()->get(PriceCurrency::class);
         $this->includeDirectChildrenOnly = $includeDirectChildrenOnly
-            ?: ObjectManager::getInstance()->get(IncludeDirectChildrenOnly::class);
+            ?: ObjectManager::getInstance()->get(Category\IncludeDirectChildrenOnly::class);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -150,8 +150,8 @@ private function filterBucketValues(`
`150`	`150`	`if ($childrenIds) {`
`151`	`151`	`$categoryChildIds[] = explode(',', $childrenIds);`
`152`	`152`	`}`
`153`		`- $categoryChildIds = array_merge([], ...$categoryChildIds);`
`154`	`153`	`}`
	`154`	`+ $categoryChildIds = array_merge([], ...$categoryChildIds);`
`155`	`155`	`foreach ($categoryBucketValues as $key => $bucketValue) {`
`156`	`156`	`$categoryId = (int)$bucketValue->getValue();`
`157`	`157`	`if (!in_array($categoryId, $categoryChildIds)) {`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function __construct(`
`57`	`57`	`$this->layerBuilder = $layerBuilder;`
`58`	`58`	`$this->priceCurrency = $priceCurrency ?: ObjectManager::getInstance()->get(PriceCurrency::class);`
`59`	`59`	`$this->includeDirectChildrenOnly = $includeDirectChildrenOnly`
`60`		`- ?: ObjectManager::getInstance()->get(IncludeDirectChildrenOnly::class);`
	`60`	`+ ?: ObjectManager::getInstance()->get(Category\IncludeDirectChildrenOnly::class);`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`/**`