Merge remote-tracking branch 'mpi/MC-34522' into 2.5-bugfixes-010521

Author: bubasuma

app/code/Magento/ImportExport/Model/ResourceModel/Import/Data.php

@@ -203,7 +203,7 @@ private function prepareSelect(Select $select): Select
         // check if the table has not been overridden for backward compatibility
         if ($this->getMainTable() === $this->getTable('importexport_importdata')) {
             // user_id is NULL part is for backward compatibility
-            $select->where('user_id=? OR user_id is NULL', $this->getCurrentUserId() ?? self::DEFAULT_USER_ID);
+            $select->where('user_id=? OR user_id is NULL', $this->getUserId());
         }
 
         return $select;
@@ -219,7 +219,7 @@ private function prepareInsert(array $data): array
     {
         // check if the table has not been overridden for backward compatibility
         if ($this->getMainTable() === $this->getTable('importexport_importdata')) {
-            $data['user_id'] = $this->getCurrentUserId() ?? self::DEFAULT_USER_ID;
+            $data['user_id'] = $this->getUserId();
         }
 
         return $data;
@@ -236,7 +236,7 @@ private function prepareDelete(array $where): array
         // check if the table has not been overridden for backward compatibility
         if ($this->getMainTable() === $this->getTable('importexport_importdata')) {
             // user_id is NULL part is for backward compatibility
-            $where['user_id=? OR user_id is NULL'] = $this->getCurrentUserId() ?? self::DEFAULT_USER_ID;
+            $where['user_id=? OR user_id is NULL'] = $this->getUserId();
         }
 
         return $where;
@@ -245,10 +245,10 @@ private function prepareDelete(array $where): array
     /**
      * Get current user ID
      *
-     * @return int|null
+     * @return int
      */
-    private function getCurrentUserId(): ?int
+    private function getUserId(): int
     {
-        return $this->authSession->isLoggedIn() ? $this->authSession->getUser()->getId() : null;
+        return $this->authSession->isLoggedIn() ? $this->authSession->getUser()->getId() : self::DEFAULT_USER_ID;
     }
 }