Merge branch 'MC-43010' of https://github.com/magento-l3/magento2ce into PR-2021-08-18

Author: chittima

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php

@@ -64,7 +64,7 @@ public function execute(\Iterator $iterator): array
                 if (empty($tree)) {
                     $tree = $currentLevelTree;
                 }
-                $tree = $this->mergeCategoriesTrees($currentLevelTree, $tree);
+                $tree = $this->mergeCategoriesTrees($tree, $currentLevelTree);
             }
         }
 

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

@@ -132,6 +132,38 @@ public function testCategoriesTree()
         );
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/category_with_parent_anchor.php
+     */
+    public function testCategoryTree()
+    {
+        $rootCategoryId = 2;
+        $query = <<<QUERY
+{
+  category(id: {$rootCategoryId}) {
+      children {
+        id
+        name
+        children {
+          id
+          name
+        }
+      }
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $responseDataObject = new DataObject($response);
+        self::assertEquals(
+            'Parent category',
+            $responseDataObject->getData('category/children/0/name')
+        );
+        self::assertEquals(
+            'Child category',
+            $responseDataObject->getData('category/children/0/children/0/name')
+        );
+    }
+
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/categories.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)

dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_parent_anchor.php

@@ -27,15 +27,18 @@
     'is_anchor' => true,
 ];
 $parentCategory->setData($parentCategoryData);
-$parentCategoryId = $categoryRepository->save($parentCategory)->getId();
+$parentCategory = $categoryRepository->save($parentCategory);
 
 $category = $categoryFactory->create();
 $category->isObjectNew(true);
 $categoryData = [
     'name' => 'Child category',
     'attribute_set_id' => $attributeSetId,
-    'parent_id' => $parentCategoryId,
+    'parent_id' => $parentCategory->getId(),
     'is_active' => true,
 ];
 $category->setData($categoryData);
 $categoryRepository->save($category);
+
+//save parent category to set "children" attribute
+$categoryRepository->save($parentCategory);