ACP2E-1783: Unable to create 301/302 redirect for product with a category path when Generate "category/product" URL Rewrites set to Yes

- missing redirects are restored

Author: aplapana

app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Save.php

@@ -8,15 +8,18 @@
 namespace Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite;
 
 use Magento\Backend\App\Action\Context;
-use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
+use Magento\CatalogUrlRewrite\Model\Products\AppendUrlRewritesToProducts;
 use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
 use Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\UrlRewrite\Model\UrlFinderInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class Save extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite implements HttpPostActionInterface
 {
     /**
@@ -40,33 +43,33 @@ class Save extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite implemen
     protected $urlFinder;
 
     /**
-     * @var ProductRepositoryInterface
+     * @var AppendUrlRewritesToProducts
      */
-    protected ProductRepositoryInterface $productRepository;
+    protected AppendUrlRewritesToProducts $productAppendRewrites;
 
     /**
      * @param Context $context
      * @param ProductUrlPathGenerator $productUrlPathGenerator
      * @param CategoryUrlPathGenerator $categoryUrlPathGenerator
      * @param CmsPageUrlPathGenerator $cmsPageUrlPathGenerator
      * @param UrlFinderInterface $urlFinder
-     * @param ProductRepositoryInterface|null $productRepository
+     * @param AppendUrlRewritesToProducts|null $productAppendRewrites
      */
     public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator $productUrlPathGenerator,
+        \Magento\Backend\App\Action\Context                       $context,
+        \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator  $productUrlPathGenerator,
         \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator,
-        \Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator $cmsPageUrlPathGenerator,
-        UrlFinderInterface $urlFinder,
-        ProductRepositoryInterface $productRepository = null
+        \Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator      $cmsPageUrlPathGenerator,
+        UrlFinderInterface                                        $urlFinder,
+        AppendUrlRewritesToProducts                               $productAppendRewrites = null
     ) {
         parent::__construct($context);
         $this->productUrlPathGenerator = $productUrlPathGenerator;
         $this->categoryUrlPathGenerator = $categoryUrlPathGenerator;
         $this->cmsPageUrlPathGenerator = $cmsPageUrlPathGenerator;
         $this->urlFinder = $urlFinder;
-        $this->productRepository = $productRepository ?:
-            \Magento\Framework\App\ObjectManager::getInstance()->create(ProductRepositoryInterface::class);
+        $this->productAppendRewrites = $productAppendRewrites ?:
+            \Magento\Framework\App\ObjectManager::getInstance()->create(AppendUrlRewritesToProducts::class);
     }
 
     /**
@@ -88,18 +91,18 @@ protected function _handleCatalogUrlRewrite($model)
                     $model->setMetadata(['category_id' => $categoryId]);
                 }
             }
-            $model->setTargetPath($this->getTargetPath($model));
+            $model->setTargetPath($this->generateTargetPath($model));
         }
     }
 
     /**
-     * Get Target Path
+     * Generate Target Path
      *
      * @param \Magento\UrlRewrite\Model\UrlRewrite $model
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    protected function getTargetPath($model)
+    protected function generateTargetPath($model)
     {
         $targetPath = $this->getCanonicalTargetPath();
         if ($model->getRedirectType() && !$model->getIsAutogenerated()) {
@@ -111,14 +114,29 @@ protected function getTargetPath($model)
             ];
             $rewrite = $this->urlFinder->findOneByData($data);
             if (!$rewrite) {
-                $check = $model->getEntityType() === self::ENTITY_TYPE_PRODUCT ?
-                    $this->_getProduct()->canBeShowInCategory($this->_getCategory()->getId()) :
-                    $this->_getCategory()->getStoreId() == $model->getStoreId();
-                if (false === $check) {
-                    $message = $model->getEntityType() === self::ENTITY_TYPE_PRODUCT
-                        ? __("The selected product isn't associated with the selected store or category.")
-                        : __("The selected category isn't associated with the selected store.");
-                    throw new LocalizedException($message);
+                if ($model->getEntityType() === self::ENTITY_TYPE_PRODUCT) {
+                    $this->productAppendRewrites->execute(
+                        [$this->_getProduct()],
+                        [$this->getRequest()->getParam('store_id', 0)]
+                    );
+                    $rewrite = $this->urlFinder->findOneByData($data);
+                    if (!$rewrite) {
+                        throw new LocalizedException(
+                            __(
+                                "The selected product isn't associated with the selected store or category."
+                            )
+                        );
+                    }
+                    $targetPath = $rewrite->getRequestPath();
+                    if ($rewrite->getRequestPath() == $model->getRequestPath() &&
+                        $rewrite->getStoreId() == $model->getStoreId()) {
+                        $obsoleteRewrite = $this->_objectManager->create(\Magento\UrlRewrite\Model\UrlRewrite::class);
+                        $obsoleteRewrite->load($rewrite->getUrlRewriteId());
+                        $obsoleteRewrite->delete();
+                    }
+                } else {
+                    throw new
+                    LocalizedException(__("The selected category isn't associated with the selected store."));
                 }
             } else {
                 $targetPath = $rewrite->getRequestPath();