Merge branch 'ACP2E-363' of https://github.com/magento-l3/magento2ce into PR-2021-12-21

Author: chittima

app/code/Magento/CatalogGraphQl/Model/Resolver/Categories/DataProvider/Category/CollectionProcessor/CatalogProcessor.php

@@ -49,7 +49,27 @@ public function process(
         ContextInterface $context = null
     ): Collection {
         $this->collectionProcessor->process($searchCriteria, $collection);
+        $store = $context->getExtensionAttributes()->getStore();
+        $this->addRootCategoryFilterForStore($collection, (string) $store->getRootCategoryId());
 
         return $collection;
     }
+
+    /**
+     * Add filtration based on the store root category id
+     *
+     * @param Collection $collection
+     * @param string $rootCategoryId
+     */
+    private function addRootCategoryFilterForStore(Collection $collection, string $rootCategoryId) : void
+    {
+        $select = $collection->getSelect();
+        $connection = $collection->getConnection();
+        $select->where(
+            $connection->quoteInto(
+                'e.path LIKE ? OR e.entity_id=' . $connection->quote($rootCategoryId, 'int'),
+                '%/' . $rootCategoryId . '/%'
+            )
+        );
+    }
 }

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

@@ -887,4 +887,36 @@ public function testFilterCategoryRecursiveFragment() : void
         $this->assertArrayHasKey('id', $result['categoryList'][0]['children'][0]);
         $this->assertEquals($result['categoryList'][0]['children'][0]['id'], '3');
     }
+
+    /**
+     * Test category list is filtered based on store in header
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     * @magentoApiDataFixture Magento/Store/_files/store_with_second_root_category.php
+     */
+    public function testFilterStoreRootCategory() : void
+    {
+        $query = <<<'QUERY'
+{
+categoryList(filters: {name: {match: "Category"}}) {
+    uid
+    level
+    name
+    breadcrumbs {
+        category_uid
+        category_name
+        category_level
+        category_url_key
+    }
+}
+}
+QUERY;
+        $result = $this->graphQlQuery($query);
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertCount(7, $result['categoryList']);
+
+        $result = $this->graphQlQuery($query, [], '', ['store' => 'test_store_1']);
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertCount(1, $result['categoryList']);
+    }
 }