Sylius · GSadee · Mar 30, 2021 · Mar 26, 2021 · Mar 26, 2021 · Mar 26, 2021
diff --git a/...s/product/viewing_product_reviews/viewing_product_reviews_on_product_details_page.feature b/...s/product/viewing_product_reviews/viewing_product_reviews_on_product_details_page.feature
@@ -13,7 +13,7 @@ Feature: Viewing product reviews on product's details page
         And this product has also a review titled "Classic" and rated 5 added by customer "[email protected]"
         And I am a logged in customer
 
-    @ui
+    @ui @api
     Scenario: Viewing last 3 product reviews on product's details page
         When I check this product's details
         Then I should see 3 product reviews

diff --git a/src/Sylius/Behat/Context/Api/Shop/ProductReviewContext.php b/src/Sylius/Behat/Context/Api/Shop/ProductReviewContext.php
@@ -89,6 +89,39 @@ public function iLeaveACommentTitled(string $comment, string $title, ?string $em
         $this->client->addRequestData('email', $email);
     }
 
+    /**
+     * @Then I should see :amount product reviews
+     */
+    public function iShouldSeeProductReviews(int $amount = 0): void
+    {
+        /** @var ProductInterface $product */
+        $product = $this->sharedStorage->get('product');
+
+        $this->client->index();
+        $this->client->addFilter('reviewSubject', $this->iriConverter->getIriFromItem($product));
+        $this->client->addFilter('itemsPerPage', 3);
+        $this->client->addFilter('order[createdAt]', 'desc');
+        $this->client->filter();
+
+        Assert::same($this->responseChecker->countCollectionItems($this->client->getLastResponse()), $amount);
+    }
+
+    /**
+     * @Then I should see reviews titled :titleOne, :titleTwo and :titleThree
+     */
+    public function iShouldSeeReviewsTitledAnd(string ...$titles): void
+    {
+        Assert::true($this->hasReviewsWithTitles($titles));
+    }
+
+    /**
+     * @Then I should not see review titled :title
+     */
+    public function iShouldNotSeeReviewTitled(string $title): void
+    {
+        Assert::false($this->hasReviewsWithTitles([$title]));
+    }
+
     /**
      * @When I rate it with :rating point(s)
      */
@@ -126,4 +159,15 @@ public function iShouldNotSeeReviewTitledInTheList(string $title): void
     {
         Assert::isEmpty($this->responseChecker->getCollectionItemsWithValue($this->client->getLastResponse(), 'title', $title));
     }
+
+    private function hasReviewsWithTitles(array $titles): bool
+    {
+        foreach ($titles as $title) {
+            if (!$this->responseChecker->hasItemWithValue($this->client->getLastResponse(), 'title', $title)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/ProductReview.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/ProductReview.xml
@@ -43,6 +43,7 @@
                 <attribute name="path">/shop/product-reviews</attribute>
                 <attribute name="filters">
                     <attribute>sylius.api.product_review_product_filter</attribute>
+                    <attribute>sylius.api.product_review_date_filter</attribute>
                 </attribute>
             </collectionOperation>
         </collectionOperations>

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml
@@ -61,6 +61,13 @@
             <tag name="api_platform.filter" />
         </service>
 
+        <service id="sylius.api.product_review_date_filter" parent="api_platform.doctrine.orm.order_filter">
+            <argument type="collection">
+                <argument key="createdAt" />
+            </argument>
+            <tag name="api_platform.filter" />
+        </service>
+
         <service id="sylius.api.product_order_filter" parent="api_platform.doctrine.orm.order_filter">
             <argument type="collection">
                 <argument key="code" />