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,6 +93,7 @@ public function applyLogToCollection(
         $skipIds = []
     ) {
         $idFieldName = $collection->getResource()->getIdFieldName();
+        $predefinedStoreIds = ($collection->getStoreId() === null) ?: [$collection->getStoreId()];
 
         $derivedSelect = $this->getConnection()
             ->select()
@@ -103,7 +104,7 @@ public function applyLogToCollection(
             ->where('event_type_id = ?', (int) $eventTypeId)
             ->where('subject_id = ?', (int) $eventSubjectId)
             ->where('subtype = ?', (int) $subtype)
-            ->where('store_id IN(?)', $this->getCurrentStoreIds())
+            ->where('store_id IN(?)', $this->getCurrentStoreIds($predefinedStoreIds))
             ->group('object_id');
 
         if ($skipIds) {
@@ -132,13 +133,11 @@ public function getCurrentStoreIds(array $predefinedStoreIds = null)
     {
         $stores = [];
         // get all or specified stores
-        if ($this->_storeManager->getStore()->getId() == 0) {
-            if (null !== $predefinedStoreIds) {
-                $stores = $predefinedStoreIds;
-            } else {
-                foreach ($this->_storeManager->getStores() as $store) {
-                    $stores[] = $store->getId();
-                }
+        if ($predefinedStoreIds !== null) {
+            $stores = $predefinedStoreIds;
+        } else if ($this->_storeManager->getStore()->getId() == 0) {
+            foreach ($this->_storeManager->getStores() as $store) {
+                $stores[] = $store->getId();
             }
         } else {
             // get all stores, required by configuration in current store scope

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

@@ -174,6 +174,10 @@ public function testApplyLogToCollection()
             ->expects($this->any())
             ->method('getSelect')
             ->willReturn($collectionSelectMock);
+        $collectionMock
+            ->expects($this->any())
+            ->method('getStoreId')
+            ->willReturn(1);
 
         $selectMock = $this->getMockBuilder(Select::class)
             ->disableOriginalConstructor()