ENGCOM-8996: Make sure all 301 url redirects get generated when importing more the… #32640

 - Merge Pull Request #32640 from hostep/magento2:fix-for-issue-29520
 - Merged commits:
   1. 7ac4da7
   2. e792abc
   3. b6bfb66

Author: magento-engcom-team

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

@@ -475,17 +475,18 @@ private function currentUrlRewritesRegenerate()
             ]
         );
 
-        $urlRewrites = [];
+        $mergeDataProvider = clone $this->mergeDataProviderPrototype;
         foreach ($currentUrlRewrites as $currentUrlRewrite) {
             $category = $this->retrieveCategoryFromMetadata($currentUrlRewrite);
             if ($category === false) {
                 continue;
             }
-            $url = $currentUrlRewrite->getIsAutogenerated()
+            $urls = $currentUrlRewrite->getIsAutogenerated()
                 ? $this->generateForAutogenerated($currentUrlRewrite, $category)
                 : $this->generateForCustom($currentUrlRewrite, $category);
-            $urlRewrites = $url + $urlRewrites;
+            $mergeDataProvider->merge($urls);
         }
+        $urlRewrites = $mergeDataProvider->getData();
 
         $this->product = null;
         $this->productCategories = null;

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteTest.php

@@ -13,10 +13,16 @@
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ProductFactory;
 use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
+use Magento\CatalogImportExport\Model\Import\Product;
 use Magento\CatalogUrlRewrite\Model\Map\DataProductUrlRewriteDatabaseMap;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\ImportExport\Model\Import;
+use Magento\ImportExport\Model\Import\Source\Csv;
 use Magento\Store\Model\ScopeInterface;
 use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
 use Magento\UrlRewrite\Model\OptionProvider;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class for product url rewrites tests
@@ -275,6 +281,77 @@ public function testProductUrlRewritePerStoreViews(): void
         }
     }
 
+    /**
+     * Check if redirects are generated correctly while product urls are changed during import process.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     */
+    public function testImportProductRewrites()
+    {
+        $data = [
+            ['sku' => 'simple1', 'request_path' => 'simple-product1', 'target_path' => 'product-1-updated'],
+            ['sku' => 'simple2', 'request_path' => 'simple-product2', 'target_path' => 'product-2-updated'],
+            ['sku' => 'simple3', 'request_path' => 'simple-product3', 'target_path' => 'product-3-updated'],
+        ];
+
+        $logger = $this->getMockBuilder(LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $productImport = $this->objectManager->create(
+            Product::class,
+            ['logger' => $logger]
+        );
+        $filesystem = $this->objectManager->get(Filesystem::class);
+
+        foreach ($data as $datum) {
+            $this->assertEquals(
+                $datum['request_path'],
+                $this->productRepository->get($datum['sku'], false, null, true)->getUrlKey()
+            );
+        }
+
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $source = $this->objectManager->create(
+            Csv::class,
+            [
+                'file' => __DIR__ . '/../_files/products_to_import_with_rewrites.csv',
+                'directory' => $directory
+            ]
+        );
+        $errors = $productImport->setParameters(
+            ['behavior' => Import::BEHAVIOR_APPEND, 'entity' => 'catalog_product']
+        )->setSource(
+            $source
+        )->validateData();
+        $this->assertTrue($errors->getErrorsCount() === 0);
+        $productImport->importData();
+
+        foreach ($data as $datum) {
+            $product = $this->productRepository->get($datum['sku'], false, null, true);
+            $this->assertEquals(
+                $datum['target_path'],
+                $product->getUrlKey()
+            );
+
+            $productUrlRewriteCollection = $this->getEntityRewriteCollection($product->getId());
+            $rewriteExists = false;
+            foreach ($productUrlRewriteCollection as $item) {
+                if (
+                    $item->getTargetPath() === $datum['target_path'] . $this->suffix &&
+                    $item->getRequestPath() === $datum['request_path'] . $this->suffix
+                ) {
+                    $rewriteExists = true;
+                    break;
+                }
+
+            }
+
+            $this->assertTrue($rewriteExists);
+        }
+    }
+
     /**
      * Save product with data using resource model directly
      *

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/products_to_import_with_rewrites.csv

@@ -0,0 +1,4 @@
+sku,product_type,store_view_code,name,price,attribute_set_code,categories,product_websites,url_key,save_rewrites_history
+simple1,simple,,"simple 1",25,Default,"Default Category/Category 1",base,product-1-updated,1
+simple2,simple,,"simple 2",34,Default,"Default Category/Category 1",base,product-2-updated,1
+simple3,simple,,"simple 3",58,Default,"Default Category/Category 1",base,product-3-updated,1