ACPT-493: Upload csv with request parameter

Author: aa-kashk

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

@@ -220,6 +220,7 @@ class Import extends AbstractModel
      * @param DateTime $localeDate
      * @param array $data
      * @param ManagerInterface|null $messageManager
+     * @param SourceFactory|null $sourceFactory
      * @param Upload|null $upload
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -240,6 +241,7 @@ public function __construct(
         DateTime $localeDate,
         array $data = [],
         ManagerInterface $messageManager = null,
+        SourceFactory $sourceFactory = null,
         Upload $upload = null
     ) {
         $this->_importExportData = $importExportData;
@@ -257,6 +259,8 @@ public function __construct(
         $this->localeDate = $localeDate;
         $this->messageManager = $messageManager ?: ObjectManager::getInstance()
             ->get(ManagerInterface::class);
+        $this->sourceFactory = $sourceFactory?? ObjectManager::getInstance()
+            ->get(SourceFactory::class);
         $this->upload = $upload ?: ObjectManager::getInstance()
             ->get(Upload::class);
         parent::__construct($logger, $filesystem, $data);
@@ -309,7 +313,8 @@ protected function _getEntityAdapter()
 
     /**
      * Returns source adapter object.
-     *
+     * @Deprecated
+     * @see \Magento\ImportExport\Model\Import\Source\Factory::create()
      * @param string $sourceFile Full path to source file
      * @return AbstractSource
      * @throws FileSystemException
@@ -579,7 +584,11 @@ public function uploadFileAndGetSource()
     {
         $sourceFile = $this->uploadSource();
         try {
-            $source = $this->_getSourceAdapter($sourceFile);
+            $source = $this->sourceFactory->create(
+                $sourceFile,
+                $this->_filesystem->getDirectoryWrite(DirectoryList::ROOT),
+                $this->getData(self::FIELD_FIELD_SEPARATOR)
+            );
         } catch (\Exception $e) {
             $this->_varDirectory->delete($this->_varDirectory->getRelativePath($sourceFile));
             throw new LocalizedException(__($e->getMessage()));

app/code/Magento/ImportExport/Model/Import/Source/Base64EncodedCsvData.php

@@ -31,12 +31,12 @@ class Base64EncodedCsvData extends AbstractSource
     /**
      * Read Data and detect column names
      *
-     * @param string $source
+     * @param string $file
      */
-    public function __construct(string $source)
+    public function __construct(string $file)
     {
         // phpcs:ignore Magento2.Functions.DiscouragedFunction
-        $source = trim(base64_decode($source));
+        $source = trim(base64_decode($file));
         $rowsData = preg_split("/\r\n|\n|\r/", $source);
         $colNames = explode(',', $rowsData[0]);
         $this->rows = array_splice($rowsData, 1);

app/code/Magento/ImportExport/Model/Import/Source/Csv.php

@@ -42,27 +42,27 @@ class Csv extends \Magento\ImportExport\Model\Import\AbstractSource
      *
      * There must be column names in the first line
      *
-     * @param string $source
+     * @param string $file
      * @param Read $directory
      * @param string $delimiter
      * @param string $enclosure
      * @throws \LogicException
      */
     public function __construct(
-        $source,
+        $file,
         Read $directory,
         $delimiter = ',',
         $enclosure = '"'
     ) {
         // phpcs:ignore Magento2.Functions.DiscouragedFunction
         register_shutdown_function([$this, 'destruct']);
         try {
-            $this->filePath = $directory->getRelativePath($source);
+            $this->filePath = $directory->getRelativePath($file);
             $this->_file = $directory->openFile($this->filePath, 'r');
             $this->_file->seek(0);
             self::$openFiles[$this->filePath] = true;
         } catch (\Magento\Framework\Exception\FileSystemException $e) {
-            throw new \LogicException("Unable to open file: '{$source}'");
+            throw new \LogicException("Unable to open file: '{$file}'");
         }
         if ($delimiter) {
             $this->_delimiter = $delimiter;

app/code/Magento/ImportExport/Model/Import/Source/Factory.php

@@ -55,7 +55,7 @@ public function create($source, $directory = null, $options = null): AbstractSou
         return $this->objectManager->create(
             $adapterClass,
             [
-                'source' => $source,
+                'file' => $source,
                 'directory' => $directory,
                 'options' => $options
             ]

app/code/Magento/ImportExport/Model/Import/Source/Zip.php

@@ -14,28 +14,28 @@
 class Zip extends Csv
 {
     /**
-     * @param string $source
+     * @param string $file
      * @param \Magento\Framework\Filesystem\Directory\Write $directory
      * @param string $options
      * @param \Magento\Framework\Archive\Zip|null $zipArchive
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \Magento\Framework\Exception\ValidatorException
      */
     public function __construct(
-        $source,
+        $file,
         \Magento\Framework\Filesystem\Directory\Write $directory,
         $options,
         \Magento\Framework\Archive\Zip $zipArchive = null
     ) {
         $zip = $zipArchive ?? ObjectManager::getInstance()->get(\Magento\Framework\Archive\Zip::class);
         $csvFile = $zip->unpack(
-            $source,
-            preg_replace('/\.zip$/i', '.csv', $source)
+            $file,
+            preg_replace('/\.zip$/i', '.csv', $file)
         );
         if (!$csvFile) {
             throw new ValidatorException(__('Sorry, but the data is invalid or the file is not uploaded.'));
         }
-        $directory->delete($directory->getRelativePath($source));
+        $directory->delete($directory->getRelativePath($file));
 
         try {
             parent::__construct($csvFile, $directory, $options);

app/code/Magento/ImportExport/Test/Unit/Helper/ReportTest.php

@@ -204,6 +204,7 @@ public function testGetSummaryStats()
         $importHistoryModel = $this->createMock(History::class);
         $localeDate = $this->createMock(\Magento\Framework\Stdlib\DateTime\DateTime::class);
         $upload = $this->createMock(Upload::class);
+        $sourceFactoryMock = $this->createMock(\Magento\ImportExport\Model\Import\Source\Factory::class);
         $import = new Import(
             $logger,
             $filesystem,
@@ -221,6 +222,7 @@ public function testGetSummaryStats()
             $localeDate,
             [],
             null,
+            $sourceFactoryMock,
             $upload
         );
         $import->setData('entity', 'catalog_product');

app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php

@@ -231,6 +231,7 @@ protected function setUp(): void
             ->expects($this->any())
             ->method('getDriver')
             ->willReturn($this->_driver);
+        $sourceFactoryMock = $this->createMock(\Magento\ImportExport\Model\Import\Source\Factory::class);
         $this->upload = $this->createMock(Upload::class);
         $this->import = $this->getMockBuilder(Import::class)
             ->setConstructorArgs(
@@ -251,6 +252,7 @@ protected function setUp(): void
                     $this->dateTime,
                     [],
                     null,
+                    $sourceFactoryMock,
                     $this->upload
                 ]
             )