Small refactoring to re-implement the customer reviews

Author: eduard13

app/code/Magento/Review/Model/Review/AddRatingVotesToCustomerReviews.php

@@ -18,19 +18,20 @@ class ReviewDataMapper
     /**
      * Mapping the review data
      *
-     * @param Review|Product $review
+     * @param Review $review
      *
      * @return array
      */
-    public function map($review): array
+    public function map(Review $review): array
     {
         return [
             'summary' => $review->getData('title'),
             'text' => $review->getData('detail'),
             'nickname' => $review->getData('nickname'),
             'created_at' => $review->getData('created_at'),
             'rating_votes' => $review->getData('rating_votes'),
-            'sku' => $review->getSku()
+            'sku' => $review->getSku(),
+            'model' => $review
         ];
     }
 }

app/code/Magento/Review/Service/GetReviewAverageRatingService.php

@@ -7,35 +7,26 @@
 
 namespace Magento\ReviewGraphQl\Model\DataProvider;
 
-use Magento\Review\Model\ResourceModel\Review\Product\Collection as ProductReviewsCollection;
-use Magento\Review\Model\ResourceModel\Review\Product\CollectionFactory;
-use Magento\Review\Model\Review\AddRatingVotesToCustomerReviews;
-
+use Magento\Review\Model\ResourceModel\Review\Collection as ReviewsCollection;
+use Magento\Review\Model\ResourceModel\Review\CollectionFactory as ReviewsCollectionFactory;
+use Magento\Review\Model\Review;
 /**
  * Provides customer reviews
  */
 class CustomerReviewsDataProvider
 {
     /**
-     * @var CollectionFactory
+     * @var ReviewsCollectionFactory
      */
     private $collectionFactory;
 
     /**
-     * @var AddRatingVotesToCustomerReviews
-     */
-    private $addRatingVotesToCustomerReviews;
-
-    /**
-     * @param CollectionFactory $collectionFactory
-     * @param AddRatingVotesToCustomerReviews $addRatingVotesToCustomerReviews
+     * @param ReviewsCollectionFactory $collectionFactory
      */
     public function __construct(
-        CollectionFactory $collectionFactory,
-        AddRatingVotesToCustomerReviews $addRatingVotesToCustomerReviews
+        ReviewsCollectionFactory $collectionFactory
     ) {
         $this->collectionFactory = $collectionFactory;
-        $this->addRatingVotesToCustomerReviews = $addRatingVotesToCustomerReviews;
     }
 
     /**
@@ -45,17 +36,23 @@ public function __construct(
      * @param int $currentPage
      * @param int $pageSize
      *
-     * @return ProductReviewsCollection
+     * @return ReviewsCollection
      */
-    public function getData(int $customerId, int $currentPage, int $pageSize): ProductReviewsCollection
+    public function getData(int $customerId, int $currentPage, int $pageSize): ReviewsCollection
     {
-        /** @var ProductReviewsCollection $reviewsCollection */
+        /** @var ReviewsCollection $reviewsCollection */
         $reviewsCollection = $this->collectionFactory->create();
-        $reviewsCollection->addCustomerFilter($customerId)
+        $reviewsCollection->addStatusFilter(Review::STATUS_APPROVED)
+            ->addCustomerFilter($customerId)
             ->setPageSize($pageSize)
             ->setCurPage($currentPage)
             ->setDateOrder();
-        $this->addRatingVotesToCustomerReviews->execute($reviewsCollection);
+        $reviewsCollection->getSelect()->join(
+            ['cpe' => $reviewsCollection->getTable('catalog_product_entity')],
+            'cpe.entity_id = main_table.entity_pk_value',
+            ['sku']
+        );
+        $reviewsCollection->addRateVotes();
 
         return $reviewsCollection;
     }

app/code/Magento/ReviewGraphQl/Mapper/ReviewDataMapper.php

@@ -7,23 +7,44 @@
 
 namespace Magento\ReviewGraphQl\Model\DataProvider;
 
+use Magento\Review\Model\ResourceModel\Rating\Option\Vote\Collection as VoteCollection;
+use Magento\Review\Model\ResourceModel\Rating\Option\Vote\CollectionFactory as VoteCollectionFactory;
+
 /**
  * Provides rating votes
  */
 class ReviewRatingsDataProvider
 {
+    /**
+     * @var VoteCollectionFactory
+     */
+    private $voteCollectionFactory;
+
+    /**
+     * @param VoteCollectionFactory $voteCollectionFactory
+     */
+    public function __construct(VoteCollectionFactory $voteCollectionFactory)
+    {
+        $this->voteCollectionFactory = $voteCollectionFactory;
+    }
+
     /**
      * Providing rating votes
      *
-     * @param array $ratingVotes
+     * @param int $reviewId
      *
      * @return array
      */
-    public function getData(array $ratingVotes): array
+    public function getData(int $reviewId): array
     {
+        /** @var VoteCollection $ratingVotes */
+        $ratingVotes = $this->voteCollectionFactory->create();
+        $ratingVotes->setReviewFilter($reviewId);
+        $ratingVotes->addRatingInfo();
+
         $data = [];
 
-        foreach ($ratingVotes as $ratingVote) {
+        foreach ($ratingVotes->getItems() as $ratingVote) {
             $data[] = [
                 'name' => $ratingVote->getData('rating_code'),
                 'value' => $ratingVote->getData('value')

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

@@ -13,26 +13,26 @@
 use Magento\Framework\GraphQl\Query\Resolver\Value;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Review\Model\ResourceModel\Rating\Option\Vote\Collection as VoteCollection;
-use Magento\Review\Service\GetReviewAverageRatingService;
+use Magento\Review\Model\RatingFactory;
+use Magento\Review\Model\Review;
 
 /**
  * Review average rating resolver
  */
 class AverageRating implements ResolverInterface
 {
     /**
-     * @var GetReviewAverageRatingService
+     * @var RatingFactory
      */
-    private $getReviewAverageRatingService;
+    private $ratingFactory;
 
     /**
-     * @param GetReviewAverageRatingService $getReviewAverageRatingService
+     * @param RatingFactory $ratingFactory
      */
     public function __construct(
-        GetReviewAverageRatingService $getReviewAverageRatingService
+        RatingFactory $ratingFactory
     ) {
-        $this->getReviewAverageRatingService = $getReviewAverageRatingService;
+        $this->ratingFactory = $ratingFactory;
     }
 
     /**
@@ -57,13 +57,19 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        if (!isset($value['rating_votes'])) {
-            throw new GraphQlInputException(__('Value must contain "rating_votes" property.'));
+        if (!isset($value['model'])) {
+            throw new GraphQlInputException(__('Value must contain "model" property.'));
         }
 
-        /** @var VoteCollection $ratingVotes */
-        $ratingVotes = $value['rating_votes'];
+        /** @var Review $review */
+        $review = $value['model'];
+        $summary = $this->ratingFactory->create()->getReviewSummary($review->getId());
+        $averageRating = $summary->getSum();
 
-        return $this->getReviewAverageRatingService->execute($ratingVotes->getItems());
+        if ($summary->getSum() > 0) {
+            $averageRating = (float) number_format($summary->getSum() / $summary->getCount() / 20, 2);
+        }
+
+        return $averageRating;
     }
 }

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

@@ -13,7 +13,7 @@
 use Magento\Framework\GraphQl\Query\Resolver\Value;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Review\Model\ResourceModel\Rating\Option\Vote\Collection as VoteCollection;
+use Magento\Review\Model\Review;
 use Magento\ReviewGraphQl\Model\DataProvider\ReviewRatingsDataProvider;
 
 /**
@@ -57,13 +57,13 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        if (!isset($value['rating_votes'])) {
-            throw new GraphQlInputException(__('Value must contain "rating_votes" property.'));
+        if (!isset($value['model'])) {
+            throw new GraphQlInputException(__('Value must contain "model" property.'));
         }
 
-        /** @var VoteCollection $ratingVotes */
-        $ratingVotes = $value['rating_votes'];
+        /** @var Review $review */
+        $review = $value['model'];
 
-        return $this->reviewRatingsDataProvider->getData($ratingVotes->getItems());
+        return $this->reviewRatingsDataProvider->getData((int) $review->getId());
     }
 }