MC-36149: [CLOUD] 'Be the first to review this product' link is not changed after admin has approved the review

Author: viktorpetryk

app/code/Magento/Review/Block/Product/ReviewRenderer.php

@@ -1,7 +1,5 @@
 <?php
 /**
- * Review renderer
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -11,13 +9,21 @@
 use Magento\Catalog\Block\Product\ReviewRendererInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Review\Model\AppendSummaryDataToObjectByEntityCodeFactory;
+use Magento\Review\Model\Review;
+use Magento\Review\Model\ReviewFactory;
 use Magento\Review\Model\ReviewSummaryFactory;
 use Magento\Review\Observer\PredispatchReviewObserver;
+use Magento\Store\Model\ScopeInterface;
 
 /**
- * Class ReviewRenderer
+ * Review renderer
  */
-class ReviewRenderer extends \Magento\Framework\View\Element\Template implements ReviewRendererInterface
+class ReviewRenderer extends Template implements ReviewRendererInterface
 {
     /**
      * Array of available template name
@@ -32,7 +38,7 @@ class ReviewRenderer extends \Magento\Framework\View\Element\Template implements
     /**
      * Review model factory
      *
-     * @var \Magento\Review\Model\ReviewFactory
+     * @var ReviewFactory
      */
     protected $_reviewFactory;
 
@@ -42,20 +48,29 @@ class ReviewRenderer extends \Magento\Framework\View\Element\Template implements
     private $reviewSummaryFactory;
 
     /**
-     * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Review\Model\ReviewFactory $reviewFactory
+     * @var AppendSummaryDataToObjectByEntityCodeFactory
+     */
+    private $appendSummaryDataToObjectByEntityCodeFactory;
+
+    /**
+     * @param Context $context
+     * @param ReviewFactory $reviewFactory
      * @param array $data
-     * @param ReviewSummaryFactory $reviewSummaryFactory
+     * @param ReviewSummaryFactory|null $reviewSummaryFactory
+     * @param AppendSummaryDataToObjectByEntityCodeFactory|null $appendSummaryDataToObjectByEntityCodeFactory
      */
     public function __construct(
-        \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Review\Model\ReviewFactory $reviewFactory,
+        Context $context,
+        ReviewFactory $reviewFactory,
         array $data = [],
-        ReviewSummaryFactory $reviewSummaryFactory = null
+        ReviewSummaryFactory $reviewSummaryFactory = null,
+        AppendSummaryDataToObjectByEntityCodeFactory $appendSummaryDataToObjectByEntityCodeFactory = null
     ) {
         $this->_reviewFactory = $reviewFactory;
         $this->reviewSummaryFactory = $reviewSummaryFactory ??
             ObjectManager::getInstance()->get(ReviewSummaryFactory::class);
+        $this->appendSummaryDataToObjectByEntityCodeFactory = $appendSummaryDataToObjectByEntityCodeFactory ??
+            ObjectManager::getInstance()->get(AppendSummaryDataToObjectByEntityCodeFactory::class);
         parent::__construct($context, $data);
     }
 
@@ -68,7 +83,7 @@ public function isReviewEnabled(): string
     {
         return $this->_scopeConfig->getValue(
             PredispatchReviewObserver::XML_PATH_REVIEW_ACTIVE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -80,19 +95,21 @@ public function isReviewEnabled(): string
      * @param bool $displayIfNoReviews
      *
      * @return string
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     public function getReviewsSummaryHtml(
-        \Magento\Catalog\Model\Product $product,
+        Product $product,
         $templateType = self::DEFAULT_VIEW,
         $displayIfNoReviews = false
     ) {
         if ($product->getRatingSummary() === null) {
-            $this->reviewSummaryFactory->create()->appendSummaryDataToObject(
-                $product,
-                $this->_storeManager->getStore()->getId()
-            );
+            $this->appendSummaryDataToObjectByEntityCodeFactory->create()
+                ->execute(
+                    $product,
+                    $this->_storeManager->getStore()->getId(),
+                    Review::ENTITY_PRODUCT_CODE
+                );
         }
 
         if (null === $product->getRatingSummary() && !$displayIfNoReviews) {

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

@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Review\Model;
+
+use Magento\Framework\Model\AbstractModel;
+use Magento\Review\Model\ResourceModel\Review\Summary\CollectionFactory as SummaryCollectionFactory;
+
+/**
+ * Add review summary data to object by its entity code
+ */
+class AppendSummaryDataToObjectByEntityCode
+{
+    /**
+     * @var SummaryCollectionFactory
+     */
+    private $summaryCollectionFactory;
+
+    /**
+     * @param SummaryCollectionFactory $summaryCollectionFactory
+     */
+    public function __construct(
+        SummaryCollectionFactory $summaryCollectionFactory
+    ) {
+        $this->summaryCollectionFactory = $summaryCollectionFactory;
+    }
+
+    /**
+     * @param AbstractModel $object
+     * @param int $storeId
+     * @param string $entityCode
+     * @retrun void
+     */
+    public function execute(AbstractModel $object, int $storeId, string $entityCode): void
+    {
+        $summaryCollection = $this->summaryCollectionFactory->create();
+        $summaryCollection->addStoreFilter($storeId);
+        $summaryCollection->getSelect()
+            ->joinLeft(
+                ['review_entity' => $summaryCollection->getResource()->getTable('review_entity')],
+                'main_table.entity_type = review_entity.entity_id',
+                'entity_code'
+            )
+            ->where('entity_pk_value IN (?)', $object->getId())
+            ->where('entity_code = ?', $entityCode);
+        $summaryItem = $summaryCollection->getFirstItem();
+
+        $object->addData(
+            [
+                'reviews_count' => $summaryItem->getData('reviews_count'),
+                'rating_summary' => $summaryItem->getData('rating_summary'),
+            ]
+        );
+    }
+}

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

@@ -12,6 +12,9 @@
 
 /**
  * ReviewSummary model.
+ *
+ * @deprecated Filtering collection by entity_type ID leads to wrong result if AUTO_INCREMENT begins not form 1.
+ * @see \Magento\Review\Model\AppendSummaryDataToObjectByEntityCode
  */
 class ReviewSummary
 {