ACP2E-39: customer/section/load without initialising the session would loads all data from catalog product frontend action

Author: glo23503

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->addFieldToFilter('visitor_id', $visitorId)
+                ->addFieldToFilter('customer_id', $customerId);
         }
 
         return $this;

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

@@ -107,10 +107,36 @@ protected function setUp(): void
         );
     }
 
+    /**
+     * Variation for UserIdentities.
+     *
+     * @return array
+     */
+    public function getUserIdentitiesCases(): array
+    {
+        return [
+            [
+                'customerId' => 1,
+                'visitorId' => null
+            ],
+            [
+                'customerId' => null,
+                'visitorId' => 33
+            ],
+            [
+                'customerId' => null,
+                'visitorId' => null
+            ],
+        ];
+    }
+
     /**
      * @inheritDoc
+     * @param int $customerId
+     * @param int $visitorId
+     * @dataProvider getUserIdentitiesCases
      */
-    public function testFilterProductActions(): void
+    public function testFilterProductActions(int $customerId = null, int $visitorId = null): void
     {
         $typeId = 'recently_compared_product';
         $productsData = [
@@ -149,16 +175,16 @@ public function testFilterProductActions(): void
             ->getMock();
         $this->sessionMock->expects($this->any())
             ->method('getCustomerId')
-            ->willReturn(1);
+            ->willReturn($customerId);
         $this->visitorMock->expects($this->exactly(2))
             ->method('getId')
-            ->willReturn(34);
+            ->willReturn($visitorId);
         $this->collectionFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($collection);
         $collection->expects($this->once())
             ->method('addFilterByUserIdentities')
-            ->with(1, 34);
+            ->with($customerId, $visitorId);
         $collection
             ->method('addFieldToFilter')
             ->withConsecutive(['type_id', $typeId], ['product_id', [1, 2]]);
@@ -175,8 +201,8 @@ public function testFilterProductActions(): void
                 [
                     [
                         'data' => [
-                            'visitor_id' => null,
-                            'customer_id' => 1,
+                            'visitor_id' => $visitorId,
+                            'customer_id' => $customerId,
                             'added_at' => 12,
                             'product_id' => 1,
                             'type_id' => 'recently_compared_product'
@@ -186,8 +212,8 @@ public function testFilterProductActions(): void
                 [
                     [
                         'data' => [
-                            'visitor_id' => null,
-                            'customer_id' => 1,
+                            'visitor_id' => $visitorId,
+                            'customer_id' => $customerId,
                             'added_at' => 13,
                             'product_id' => 2,
                             'type_id' => 'recently_compared_product'