ACP2E-1237: Product reviews from different stores all show in one store when using graphql

Author: dhorytskyi

app/code/Magento/Review/Test/Fixture/Review.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Review\Test\Fixture;
+
+use Magento\Framework\DataObject;
+use Magento\Review\Model\ResourceModel\Review as ReviewResourceModel;
+use Magento\Review\Model\Review as ReviewModel;
+use Magento\Review\Model\ReviewFactory as ReviewModelFactory;
+use Magento\TestFramework\Fixture\RevertibleDataFixtureInterface;
+
+class Review implements RevertibleDataFixtureInterface
+{
+    private const DEFAULT_DATA = [
+        'entity_code' => ReviewModel::ENTITY_PRODUCT_CODE,
+        'entity_pk_value' => 1,
+        'nickname' => 'Nickname',
+        'title' => 'Review title',
+        'detail' => 'Review detail',
+        'status_id' => ReviewModel::STATUS_APPROVED,
+        'store_id' => 1,
+    ];
+
+    /**
+     * @var ReviewModelFactory
+     */
+    private $reviewModelFactory;
+
+    /**
+     * @var ReviewResourceModel
+     */
+    private $reviewResourceModel;
+
+    /**
+     * @param ReviewModelFactory $reviewModelFactory
+     * @param ReviewResourceModel $reviewResourceModel
+     */
+    public function __construct(
+        ReviewModelFactory $reviewModelFactory,
+        ReviewResourceModel $reviewResourceModel
+    ) {
+        $this->reviewModelFactory = $reviewModelFactory;
+        $this->reviewResourceModel = $reviewResourceModel;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply(array $data = []): ?DataObject
+    {
+        $data += self::DEFAULT_DATA;
+        $data['entity_id'] = $this->reviewResourceModel->getEntityIdByCode($data['entity_code']);
+        unset($data['entity_code']);
+        $reviewModel = $this->reviewModelFactory->create(['data' => $data]);
+        $reviewModel->setStores([$data['store_id']]);
+        $this->reviewResourceModel->save($reviewModel);
+
+        return $reviewModel;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function revert(DataObject $data): void
+    {
+        $this->reviewResourceModel->delete($data);
+    }
+}

app/code/Magento/ReviewGraphQl/Model/Resolver/Product/ReviewCount.php

@@ -75,6 +75,10 @@ public function resolve(
         /** @var Product $product */
         $product = $value['model'];
 
-        return (int) $this->review->getTotalReviews($product->getId(), true);
+        return (int) $this->review->getTotalReviews(
+            $product->getId(),
+            true,
+            (int) $context->getExtensionAttributes()->getStore()->getId()
+        );
     }
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/Review/GetProductReviewsTest.php

@@ -8,14 +8,18 @@
 namespace Magento\GraphQl\Review;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Test\Fixture\Product as ProductFixture;
 use Magento\Framework\Exception\AuthenticationException;
 use Magento\Framework\Registry;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Review\Model\ResourceModel\Review\Collection;
 use Magento\Review\Model\ResourceModel\Review\CollectionFactory as ReviewCollectionFactory;
 use Magento\Review\Model\Review;
 use Magento\Review\Model\Review\SummaryFactory;
+use Magento\Review\Test\Fixture\Review as ReviewFixture;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Test\Fixture\Store as StoreFixture;
+use Magento\TestFramework\Fixture\DataFixture;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -246,6 +250,54 @@ public function testCustomerReviewsAddedToProduct()
         self::assertEquals($expectedFirstItem, $response['customer']['reviews']['items'][0]);
     }
 
+    #[
+        DataFixture(StoreFixture::class, ['code' => 'store2'], 'store2'),
+        DataFixture(ProductFixture::class, ['sku' => 'product1'], 'product1'),
+        DataFixture(ReviewFixture::class, ['entity_pk_value' => '$product1.id$']),
+        DataFixture(ReviewFixture::class, ['entity_pk_value' => '$product1.id$', 'store_id' => '$store2.id$']),
+    ]
+    /**
+     * @dataProvider storesDataProvider
+     * @param string $storeCode
+     */
+    public function testProductReviewDifferentStores(string $storeCode): void
+    {
+        $productSku = 'product1';
+        $query = <<<QUERY
+{
+  products(filter: {sku: {eq: "$productSku"}}) {
+    items {
+      review_count
+      reviews {
+        items {
+          nickname
+          summary
+          text
+        }
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query, [], '', ['Store' => $storeCode]);
+        self::assertArrayHasKey('products', $response);
+        self::assertArrayHasKey('items', $response['products']);
+        self::assertNotEmpty($response['products']['items']);
+        self::assertEquals(1, $response['products']['items'][0]['review_count']);
+        self::assertCount(1, $response['products']['items'][0]['reviews']['items']);
+    }
+
+    /**
+     * @return array
+     */
+    public function storesDataProvider(): array
+    {
+        return [
+            ['default'],
+            ['store2'],
+        ];
+    }
+
     /**
      * Removing the recently added product reviews
      */