Merge remote-tracking branch 'origin/MC-31171' into 2.4-develop-pr15

Author: serhii-balko

app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php

@@ -20,6 +20,8 @@
  *
  * Service which allows to sync product widget information, such as product id with db. In order to reuse this info
  * on different devices
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class Synchronizer
 {
@@ -94,6 +96,7 @@ public function __construct(
      *
      * @param string $namespace
      * @return int
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function getLifeTimeByNamespace($namespace)
     {
@@ -119,6 +122,7 @@ private function getLifeTimeByNamespace($namespace)
      * @param array $productsData (product action data, that came from frontend)
      * @param string $typeId namespace (type of action)
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function filterNewestActions(array $productsData, $typeId)
     {
@@ -166,6 +170,7 @@ private function getProductIdsByActions(array $actions)
      * @param array $productsData
      * @param string $typeId
      * @return void
+     * @throws \Exception
      */
     public function syncActions(array $productsData, $typeId)
     {
@@ -189,16 +194,15 @@ public function syncActions(array $productsData, $typeId)
             foreach ($collection as $item) {
                 $this->entityManager->delete($item);
             }
-
-            foreach ($productsData as $productId => $productData) {
+            foreach ($productsData as $productData) {
                 /** @var ProductFrontendActionInterface $action */
                 $action = $this->productFrontendActionFactory->create(
                     [
                         'data' => [
                             'visitor_id' => $customerId ? null : $visitorId,
                             'customer_id' => $this->session->getCustomerId(),
                             'added_at' => $productData['added_at'],
-                            'product_id' => $productId,
+                            'product_id' => $productData['product_id'],
                             'type_id' => $typeId
                         ]
                     ]

app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php

@@ -82,15 +82,15 @@ public function testFilterProductActions()
     {
         $typeId = 'recently_compared_product';
         $productsData = [
-            1 => [
+            'website-1-1' => [
                 'added_at' => 12,
                 'product_id' => 1,
             ],
-            2 => [
+            'website-1-2' => [
                 'added_at' => 13,
                 'product_id' => '2',
             ],
-            3 => [
+            'website-2-3' => [
                 'added_at' => 14,
                 'product_id' => 3,
             ]

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ProductFrontendAction/SynchronizerTest.php

@@ -40,20 +40,24 @@ protected function setUp()
      * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
      *
      * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSyncActions(): void
     {
         $actionsType = 'recently_viewed_product';
+        $productScope = 'website';
+        $scopeId = 1;
         $product1 = $this->productRepository->get('simple');
         $product2 = $this->productRepository->get('simple2');
         $product1Id = $product1->getId();
         $product2Id = $product2->getId();
         $productsData = [
-            $product1Id => [
+            $productScope . '-' . $scopeId . '-' . $product1Id => [
                 'added_at' => '1576582660',
                 'product_id' => $product1Id,
             ],
-            $product2Id => [
+            $productScope . '-' . $scopeId . '-' . $product2Id => [
                 'added_at' => '1576587153',
                 'product_id' => $product2Id,
             ],
@@ -71,8 +75,9 @@ public function testSyncActions(): void
         );
 
         foreach ($synchronizedCollection as $item) {
-            $this->assertArrayHasKey($item->getProductId(), $productsData);
-            $this->assertEquals($productsData[$item->getProductId()]['added_at'], $item->getAddedAt());
+            $productScopeId = $productScope . '-' . $scopeId . '-' . $item->getProductId();
+            $this->assertArrayHasKey($productScopeId, $productsData);
+            $this->assertEquals($productsData[$productScopeId]['added_at'], $item->getAddedAt());
         }
     }
 
@@ -81,6 +86,8 @@ public function testSyncActions(): void
      * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
      *
      * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSyncActionsWithoutActionsType(): void
     {