Merge branch '2.5-develop' into 2.4-dev-2.5-sync

Author: engcom-Foxtrot

app/code/Magento/CustomerImportExport/Test/Unit/Model/ResourceModel/Import/CustomerComposite/DataTest.php

@@ -10,6 +10,7 @@
  */
 namespace Magento\CustomerImportExport\Test\Unit\Model\ResourceModel\Import\CustomerComposite;
 
+use Magento\Backend\Model\Auth\Session;
 use Magento\CustomerImportExport\Model\Import\Address;
 use Magento\CustomerImportExport\Model\Import\CustomerComposite;
 use Magento\Framework\App\ResourceConnection;
@@ -20,13 +21,44 @@
 use Magento\Framework\Json\Helper\Data;
 use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\MockObject\MockBuilder;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class DataTest extends TestCase
 {
+    /**
+     * @var string[]
+     */
+    private $mockBuilderCallbacks = [
+        Session::class => 'getSessionMock'
+    ];
+
+    /**
+     * @inheritDoc
+     */
+    public function getMockBuilder(string $className): MockBuilder
+    {
+        $mockBuilder = parent::getMockBuilder($className);
+        if (isset($this->mockBuilderCallbacks[$className])) {
+            $mockBuilder = call_user_func_array([$this, $this->mockBuilderCallbacks[$className]], [$mockBuilder]);
+        }
+
+        return $mockBuilder;
+    }
+
+    /**
+     * @param MockBuilder $mockBuilder
+     * @return MockBuilder
+     * @SuppressWarnings(PHPMD.UnusedPrivateMethod) Used in callback.
+     */
+    private function getSessionMock(MockBuilder $mockBuilder): MockBuilder
+    {
+        return $mockBuilder->onlyMethods(['isLoggedIn']);
+    }
+
     /**
      * Array of customer attributes
      *
@@ -57,9 +89,10 @@ protected function _getDependencies($entityType, $bunchData)
         );
 
         /** @var $selectMock \Magento\Framework\DB\Select */
-        $selectMock = $this->createPartialMock(Select::class, ['from', 'order']);
+        $selectMock = $this->createPartialMock(Select::class, ['from', 'order', 'where']);
         $selectMock->expects($this->any())->method('from')->willReturnSelf();
         $selectMock->expects($this->any())->method('order')->willReturnSelf();
+        $selectMock->expects($this->any())->method('where')->willReturnSelf();
 
         /** @var AdapterInterface $connectionMock */
         $connectionMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\Pdo\Mysql::class)

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

@@ -5,14 +5,23 @@
  */
 namespace Magento\ImportExport\Model\ResourceModel\Import;
 
+use Magento\Backend\Model\Auth\Session;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DB\Select;
+
 /**
  * ImportExport import data resource model
  *
  * @api
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse) Necessary to get current logged in user without modifying methods
  */
 class Data extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implements \IteratorAggregate
 {
+    /**
+     * Offline import user ID
+     */
+    private const DEFAULT_USER_ID = 0;
     /**
      * @var \Iterator
      */
@@ -24,21 +33,28 @@ class Data extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implemen
      * @var \Magento\Framework\Json\Helper\Data
      */
     protected $jsonHelper;
+    /**
+     * @var Session
+     */
+    private $authSession;
 
     /**
      * Class constructor
      *
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
-     * @param string $connectionName
+     * @param string|null $connectionName
+     * @param Session|null $authSession
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
         \Magento\Framework\Json\Helper\Data $jsonHelper,
-        $connectionName = null
+        $connectionName = null,
+        ?Session $authSession = null
     ) {
         parent::__construct($context, $connectionName);
         $this->jsonHelper = $jsonHelper;
+        $this->authSession = $authSession ?? ObjectManager::getInstance()->get(Session::class);
     }
 
     /**
@@ -60,6 +76,7 @@ public function getIterator()
     {
         $connection = $this->getConnection();
         $select = $connection->select()->from($this->getMainTable(), ['data'])->order('id ASC');
+        $select = $this->prepareSelect($select);
         $stmt = $connection->query($select);
 
         $stmt->setFetchMode(\Zend_Db::FETCH_NUM);
@@ -81,7 +98,7 @@ public function getIterator()
      */
     public function cleanBunches()
     {
-        return $this->getConnection()->delete($this->getMainTable());
+        return $this->getConnection()->delete($this->getMainTable(), $this->prepareDelete([]));
     }
 
     /**
@@ -114,7 +131,9 @@ public function getEntityTypeCode()
     public function getUniqueColumnData($code)
     {
         $connection = $this->getConnection();
-        $values = array_unique($connection->fetchCol($connection->select()->from($this->getMainTable(), [$code])));
+        $select = $connection->select()->from($this->getMainTable(), [$code]);
+        $select = $this->prepareSelect($select);
+        $values = array_unique($connection->fetchCol($select));
 
         if (count($values) != 1) {
             throw new \Magento\Framework\Exception\LocalizedException(
@@ -169,7 +188,67 @@ public function saveBunch($entity, $behavior, array $data)
 
         return $this->getConnection()->insert(
             $this->getMainTable(),
-            ['behavior' => $behavior, 'entity' => $entity, 'data' => $encodedData]
+            $this->prepareInsert(['behavior' => $behavior, 'entity' => $entity, 'data' => $encodedData])
         );
     }
+
+    /**
+     * Prepare select for query
+     *
+     * @param Select $select
+     * @return Select
+     */
+    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->getUserId());
+        }
+
+        return $select;
+    }
+
+    /**
+     * Prepare data for insert
+     *
+     * @param array $data
+     * @return array
+     */
+    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->getUserId();
+        }
+
+        return $data;
+    }
+
+    /**
+     * Prepare delete constraints
+     *
+     * @param array $where
+     * @return array
+     */
+    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->getUserId();
+        }
+
+        return $where;
+    }
+
+    /**
+     * Get current user ID
+     *
+     * @return int
+     */
+    private function getUserId(): int
+    {
+        return $this->authSession->isLoggedIn() ? $this->authSession->getUser()->getId() : self::DEFAULT_USER_ID;
+    }
 }

app/code/Magento/ImportExport/etc/db_schema.xml

@@ -12,6 +12,7 @@
         <column xsi:type="varchar" name="entity" nullable="false" length="50" comment="Entity"/>
         <column xsi:type="varchar" name="behavior" nullable="false" length="10" default="append" comment="Behavior"/>
         <column xsi:type="longtext" name="data" nullable="true" comment="Data"/>
+        <column xsi:type="int" name="user_id" unsigned="true" nullable="true" identity="false" comment="User ID"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>
         </constraint>

app/code/Magento/ImportExport/etc/db_schema_whitelist.json

@@ -4,7 +4,8 @@
             "id": true,
             "entity": true,
             "behavior": true,
-            "data": true
+            "data": true,
+            "user_id": true
         },
         "constraint": {
             "PRIMARY": true
@@ -24,4 +25,4 @@
             "PRIMARY": true
         }
     }
-}
+}