Merge branch 'ACP2E-39' of https://github.com/magento-l3/magento2ce into PR1-21-01-2022

Author: chittima

app/code/Magento/Catalog/Model/ResourceModel/ProductFrontendAction/Collection.php

@@ -36,6 +36,9 @@ public function addFilterByUserIdentities($customerId, $visitorId)
             $this->addFieldToFilter('customer_id', $customerId);
         } elseif ($visitorId) {
             $this->addFieldToFilter('visitor_id', $visitorId);
+        } else {
+            $this->_totalRecords = 0;
+            $this->_setIsLoaded(true);
         }
 
         return $this;

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

@@ -8,6 +8,9 @@
 namespace Magento\Catalog\Model\Product\ProductFrontendAction;
 
 use Magento\Catalog\Model\ProductRepository;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\Session;
+use Magento\Customer\Model\Visitor;
 
 /**
  * Test for \Magento\Catalog\Model\Product\ProductFrontendAction\Synchronizer.
@@ -19,20 +22,34 @@ class SynchronizerTest extends \PHPUnit\Framework\TestCase
      */
     private $synchronizer;
 
+    /** @var Session */
+    private $session;
+
+    /** @var Visitor */
+    private $visitor;
+
     /**
      * @var ProductRepository
      */
     private $productRepository;
 
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
     /**
      * @inheritDoc
      */
     protected function setUp(): void
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->session = $objectManager->get(Session::class);
+        $this->visitor = $objectManager->get(Visitor::class);
 
         $this->synchronizer = $objectManager->get(Synchronizer::class);
         $this->productRepository = $objectManager->get(ProductRepository::class);
+        $this->customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
     }
 
     /**
@@ -110,4 +127,60 @@ public function testSyncActionsWithoutActionsType(): void
 
         $this->synchronizer->syncActions($productsData, '');
     }
+
+    /**
+     * Tests that product actions are returned correctly according to the provided customer or visitor.
+     *
+     * @param int|null $visitorId
+     * @param string|null $customerEmail
+     * @param int $expectedCollectionSize
+     * @return void
+     * @dataProvider getAllActionsDataProvider
+     *
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     */
+    public function testGetAllActions(?int $visitorId, ?string $customerEmail, int $expectedCollectionSize): void
+    {
+        $customerId = $customerEmail ? $this->customerRepository->get($customerEmail)->getId() : null;
+        $this->session->setCustomerId($customerId);
+        $this->visitor->setId($visitorId);
+        $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 = [
+            $productScope . '-' . $scopeId . '-' . $product1Id => [
+                'added_at' => '1576582660',
+                'product_id' => $product1Id,
+            ],
+            $productScope . '-' . $scopeId . '-' . $product2Id => [
+                'added_at' => '1576587153',
+                'product_id' => $product2Id,
+            ],
+        ];
+
+        $this->synchronizer->syncActions($productsData, $actionsType);
+        $collection = $this->synchronizer->getAllActions();
+
+        $this->assertEquals($expectedCollectionSize, $collection->getSize());
+    }
+
+    /**
+     * @return array[]
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function getAllActionsDataProvider()
+    {
+        return [
+            ['visitorId' => null, 'customerEmail' => 'customer@example.com', 'expectedCollectionSize' => 2],
+            ['visitorId' => 123, 'customerEmail' => null, 'expectedCollectionSize' => 2],
+            ['visitorId' => null, 'customerEmail' => null, 'expectedCollectionSize' => 0],
+        ];
+    }
 }