Merge remote-tracking branch 'tango/MC-19213' into Chaika-PR-2019-08-29-2

Author: veloraven

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

@@ -299,12 +299,16 @@ protected function _populateForUrlGeneration($rowData)
      */
     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)) {
+        if ((
+            (empty($newSku) || !isset($newSku['entity_id']))
+                || ($this->import->getRowScope($rowData) == ImportProduct::SCOPE_STORE
+                    && empty($rowData[self::URL_KEY_ATTRIBUTE_CODE]))
+                || (array_key_exists(strtolower($rowData[ImportProduct::COL_SKU]), $oldSku)
+                    && !isset($rowData[self::URL_KEY_ATTRIBUTE_CODE])
+                    && $this->import->getBehavior() === ImportExport::BEHAVIOR_APPEND)
+            )
+            && !isset($rowData["categories"])
+        ) {
             return false;
         }
         return true;
@@ -477,7 +481,7 @@ protected function currentUrlRewritesRegenerate()
             $url = $currentUrlRewrite->getIsAutogenerated()
                 ? $this->generateForAutogenerated($currentUrlRewrite, $category)
                 : $this->generateForCustom($currentUrlRewrite, $category);
-            $urlRewrites = array_merge($urlRewrites, $url);
+            $urlRewrites = $url + $urlRewrites;
         }
 
         $this->product = null;

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

@@ -25,6 +25,7 @@
 use Magento\Framework\Registry;
 use Magento\ImportExport\Model\Import;
 use Magento\Store\Model\Store;
+use Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection;
 use Psr\Log\LoggerInterface;
 use Magento\ImportExport\Model\Import\Source\Csv;
 
@@ -626,7 +627,7 @@ function ($input) {
                         explode(',', $optionData)
                     )
                 );
-                // phpcs:ignore Magento2.Performance.ForeachArrayMerge.ForeachArrayMerge
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $option = array_merge(...$option);
 
                 if (!empty($option['type']) && !empty($option['name'])) {
@@ -693,14 +694,14 @@ protected function mergeWithExistingData(
                 }
             } else {
                 $existingOptionId = array_search($optionKey, $expectedOptions);
-                // phpcs:ignore Magento2.Performance.ForeachArrayMerge.ForeachArrayMerge
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $expectedData[$existingOptionId] = array_merge(
                     $this->getOptionData($option),
                     $expectedData[$existingOptionId]
                 );
                 if ($optionValues) {
                     foreach ($optionValues as $optionKey => $optionValue) {
-                        // phpcs:ignore Magento2.Performance.ForeachArrayMerge.ForeachArrayMerge
+                        // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                         $expectedValues[$existingOptionId][$optionKey] = array_merge(
                             $optionValue,
                             $expectedValues[$existingOptionId][$optionKey]
@@ -1710,6 +1711,63 @@ public function testImportWithNonExistingImage()
         }
     }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     */
+    public function testUpdateUrlRewritesOnImport()
+    {
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
+
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+
+        $source = $this->objectManager->create(
+            \Magento\ImportExport\Model\Import\Source\Csv::class,
+            [
+                'file' => __DIR__ . '/_files/products_to_import_with_category.csv',
+                'directory' => $directory
+            ]
+        );
+        $errors = $this->_model->setParameters(
+            [
+                'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
+                'entity' => \Magento\Catalog\Model\Product::ENTITY
+            ]
+        )->setSource(
+            $source
+        )->validateData();
+
+        $this->assertTrue($errors->getErrorsCount() == 0);
+
+        $this->_model->importData();
+
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $this->objectManager->create(\Magento\Catalog\Model\ProductRepository::class)->get('simple');
+
+        $repUrlRewriteCol = $this->objectManager->create(
+            UrlRewriteCollection::class
+        );
+
+        /** @var UrlRewriteCollection $collUrlRewrite */
+        $collUrlRewrite = $repUrlRewriteCol->addFieldToSelect(['request_path'])
+            ->addFieldToFilter('entity_id', ['eq'=> $product->getEntityId()])
+            ->addFieldToFilter('entity_type', ['eq'=> 'product'])
+            ->load();
+
+        $this->assertCount(2, $collUrlRewrite);
+
+        $this->assertEquals(
+            sprintf('%s.html', $product->getUrlKey()),
+            $collUrlRewrite->getFirstItem()->getRequestPath()
+        );
+
+        $this->assertContains(
+            sprintf('men/tops/%s.html', $product->getUrlKey()),
+            $collUrlRewrite->getLastItem()->getRequestPath()
+        );
+    }
+
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_simple_with_url_key.php
      * @magentoDbIsolation enabled

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

@@ -0,0 +1,2 @@
+sku,store_view_code,attribute_set_code,product_type,categories
+simple,default,Default,simple,Default Category/Men/Tops