Merge branch 'ACP2E-1813' of https://github.com/magento-l3/magento2ce into L3-PR-2023-06-23

Author: ArtemVasyliev

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -307,7 +307,7 @@ class Product extends AbstractEntity
         ValidatorInterface::ERROR_INVALID_VARIATIONS_CUSTOM_OPTIONS => 'Value for \'%s\' sub attribute in \'%s\' attribute contains incorrect value, acceptable values are: \'dropdown\', \'checkbox\', \'radio\', \'text\'',
         ValidatorInterface::ERROR_INVALID_MEDIA_URL_OR_PATH => 'Wrong URL/path used for attribute %s',
         ValidatorInterface::ERROR_MEDIA_PATH_NOT_ACCESSIBLE => 'Imported resource (image) does not exist in the local media storage',
-        ValidatorInterface::ERROR_MEDIA_URL_NOT_ACCESSIBLE => 'Imported resource (image) could not be downloaded from external resource due to timeout or access permissions',
+        ValidatorInterface::ERROR_MEDIA_URL_NOT_ACCESSIBLE => 'Imported resource (image: %s) at row %s could not be downloaded from external resource due to timeout or access permissions',
         ValidatorInterface::ERROR_INVALID_WEIGHT => 'Product weight is invalid',
         ValidatorInterface::ERROR_DUPLICATE_URL_KEY => 'Url key: \'%s\' was already generated for an item with the SKU: \'%s\'. You need to specify the unique URL key manually',
         ValidatorInterface::ERROR_DUPLICATE_MULTISELECT_VALUES => 'Value for multiselect attribute %s contains duplicated values',
@@ -1899,7 +1899,11 @@ private function saveProductMediaGalleryPhase(
                             ValidatorInterface::ERROR_MEDIA_URL_NOT_ACCESSIBLE,
                             $rowNum,
                             null,
-                            null,
+                            sprintf(
+                                $this->_messageTemplates[ValidatorInterface::ERROR_MEDIA_URL_NOT_ACCESSIBLE],
+                                $columnImage,
+                                $rowNum
+                            ),
                             ProcessingError::ERROR_LEVEL_NOT_CRITICAL
                         );
                     }

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

@@ -521,14 +521,8 @@ public function importSource()
      */
     private function importSourceCallback()
     {
-        $ids = $this->_getEntityAdapter()->getIds();
-        if (empty($ids)) {
-            $idsFromPostData = $this->getData(self::FIELD_IMPORT_IDS);
-            if (null !== $idsFromPostData && '' !== $idsFromPostData) {
-                $ids = explode(",", $idsFromPostData);
-                $this->_getEntityAdapter()->setIds($ids);
-            }
-        }
+        $ids = $this->getImportIds();
+        $this->_getEntityAdapter()->setIds($ids);
         $this->setData('entity', $this->getDataSourceModel()->getEntityTypeCode($ids));
         $this->setData('behavior', $this->getDataSourceModel()->getBehavior($ids));
 
@@ -560,18 +554,21 @@ private function importSourceCallback()
         $this->getDataSourceModel()->markProcessedBunches($ids);
 
         if ($result) {
-            $this->addLogComment(
-                [
-                    __(
-                        'Checked rows: %1, checked entities: %2, invalid rows: %3, total errors: %4',
-                        $this->getProcessedRowsCount(),
-                        $this->getProcessedEntitiesCount(),
-                        $this->getErrorAggregator()->getInvalidRowsCount(),
-                        $this->getErrorAggregator()->getErrorsCount()
-                    ),
-                    __('The import was successful.'),
-                ]
-            );
+            $logComments = [
+                __(
+                    'Checked rows: %1, checked entities: %2, invalid rows: %3, total errors: %4',
+                    $this->getProcessedRowsCount(),
+                    $this->getProcessedEntitiesCount(),
+                    $this->getErrorAggregator()->getInvalidRowsCount(),
+                    $this->getErrorAggregator()->getErrorsCount()
+                )
+            ];
+            foreach ($this->getErrorAggregator()->getAllErrors() as $error) {
+                $logComments[] = $error->getErrorMessage();
+            }
+            $logComments[] = $this->getForceImport() == '0' && $this->getErrorAggregator()->getErrorsCount() > 0 ?
+                __('The import was not successful.') : __('The import was successful.');
+            $this->addLogComment($logComments);
             $this->importHistoryModel->updateReport($this, true);
         } else {
             $this->importHistoryModel->invalidateReport($this);
@@ -580,6 +577,25 @@ private function importSourceCallback()
         return $result;
     }
 
+    /**
+     * Get entity import ids
+     *
+     * @return array
+     * @throws LocalizedException
+     */
+    private function getImportIds(): array
+    {
+        $ids = $this->_getEntityAdapter()->getIds();
+        if (empty($ids)) {
+            $idsFromPostData = $this->getData(self::FIELD_IMPORT_IDS);
+            if (null !== $idsFromPostData && '' !== $idsFromPostData) {
+                $ids = explode(",", $idsFromPostData);
+            }
+        }
+
+        return $ids;
+    }
+
     /**
      * Process import.
      *

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

@@ -276,6 +276,7 @@ protected function setUp(): void
                     '_getEntityAdapter'
                 ]
             )
+            ->addMethods(['getForceImport'])
             ->getMock();
         $this->setPropertyValue($this->import, '_varDirectory', $this->_varDirectory);
     }
@@ -321,6 +322,8 @@ public function testImportSource()
         $this->import->expects($this->any())
             ->method('_getEntityAdapter')
             ->willReturn($this->_entityAdapter);
+        $this->import->expects($this->once())
+            ->method('getForceImport');
         $this->_importConfig
             ->expects($this->any())
             ->method('getEntities')

app/code/Magento/ImportExport/i18n/en_US.csv

@@ -82,6 +82,7 @@ Status,Status
 "This file does not contain any data.","This file does not contain any data."
 "Begin import of ""%1"" with ""%2"" behavior","Begin import of ""%1"" with ""%2"" behavior"
 "The import was successful.","The import was successful."
+"The import was not successful.","The import was not successful."
 "The file you uploaded has no extension.","The file you uploaded has no extension."
 "The source file moving process failed.","The source file moving process failed."
 "Begin data validation","Begin data validation"

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ImportWithNotExistImagesTest.php

@@ -222,9 +222,6 @@ private function assertImportErrors(): void
             RowValidatorInterface::ERROR_MEDIA_URL_NOT_ACCESSIBLE,
             $importError->getErrorCode()
         );
-        $errorMsg = (string)__('Imported resource (image) could not be downloaded ' .
-            'from external resource due to timeout or access permissions');
-        $this->assertEquals($errorMsg, $importError->getErrorMessage());
     }
 
     /**