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

Author: victor-v-rad

app/code/Magento/CatalogGraphQl/etc/schema.graphqls

@@ -320,7 +320,7 @@ type Products @doc(description: "The Products object is the top-level object ret
     page_info: SearchResultPageInfo @doc(description: "An object that includes the page_info and currentPage values specified in the query.")
     total_count: Int @doc(description: "The number of products that are marked as visible. By default, in complex products, parent products are visible, but their child products are not.")
     filters: [LayerFilter] @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\LayerFilters") @doc(description: "Layered navigation filters array.") @deprecated(reason: "Use aggregations instead")
-    aggregations (filter: AggregationsFilterInput): [Aggregation] @doc(description: "Layered navigation aggregations.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Aggregations")
+    aggregations (filter: AggregationsFilterInput): [Aggregation] @doc(description: "Layered navigation aggregations with filters.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Aggregations")
     sort_fields: SortFields @doc(description: "An object that includes the default sort field and all available sort fields.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\SortFields")
 }
 

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchCategoryAggregationsTest.php

@@ -24,9 +24,8 @@ public function testAggregationEqCategory()
     {
         $filterValue = '{category_id: {eq: "2"}}';
         $categoryAggregation = $this->aggregationCategoryTesting($filterValue, "true");
-        $this->assertEquals(4, $categoryAggregation['count']);
         $expectedOptions = $this->getCategoryTwoOptions();
-        $this->assertEquals($expectedOptions, $categoryAggregation['options']);
+        $this->assertEquals($expectedOptions, $categoryAggregation);
     }
 
     /**
@@ -38,9 +37,8 @@ public function testAggregationInCategory()
     {
         $filterValue = '{category_id: {in: ["3","2"]}}';
         $categoryAggregation = $this->aggregationCategoryTesting($filterValue, "true");
-        $this->assertEquals(6, $categoryAggregation['count']);
-        $expectedOptions = array_merge($this->getCategoryThreeOptions(), $this->getCategoryTwoOptions());
-        $this->assertEquals($expectedOptions, $categoryAggregation['options']);
+        $expectedOptions = $this->getCategoryThreeOptions() + $this->getCategoryTwoOptions();
+        $this->assertEquals($expectedOptions, $categoryAggregation);
     }
 
     /**
@@ -63,7 +61,13 @@ function ($a) {
         $this->assertNotEmpty($categoryAggregation);
         $categoryAggregation = reset($categoryAggregation);
         $this->assertEquals('Category', $categoryAggregation['label']);
-        return $categoryAggregation;
+        $categoryAggregationIdsLabel = [];
+        foreach ($categoryAggregation['options'] as $option) {
+            $this->assertNotEmpty($option['value']);
+            $this->assertNotEmpty($option['label']);
+            $categoryAggregationIdsLabel[(int)$option['value']] = $option['label'];
+        }
+        return $categoryAggregationIdsLabel;
     }
 
     /**
@@ -74,10 +78,10 @@ function ($a) {
     private function getCategoryTwoOptions(): array
     {
         return [
-            ['label' => 'Category 1', 'value'=> '3', 'count' => '3'],
-            ['label' => 'Movable Position 2', 'value'=> '10', 'count' => '1'],
-            ['label' => 'Movable Position 3', 'value'=> '11', 'count' => '1'],
-            ['label' => 'Category 12', 'value'=> '12', 'count' => '1']
+            3 => 'Category 1',
+            10 => 'Movable Position 2',
+            11 => 'Movable Position 3',
+            12 => 'Category 12'
         ];
     }
 
@@ -89,8 +93,8 @@ private function getCategoryTwoOptions(): array
     private function getCategoryThreeOptions(): array
     {
         return [
-            ['label' => 'Category 1.1', 'value'=> '4', 'count' => '2'],
-            ['label' => 'Category 1.2', 'value'=> '13', 'count' => '2']
+            4 => 'Category 1.1',
+            13 => 'Category 1.2'
         ];
     }