Merge remote-tracking branch 'tango/MAGETWO-99927' into pr_23_shtdwn

Author: Oleksandr Dubovyk

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

@@ -38,6 +38,7 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @since 100.0.2
  */
 class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
@@ -1508,6 +1509,7 @@ public function getImagesFromRow(array $rowData)
  * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
  * @SuppressWarnings(PHPMD.UnusedLocalVariable)
  * @throws LocalizedException
+ * phpcs:disable Generic.Metrics.NestingLevel
  */
  protected function _saveProducts()
  {
@@ -2487,6 +2489,12 @@ public function validateRow(array $rowData, $rowNum)
  */
  private function isNeedToValidateUrlKey($rowData)
  {
+ if (!empty($rowData[self::COL_SKU]) && empty($rowData[self::URL_KEY])
+ && $this->getBehavior() === Import::BEHAVIOR_APPEND
+ && $this->isSkuExist($rowData[self::COL_SKU])) {
+ return false;
+ }
+
  return (!empty($rowData[self::URL_KEY]) || !empty($rowData[self::COL_NAME]))
  && (empty($rowData[self::COL_VISIBILITY])
  || $rowData[self::COL_VISIBILITY]
@@ -2810,7 +2818,8 @@ protected function getUrlKey($rowData)
  return trim(strtolower($urlKey));
  }
 
- if (!empty($rowData[self::COL_NAME])) {
+ if (!empty($rowData[self::COL_NAME])
+ && (array_key_exists(self::URL_KEY, $rowData) || !$this->isSkuExist($rowData[self::COL_SKU]))) {
  return $this->productUrl->formatUrlKey($rowData[self::COL_NAME]);
  }
 

app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php

@@ -255,11 +255,8 @@ public function execute(Observer $observer)
  protected function _populateForUrlGeneration($rowData)
  {
  $newSku = $this->import->getNewSku($rowData[ImportProduct::COL_SKU]);
- if (empty($newSku) || !isset($newSku['entity_id'])) {
- return null;
- }
- if ($this->import->getRowScope($rowData) == ImportProduct::SCOPE_STORE
- && empty($rowData[self::URL_KEY_ATTRIBUTE_CODE])) {
+ $oldSku = $this->import->getOldSku();
+ if (!$this->isNeedToPopulateForUrlGeneration($rowData, $newSku, $oldSku)) {
  return null;
  }
  $rowData['entity_id'] = $newSku['entity_id'];
@@ -292,6 +289,27 @@ protected function _populateForUrlGeneration($rowData)
  return $this;
  }
 
+ /**
+ * Check is need to populate data for url generation
+ *
+ * @param array $rowData
+ * @param array $newSku
+ * @param array $oldSku
+ * @return bool
+ */
+ private function isNeedToPopulateForUrlGeneration($rowData, $newSku, $oldSku): bool
+ {
+ if ((empty($newSku) || !isset($newSku['entity_id']))
+ || ($this->import->getRowScope($rowData) == ImportProduct::SCOPE_STORE
+ && empty($rowData[self::URL_KEY_ATTRIBUTE_CODE]))
+ || (array_key_exists($rowData[ImportProduct::COL_SKU], $oldSku)
+ && !isset($rowData[self::URL_KEY_ATTRIBUTE_CODE])
+ && $this->import->getBehavior() === ImportExport::BEHAVIOR_APPEND)) {
+ return false;
+ }
+ return true;
+ }
+
  /**
  * Add store id to product data.
  *

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

@@ -26,6 +26,7 @@
 use Magento\ImportExport\Model\Import;
 use Magento\Store\Model\Store;
 use Psr\Log\LoggerInterface;
+use Magento\ImportExport\Model\Import\Source\Csv;
 
 /**
  * Class ProductTest
@@ -36,6 +37,7 @@
  * @magentoDataFixtureBeforeTransaction Magento/Catalog/_files/enable_catalog_product_reindex_schedule.php
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * phpcs:disable Generic.PHP.NoSilencedErrors, Generic.Metrics.NestingLevel, Magento2.Functions.StaticFunction
  */
 class ProductTest extends \Magento\TestFramework\Indexer\TestCase
@@ -1645,6 +1647,35 @@ public function testImportWithNonExistingImage()
  }
  }
 
+ /**
+ * @magentoDataFixture Magento/Catalog/_files/product_simple_with_url_key.php
+ * @magentoDbIsolation enabled
+ * @magentoAppIsolation enabled
+ */
+ public function testImportWithoutChangingUrlKeys()
+ {
+ $filesystem = $this->objectManager->create(Filesystem::class);
+ $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+ $source = $this->objectManager->create(
+ Csv::class,
+ [
+ 'file' => __DIR__ . '/_files/products_to_import_without_url_key_column.csv',
+ 'directory' => $directory
+ ]
+ );
+
+ $errors = $this->_model->setParameters(
+ ['behavior' => Import::BEHAVIOR_APPEND, 'entity' => 'catalog_product']
+ )
+ ->setSource($source)
+ ->validateData();
+
+ $this->assertTrue($errors->getErrorsCount() == 0);
+ $this->_model->importData();
+ $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+ $this->assertEquals('url-key', $productRepository->get('simple1')->getUrlKey());
+ }
+
  /**
  * @magentoDataFixture Magento/Catalog/_files/product_simple_with_url_key.php
  * @magentoDbIsolation disabled
@@ -2170,7 +2201,6 @@ public function testImportWithFilesystemImages()
  * @magentoDataFixture Magento/Catalog/_files/attribute_set_with_renamed_group.php
  * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
  * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
- *
  */
  public function testImportDataChangeAttributeSet()
  {
@@ -2188,7 +2218,7 @@ public function testImportDataChangeAttributeSet()
  );
  $errors = $this->_model->setParameters(
  [
- 'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_ADD_UPDATE,
+ 'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
  'entity' => \Magento\Catalog\Model\Product::ENTITY
  ]
  )->setSource(

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_without_url_key_column.csv

@@ -0,0 +1,2 @@
+sku,product_type,store_view_code,name,price,attribute_set_code
+simple1,simple,,"simple 1",25,Default