Skip to content

Commit 67d9dde

Browse files
committed
ACPT-493: Upload csv with API request parameter
1 parent aec7bab commit 67d9dde

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,15 @@ public function getErrorAggregator()
576576
*/
577577
public function uploadSource()
578578
{
579-
return $this->upload->uploadSource($this);
579+
$result = $this->upload->uploadSource($this);
580+
$entity = $this->getEntity();
581+
// phpcs:ignore Magento2.Functions.DiscouragedFunction
582+
$extension = pathinfo($result['file'], PATHINFO_EXTENSION);
583+
$sourceFile = $this->getWorkingDir() . $entity . '.' . $extension;
584+
$sourceFileRelative = $this->getVarDirectory()->getRelativePath($sourceFile);
585+
$this->_removeBom($sourceFile);
586+
$this->createHistoryReport($sourceFileRelative, $entity, $extension, $result);
587+
return $sourceFile;
580588
}
581589

582590
/**
@@ -626,7 +634,7 @@ public function getVarDirectory()
626634
* @return $this
627635
* @throws FileSystemException
628636
*/
629-
public function _removeBom($sourceFile)
637+
protected function _removeBom($sourceFile)
630638
{
631639
$driver = $this->_varDirectory->getDriver();
632640
$string = $driver->fileGetContents($this->_varDirectory->getAbsolutePath($sourceFile));
@@ -809,7 +817,7 @@ public function isReportEntityType($entity = null)
809817
* @return $this
810818
* @throws LocalizedException
811819
*/
812-
public function createHistoryReport($sourceFileRelative, $entity, $extension = null, $result = null)
820+
protected function createHistoryReport($sourceFileRelative, $entity, $extension = null, $result = null)
813821
{
814822
if ($this->isReportEntityType($entity)) {
815823
if (is_array($sourceFileRelative)) {

app/code/Magento/ImportExport/Model/Source/Upload.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function __construct(
6363
*
6464
* @param Import $import
6565
* @throws LocalizedException
66-
* @return string Source file path
66+
* @return array
6767
*/
6868
public function uploadSource(Import $import)
6969
{
@@ -122,8 +122,6 @@ public function uploadSource(Import $import)
122122
throw new LocalizedException(__('The source file moving process failed.'));
123123
}
124124
}
125-
$import->_removeBom($sourceFile);
126-
$import->createHistoryReport($sourceFileRelative, $entity, $extension, $result);
127-
return $sourceFile;
125+
return $result;
128126
}
129127
}

0 commit comments

Comments
 (0)