ACP2E-3900: Update product url_key via REST API does not generate a 301 URL Rewrite

- moved functionality into the correct module

Author: o-rykh

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -14,7 +14,6 @@
 use Magento\Catalog\Model\Product\Gallery\MimeTypeExtensionMap;
 use Magento\Catalog\Model\ProductRepository\MediaGalleryProcessor;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
-use Magento\CatalogUrlRewrite\Block\UrlKeyRenderer;
 use Magento\Eav\Model\Entity\Attribute\Exception as AttributeException;
 use Magento\Framework\Api\Data\ImageContentInterfaceFactory;
 use Magento\Framework\Api\ImageContentValidatorInterface;
@@ -34,7 +33,6 @@
 use Magento\Framework\Exception\TemporaryState\CouldNotSaveException as TemporaryCouldNotSaveException;
 use Magento\Framework\Exception\ValidatorException;
 use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
-use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
 use Magento\Catalog\Api\Data\EavAttributeInterface;
 
@@ -190,11 +188,6 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
      */
     private $scopeOverriddenValue;
 
-    /**
-     * @var ScopeConfigInterface
-     */
-    private ScopeConfigInterface $scopeConfig;
-
     /**
      * ProductRepository constructor.
      * @param ProductFactory $productFactory
@@ -251,8 +244,7 @@ public function __construct(
         $cacheLimit = 1000,
         ?ReadExtensions $readExtensions = null,
         ?CategoryLinkManagementInterface $linkManagement = null,
-        ?ScopeOverriddenValue $scopeOverriddenValue = null,
-        ?ScopeConfigInterface $scopeConfig = null
+        ?ScopeOverriddenValue $scopeOverriddenValue = null
     ) {
         $this->productFactory = $productFactory;
         $this->collectionFactory = $collectionFactory;
@@ -280,8 +272,6 @@ public function __construct(
             ->get(CategoryLinkManagementInterface::class);
         $this->scopeOverriddenValue = $scopeOverriddenValue ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(ScopeOverriddenValue::class);
-        $this->scopeConfig = $scopeConfig ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(ScopeConfigInterface::class);
     }
 
     /**
@@ -661,14 +651,6 @@ public function save(ProductInterface $product, $saveOptions = false)
             }
         }
 
-        $isSaveHistory = $this->scopeConfig->isSetFlag(
-            UrlKeyRenderer::XML_PATH_SEO_SAVE_HISTORY,
-            ScopeInterface::SCOPE_STORE,
-            $productDataArray['store_id']
-        );
-
-        $product->setData('save_rewrites_history', $isSaveHistory);
-
         $this->saveProduct($product);
         if ($assignToCategories === true && $product->getCategoryIds()) {
             $this->linkManagement->assignProductToCategories(

app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php

@@ -384,15 +384,6 @@ public function testSaveForAllStoreViewScope(array $productData): void
                     return null;
                 }
             });
-        $this->product
-            ->method('setData')
-            ->willReturnCallback(function ($key, $value) {
-                if ($key !== 'save_rewrites_history') {
-                    return null;
-                }
-
-                $this->assertEquals(null, $value);
-            });
         $this->model->save($this->product);
     }
 

app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php

@@ -8,6 +8,7 @@
 use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\CategoryRepository;
 use Magento\Catalog\Model\Product;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 use Magento\UrlRewrite\Model\OptionProvider;
 use Magento\CatalogUrlRewrite\Model\ObjectRegistry;
@@ -18,6 +19,8 @@
 use Magento\CatalogUrlRewrite\Model\Map\UrlRewriteFinder;
 use Magento\Framework\App\ObjectManager;
 use Magento\UrlRewrite\Model\MergeDataProviderFactory;
+use Magento\CatalogUrlRewrite\Block\UrlKeyRenderer;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -72,6 +75,11 @@ class CurrentUrlRewritesRegenerator
      */
     private $categoryRepository;
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private ScopeConfigInterface $scopeConfig;
+
     /**
      * @param UrlFinderInterface $urlFinder
      * @param ProductUrlPathGenerator $productUrlPathGenerator
@@ -86,7 +94,8 @@ public function __construct(
         UrlRewriteFactory $urlRewriteFactory,
         ?UrlRewriteFinder $urlRewriteFinder = null,
         ?MergeDataProviderFactory $mergeDataProviderFactory = null,
-        ?CategoryRepository $categoryRepository = null
+        ?CategoryRepository $categoryRepository = null,
+        ?ScopeConfigInterface $scopeConfig = null
     ) {
         $this->urlFinder = $urlFinder;
         $this->productUrlPathGenerator = $productUrlPathGenerator;
@@ -98,6 +107,7 @@ public function __construct(
         }
         $this->categoryRepository = $categoryRepository ?: ObjectManager::getInstance()->get(CategoryRepository::class);
         $this->mergeDataProviderPrototype = $mergeDataProviderFactory->create();
+        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
     }
 
     /**
@@ -119,6 +129,14 @@ public function generate($storeId, Product $product, ObjectRegistry $productCate
             $rootCategoryId
         );
 
+        $isSaveHistory = $this->scopeConfig->isSetFlag(
+            UrlKeyRenderer::XML_PATH_SEO_SAVE_HISTORY,
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+
+        $product->setData('save_rewrites_history', $isSaveHistory);
+
         foreach ($currentUrlRewrites as $currentUrlRewrite) {
             $category = $this->retrieveCategoryFromMetadata($currentUrlRewrite, $productCategories);
             if ($category === false) {