ACPT-493: Upload csv with request parameter

Author: aa-kashk

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

@@ -193,6 +193,11 @@ class Import extends AbstractModel
      */
     private $messageManager;
 
+    /**
+     * @var SourceFactory
+     */
+    private $sourceFactory;
+
     /**
      * @var Upload
      */
@@ -215,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)
      */
@@ -235,6 +241,7 @@ public function __construct(
         DateTime $localeDate,
         array $data = [],
         ManagerInterface $messageManager = null,
+        SourceFactory $sourceFactory = null,
         Upload $upload = null
     ) {
         $this->_importExportData = $importExportData;
@@ -252,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);
@@ -304,7 +313,6 @@ protected function _getEntityAdapter()
 
     /**
      * Returns source adapter object.
-     *
      * @Deprecated
      * @see \Magento\ImportExport\Model\Import\Source\Factory::create()
      * @param string $sourceFile Full path to source file
@@ -576,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/Factory.php

@@ -59,13 +59,17 @@ public function create($source, $directory = null, $options = null): AbstractSou
                 __('\'%1\' file extension is not supported', $type)
             );
         }
+        $data = [];
+        $data['file'] = $source;
+        $data['directory'] = $directory;
+        if ($type === 'Csv') {
+            $data['delimiter'] = $options;
+        } else {
+            $data['options'] = $options;
+        }
         return $this->objectManager->create(
             $adapterClass,
-            [
-                'file' => $source,
-                'directory' => $directory,
-                'options' => $options
-            ]
+            $data
         );
     }
 }