MC-37934: Unexpected behavior of "Manage Shopping Cart" regarding "Products in the Comparison List"

Author: victor-v-rad

app/code/Magento/Reports/Model/ResourceModel/Event.php

@@ -93,7 +93,9 @@ public function applyLogToCollection(
         $skipIds = []
     ) {
         $idFieldName = $collection->getResource()->getIdFieldName();
-        $predefinedStoreIds = ($collection->getStoreId() === null) ?: [$collection->getStoreId()];
+        $predefinedStoreIds = ($collection->getStoreId() === null)
+            ? null
+            : [$collection->getStoreId()];
 
         $derivedSelect = $this->getConnection()
             ->select()

app/code/Magento/Reports/Test/Unit/Model/ResourceModel/EventTest.php

@@ -134,9 +134,13 @@ public function testUpdateCustomerTypeWithType()
     }
 
     /**
+     * @dataProvider getApplyLogToCollectionDataProvider
+     * @param null|array $storeId
+     * @param null|array $storeIdSelect
+     *
      * @return void
      */
-    public function testApplyLogToCollection()
+    public function testApplyLogToCollection($storeId, $storeIdSelect)
     {
         $derivedSelect = 'SELECT * FROM table';
         $idFieldName = 'IdFieldName';
@@ -160,6 +164,7 @@ public function testApplyLogToCollection()
             ->willReturnSelf();
 
         $collectionMock = $this->getMockBuilder(AbstractDb::class)
+            ->setMethods(['getResource', 'getIdFieldName', 'getSelect', 'getStoreId'])
             ->disableOriginalConstructor()
             ->getMock();
         $collectionMock
@@ -177,7 +182,7 @@ public function testApplyLogToCollection()
         $collectionMock
             ->expects($this->any())
             ->method('getStoreId')
-            ->willReturn(1);
+            ->willReturn($storeId);
 
         $selectMock = $this->getMockBuilder(Select::class)
             ->disableOriginalConstructor()
@@ -199,6 +204,16 @@ public function testApplyLogToCollection()
             ->expects($this->any())
             ->method('__toString')
             ->willReturn($derivedSelect);
+        $selectMock
+            ->expects($this->any())
+            ->method('where')
+            ->withConsecutive([
+                ['event_type_id = ?', 1],
+                ['subject_id = ?', 1],
+                ['subtype = ?', 1],
+                ['store_id IN(?)', $storeIdSelect]
+            ])
+            ->willReturn($selectMock);
 
         $this->connectionMock
             ->expects($this->once())
@@ -213,6 +228,16 @@ public function testApplyLogToCollection()
         $this->event->applyLogToCollection($collectionMock, 1, 1, 1);
     }
 
+    /**
+     * @return array
+     */
+    public function getApplyLogToCollectionDataProvider()
+    {
+        return [
+            ['storeId' => 1, 'storeIdSelect' => [1]],
+            ['storeId' => null, 'storeIdSelect' => [1]],
+        ];
+    }
     /**
      * @return void
      */