ACP2E-470: Products Aggregate for GraphQL returning data for all stores

Author: Oleksandr Iegorov

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

@@ -7,6 +7,7 @@
 
 namespace Magento\CatalogGraphQl\DataProvider\Product\LayeredNavigation\Builder;
 
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
 use Magento\CatalogGraphQl\DataProvider\CategoryAttributesMapper;
 use Magento\CatalogGraphQl\DataProvider\Category\Query\CategoryAttributeQuery;
 use Magento\CatalogGraphQl\DataProvider\Product\LayeredNavigation\LayerBuilderInterface;
@@ -63,6 +64,11 @@ class Category implements LayerBuilderInterface
      */
     private $layerFormatter;
 
+    /**
+     * @var CollectionFactory
+     */
+    private $categoryCollectionFactory;
+
     /**
      * @var Aggregations\Category\IncludeDirectChildrenOnly
      */
@@ -75,21 +81,24 @@ class Category implements LayerBuilderInterface
      * @param ResourceConnection $resourceConnection
      * @param LayerFormatter $layerFormatter
      * @param Aggregations\Category\IncludeDirectChildrenOnly $includeDirectChildrenOnly
+     * @param CollectionFactory $categoryCollectionFactory
      */
     public function __construct(
         CategoryAttributeQuery $categoryAttributeQuery,
         CategoryAttributesMapper $attributesMapper,
         RootCategoryProvider $rootCategoryProvider,
         ResourceConnection $resourceConnection,
         LayerFormatter $layerFormatter,
-        Aggregations\Category\IncludeDirectChildrenOnly $includeDirectChildrenOnly
+        Aggregations\Category\IncludeDirectChildrenOnly $includeDirectChildrenOnly,
+        CollectionFactory $categoryCollectionFactory
     ) {
         $this->categoryAttributeQuery = $categoryAttributeQuery;
         $this->attributesMapper = $attributesMapper;
         $this->resourceConnection = $resourceConnection;
         $this->rootCategoryProvider = $rootCategoryProvider;
         $this->layerFormatter = $layerFormatter;
         $this->includeDirectChildrenOnly = $includeDirectChildrenOnly;
+        $this->categoryCollectionFactory = $categoryCollectionFactory;
     }
 
     /**
@@ -112,6 +121,11 @@ function (AggregationValueInterface $value) {
             $bucket->getValues()
         );
 
+        if ($storeId) {
+            $storeFilteredCategoryIds = $this->getStoreCategoryIds($storeId);
+            $categoryIds = \array_intersect($categoryIds, $storeFilteredCategoryIds);
+        }
+
         $categoryIds = \array_diff($categoryIds, [$this->rootCategoryProvider->getRootCategory($storeId)]);
         $categoryLabels = \array_column(
             $this->attributesMapper->getAttributesValues(
@@ -158,4 +172,25 @@ private function isBucketEmpty(?BucketInterface $bucket): bool
     {
         return null === $bucket || !$bucket->getValues();
     }
+
+    /**
+     * List of store categories
+     *
+     * @param int $storeId
+     * @return array
+     */
+    private function getStoreCategoryIds(int $storeId): array
+    {
+        $storeRootCategoryId = $this->rootCategoryProvider->getRootCategory($storeId);
+        $collection = $this->categoryCollectionFactory->create();
+        $select = $collection->getSelect();
+        $connection = $collection->getConnection();
+        $select->where(
+            $connection->quoteInto(
+                'e.path LIKE ? OR e.entity_id=' . $connection->quote($storeRootCategoryId, 'int'),
+                '%/' . $storeRootCategoryId . '/%'
+            )
+        );
+        return $collection->getAllIds();
+    }
 }