Merge remote-tracking branch 'origin/MC-35479' into 2.4-develop-pr34

Author: serhii-balko

app/code/Magento/ImportExport/Model/Report/Csv.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\ImportExport\Model\Report;
 
@@ -60,22 +61,16 @@ public function __construct(
     }
 
     /**
-     * @param string $originalFileName
-     * @param ProcessingErrorAggregatorInterface $errorAggregator
-     * @param bool $writeOnlyErrorItems
-     * @return string
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @inheritDoc
      */
     public function createReport(
         $originalFileName,
         ProcessingErrorAggregatorInterface $errorAggregator,
         $writeOnlyErrorItems = false
     ) {
-        $sourceCsv = $this->createSourceCsvModel($originalFileName);
-
-        $outputFileName = $this->generateOutputFileName($originalFileName);
-        $outputCsv = $this->createOutputCsvModel($outputFileName);
+        $outputCsv = $this->outputCsvFactory->create();
 
+        $sourceCsv = $this->createSourceCsvModel($originalFileName);
         $columnsName = $sourceCsv->getColNames();
         $columnsName[] = self::REPORT_ERROR_COLUMN_NAME;
         $outputCsv->setHeaderCols($columnsName);
@@ -88,10 +83,16 @@ public function createReport(
             }
         }
 
+        $directory = $this->filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
+        $outputFileName = $this->generateOutputFileName($originalFileName);
+        $directory->writeFile(Import::IMPORT_HISTORY_DIR . $outputFileName, $outputCsv->getContents());
+
         return $outputFileName;
     }
 
     /**
+     * Retrieve error messages
+     *
      * @param int $rowNumber
      * @param ProcessingErrorAggregatorInterface $errorAggregator
      * @return string
@@ -112,16 +113,21 @@ public function retrieveErrorMessagesByRowNumber($rowNumber, ProcessingErrorAggr
     }
 
     /**
+     * Generate output filename based on source filename
+     *
      * @param string $sourceFile
      * @return string
      */
     protected function generateOutputFileName($sourceFile)
     {
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         $fileName = basename($sourceFile, self::ERROR_REPORT_FILE_EXTENSION);
         return $fileName . self::ERROR_REPORT_FILE_SUFFIX . self::ERROR_REPORT_FILE_EXTENSION;
     }
 
     /**
+     * Create source CSV model
+     *
      * @param string $sourceFile
      * @return \Magento\ImportExport\Model\Import\Source\Csv
      */
@@ -135,18 +141,4 @@ protected function createSourceCsvModel($sourceFile)
             ]
         );
     }
-
-    /**
-     * @param string $outputFileName
-     * @return \Magento\ImportExport\Model\Export\Adapter\Csv
-     */
-    protected function createOutputCsvModel($outputFileName)
-    {
-        return $this->outputCsvFactory->create(
-            [
-                'destination' => Import::IMPORT_HISTORY_DIR . $outputFileName,
-                'destinationDirectoryCode' => DirectoryList::VAR_DIR,
-            ]
-        );
-    }
 }

app/code/Magento/ImportExport/Test/Unit/Model/Report/CsvTest.php

@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ImportExport\Model\Report;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\ImportExport\Model\Import;
+use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError;
+use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * @magentoAppIsolation enabled
+ * @magentoDbIsolation enabled
+ * @magentoAppArea adminhtml
+ */
+class CsvTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Filesystem\Directory\WriteInterface
+     */
+    private $directory;
+
+    /**
+     * @var Csv
+     */
+    private $csvReport;
+
+    /**
+     * @var string|null
+     */
+    private $importFilePath;
+
+    /**
+     * @var string|null
+     */
+    private $reportPath;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $filesystem = Bootstrap::getObjectManager()->create(Filesystem::class);
+        $this->directory = $filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
+
+        $this->csvReport = Bootstrap::getObjectManager()->create(Csv::class);
+    }
+    /**
+     * @inheritDoc
+     */
+    protected function tearDown(): void
+    {
+        foreach ([$this->importFilePath, $this->reportPath] as $path) {
+            if ($path && $this->directory->isExist($path)) {
+                $this->directory->delete($path);
+            }
+        }
+    }
+
+    /**
+     * @return void
+     */
+    public function testCreateReport()
+    {
+        $importData = <<<fileContent
+sku,store_view_code,name,price,product_type,attribute_set_code,weight
+simple1,,"simple 1",10,simple,Default,-5
+fileContent;
+        $this->importFilePath = 'test_import.csv';
+        $this->directory->writeFile($this->importFilePath, $importData);
+
+        $errorAggregator = Bootstrap::getObjectManager()->create(ProcessingErrorAggregatorInterface::class);
+        $error = 'Value for \'weight\' attribute contains incorrect value';
+        $errorAggregator->addError($error, ProcessingError::ERROR_LEVEL_CRITICAL, 1, 'weight', $error);
+
+        $outputFileName = $this->csvReport->createReport(
+            $this->directory->getAbsolutePath($this->importFilePath),
+            $errorAggregator
+        );
+
+        $this->reportPath = Import::IMPORT_HISTORY_DIR . $outputFileName;
+        $this->assertTrue($this->directory->isExist($this->reportPath), 'Report was not generated');
+    }
+}