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

Author: dhorytskyi

app/code/Magento/ReviewGraphQl/Model/DataProvider/ProductReviewsDataProvider.php

@@ -36,17 +36,18 @@ public function __construct(
      * @param int $productId
      * @param int $currentPage
      * @param int $pageSize
-     *
+     * @param int $storeId
      * @return Collection
      */
-    public function getData(int $productId, int $currentPage, int $pageSize): Collection
+    public function getData(int $productId, int $currentPage, int $pageSize, int $storeId): Collection
     {
         /** @var Collection $reviewsCollection */
         $reviewsCollection = $this->collectionFactory->create()
             ->addStatusFilter(Review::STATUS_APPROVED)
             ->addEntityFilter(Review::ENTITY_PRODUCT_CODE, $productId)
             ->setPageSize($pageSize)
             ->setCurPage($currentPage)
+            ->addStoreFilter($storeId)
             ->setDateOrder();
         $reviewsCollection->getSelect()->join(
             ['cpe' => $reviewsCollection->getTable('catalog_product_entity')],

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

@@ -96,7 +96,8 @@ public function resolve(
         $reviewsCollection = $this->productReviewsDataProvider->getData(
             (int) $product->getId(),
             $args['currentPage'],
-            $args['pageSize']
+            $args['pageSize'],
+            (int) $context->getExtensionAttributes()->getStore()->getId()
         );
 
         return $this->aggregatedReviewsDataProvider->getData($reviewsCollection);