Merge remote-tracking branch 'local/ACP2E-1552' into PR_7_JAN_2023

Author: o-dubovyk

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

@@ -23,6 +23,7 @@ class Review implements RevertibleDataFixtureInterface
         'detail' => 'Review detail',
         'status_id' => ReviewModel::STATUS_APPROVED,
         'store_id' => 1,
+        'customer_id' => null,
     ];
 
     /**

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

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

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

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

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

@@ -19,6 +19,7 @@
 use Magento\Review\Test\Fixture\Review as ReviewFixture;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Test\Fixture\Store as StoreFixture;
+use Magento\Customer\Test\Fixture\Customer as CustomerFixture;
 use Magento\TestFramework\Fixture\DataFixture;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
@@ -288,6 +289,55 @@ public function testProductReviewDifferentStores(string $storeCode): void
         self::assertCount(1, $response['products']['items'][0]['reviews']['items']);
     }
 
+    #[
+        DataFixture(StoreFixture::class, ['code' => 'store2'], 'store2'),
+        DataFixture(CustomerFixture::class, ['email' => 'customer@example.com'], 'customer'),
+        DataFixture(ProductFixture::class, ['sku' => 'product1'], 'product1'),
+        DataFixture(ReviewFixture::class, [
+            'entity_pk_value' => '$product1.id$',
+            'customer_id' => '$customer.entity_id$'
+        ]),
+        DataFixture(ReviewFixture::class, [
+            'entity_pk_value' => '$product1.id$',
+            'store_id' => '$store2.id$',
+            'customer_id' => '$customer.entity_id$'
+        ]),
+    ]
+    /**
+     * @dataProvider storesDataProvider
+     * @param string $storeCode
+     */
+    public function testCustomerReviewDifferentStores(string $storeCode): void
+    {
+        $query = <<<QUERY
+{
+  customer {
+    firstname
+    lastname
+    suffix
+    email
+    reviews(
+      currentPage: 1
+      pageSize: 20
+    ) {
+          items {
+              summary
+              text
+              summary
+          }
+      }
+  }
+}
+QUERY;
+        $headers = ['Store' => $storeCode, 'Authorization' => implode($this->getHeaderMap())];
+        $response = $this->graphQlQuery($query, [], '', $headers);
+        self::assertArrayHasKey('customer', $response);
+        self::assertArrayHasKey('reviews', $response['customer']);
+        self::assertArrayHasKey('items', $response['customer']['reviews']);
+        self::assertNotEmpty($response['customer']['reviews']['items']);
+        self::assertCount(1, $response['customer']['reviews']['items']);
+    }
+
     /**
      * @return array
      */