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

Author: victor-v-rad

app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Aggregations/Category/IncludeDirectChildrenOnly.php

@@ -148,8 +148,9 @@ private function filterBucketValues(
             $category->setStoreId($storeId);
             $childrenIds = $category->getChildren();
             if ($childrenIds) {
-                $categoryChildIds = array_merge($categoryChildIds, explode(',', $childrenIds));
+                $categoryChildIds[] = explode(',', $childrenIds);
             }
+            $categoryChildIds = array_merge([], ...$categoryChildIds);
         }
         foreach ($categoryBucketValues as $key => $bucketValue) {
             $categoryId = (int)$bucketValue->getValue();

app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Category.php

@@ -16,7 +16,7 @@
 use Magento\Framework\Api\Search\BucketInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\CatalogGraphQl\DataProvider\Product\LayeredNavigation\Formatter\LayerFormatter;
-use Magento\CatalogGraphQl\DataProvider\Product\LayeredNavigation\Builder\Aggregations\Category\IncludeDirectChildrenOnly;
+use Magento\CatalogGraphQl\DataProvider\Product\LayeredNavigation\Builder\Aggregations;
 
 /**
  * @inheritdoc
@@ -64,7 +64,7 @@ class Category implements LayerBuilderInterface
     private $layerFormatter;
 
     /**
-     * @var IncludeDirectChildrenOnly
+     * @var Aggregations\Category\IncludeDirectChildrenOnly
      */
     private $includeDirectChildrenOnly;
 
@@ -74,15 +74,15 @@ class Category implements LayerBuilderInterface
      * @param RootCategoryProvider $rootCategoryProvider
      * @param ResourceConnection $resourceConnection
      * @param LayerFormatter $layerFormatter
-     * @param IncludeDirectChildrenOnly $includeDirectChildrenOnly
+     * @param Aggregations\Category\IncludeDirectChildrenOnly $includeDirectChildrenOnly
      */
     public function __construct(
         CategoryAttributeQuery $categoryAttributeQuery,
         CategoryAttributesMapper $attributesMapper,
         RootCategoryProvider $rootCategoryProvider,
         ResourceConnection $resourceConnection,
         LayerFormatter $layerFormatter,
-        IncludeDirectChildrenOnly $includeDirectChildrenOnly
+        Aggregations\Category\IncludeDirectChildrenOnly $includeDirectChildrenOnly
     ) {
         $this->categoryAttributeQuery = $categoryAttributeQuery;
         $this->attributesMapper = $attributesMapper;

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

@@ -8,7 +8,7 @@
 namespace Magento\CatalogGraphQl\Model\Resolver;
 
 use Magento\CatalogGraphQl\DataProvider\Product\LayeredNavigation\LayerBuilder;
-use Magento\CatalogGraphQl\DataProvider\Product\LayeredNavigation\Builder\Aggregations\Category\IncludeDirectChildrenOnly;
+use Magento\CatalogGraphQl\DataProvider\Product\LayeredNavigation\Builder\Aggregations\Category;
 use Magento\Directory\Model\PriceCurrency;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\GraphQl\Config\Element\Field;
@@ -37,21 +37,21 @@ class Aggregations implements ResolverInterface
     private $priceCurrency;
 
     /**
-     * @var IncludeDirectChildrenOnly
+     * @var Category\IncludeDirectChildrenOnly
      */
     private $includeDirectChildrenOnly;
 
     /**
      * @param \Magento\CatalogGraphQl\Model\Resolver\Layer\DataProvider\Filters $filtersDataProvider
      * @param LayerBuilder $layerBuilder
      * @param PriceCurrency $priceCurrency
-     * @param IncludeDirectChildrenOnly $includeDirectChildrenOnly
+     * @param Category\IncludeDirectChildrenOnly $includeDirectChildrenOnly
      */
     public function __construct(
         \Magento\CatalogGraphQl\Model\Resolver\Layer\DataProvider\Filters $filtersDataProvider,
         LayerBuilder $layerBuilder,
         PriceCurrency $priceCurrency = null,
-        IncludeDirectChildrenOnly $includeDirectChildrenOnly = null
+        Category\IncludeDirectChildrenOnly $includeDirectChildrenOnly = null
     ) {
         $this->filtersDataProvider = $filtersDataProvider;
         $this->layerBuilder = $layerBuilder;