Merge branch 'ACP2E-470' of https://github.com/magento-l3/magento2ce into L3-PR-20220202

Author: ArtemVasyliev

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;
@@ -19,7 +20,9 @@
 use Magento\CatalogGraphQl\DataProvider\Product\LayeredNavigation\Builder\Aggregations;
 
 /**
- * @inheritdoc
+ * Category layer builder
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Category implements LayerBuilderInterface
 {
@@ -63,6 +66,11 @@ class Category implements LayerBuilderInterface
      */
     private $layerFormatter;
 
+    /**
+     * @var CollectionFactory
+     */
+    private $categoryCollectionFactory;
+
     /**
      * @var Aggregations\Category\IncludeDirectChildrenOnly
      */
@@ -75,21 +83,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 +123,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 +174,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();
+    }
 }

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

@@ -7,7 +7,6 @@
 
 namespace Magento\GraphQl\Catalog;
 
-use Exception;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
@@ -28,6 +27,41 @@ public function testAggregationEqCategory()
         $this->assertEquals($expectedSubcategorie, $categoryAggregation);
     }
 
+    /**
+     * Test to check aggregation with the store header
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     * @magentoApiDataFixture Magento/Store/_files/store_with_second_root_category.php
+     * @magentoApiDataFixture Magento/Store/_files/assign_products_to_categories_and_websites.php
+     * @return void
+     */
+    public function testAggregationWithStoreFiltration()
+    {
+        $query = $this->getAggregationQuery();
+        $result = $this->graphQlQuery($query);
+        $categoryAggregation = $this->getCategoryAggregation($result);
+        $this->assertNotEmpty($categoryAggregation);
+        $result = $this->graphQlQuery($query, [], '', ['store' => 'test_store_1']);
+        $categoryAggregation = $this->getCategoryAggregation($result);
+        $this->assertEmpty($categoryAggregation);
+    }
+
+    /**
+     * Extract category aggregation from the result
+     *
+     * @param array $result
+     * @return array|null
+     */
+    private function getCategoryAggregation(array $result) : ?array
+    {
+        return array_filter(
+            $result['products']['aggregations'],
+            function ($a) {
+                return $a['attribute_code'] == 'category_id';
+            }
+        );
+    }
+
     /**
      * Test category_id aggregation on filter by "in" category ID condition.
      *
@@ -98,6 +132,55 @@ private function getSubcategoriesOfCategoryThree(): array
         ];
     }
 
+    private function getAggregationQuery() : string
+    {
+        return <<<QUERY
+query {
+  products(filter: { category_id: { eq: "3" } }) {
+    total_count
+
+    aggregations {
+      attribute_code
+
+      label
+
+      count
+
+      options {
+        count
+
+        label
+
+        value
+      }
+    }
+
+    items {
+      name
+
+      sku
+
+      price_range {
+        minimum_price {
+          regular_price {
+            value
+
+            currency
+          }
+        }
+      }
+    }
+
+    page_info {
+      page_size
+
+      current_page
+    }
+  }
+}
+QUERY;
+    }
+
     /**
      * Get graphQl query.
      *

dev/tests/integration/testsuite/Magento/Store/_files/assign_products_to_categories_and_websites.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Api\CategoryLinkManagementInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+$websites = $websiteRepository->getList();
+$websiteIds = [];
+foreach ($websites as $website) {
+    $websiteIds[] = $website->getId();
+}
+
+$categoryCollectionFactory = $objectManager->get(CollectionFactory::class);
+$categoryCollection = $categoryCollectionFactory->create();
+$categoryIds = [];
+foreach ($categoryCollection as $category) {
+    $categoryIds[] = $category->getId();
+}
+
+$productSkus = ['simple-4', 'simple-3', '12345', 'simple'];
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$categoryLinkManagement = $objectManager->get(CategoryLinkManagementInterface::class);
+
+foreach ($productSkus as $sku) {
+    $product = $productRepository->get($sku);
+    $product->setWebsiteIds($websiteIds);
+    $productRepository->save($product);
+    $categoryLinkManagement->assignProductToCategories($sku, $categoryIds);
+}