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

- improved solution

Author: aplapana

app/code/Magento/CatalogUrlRewrite/Model/Products/AppendUrlRewritesToProducts.php

@@ -118,18 +118,6 @@ public function getProductUrlRewrites(ProductInterface $product, array $stores):
         return $urls;
     }
 
-    /**
-     * Replaces given product URL rewrites
-     *
-     * @param array $rewrites
-     * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
-     * @throws UrlAlreadyExistsException
-     */
-    public function saveProductUrlRewrites(array $rewrites)
-    {
-        return $this->urlPersist->replace($rewrites);
-    }
-
     /**
      * Generate urls for specific store
      *

app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Products/AppendUrlRewritesToProductsTest.php

@@ -67,17 +67,6 @@ protected function setUp(): void
         parent::setUp();
     }
 
-    /**
-     * @return void
-     * @throws \Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException
-     */
-    public function testSaveProductUrlRewrites(): void
-    {
-        $rewrites = ['test'];
-        $this->urlPersist->expects($this->once())->method('replace')->with($rewrites);
-        $this->append->saveProductUrlRewrites($rewrites);
-    }
-
     /**
      * @return void
      * @throws \Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException

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

@@ -118,6 +118,18 @@ protected function generateTargetPath($model)
             ])) {
                 $targetPath = $rewrite->getRequestPath();
             } else {
+                $check = $model->getEntityType() === self::ENTITY_TYPE_PRODUCT ?
+                    $this->_getProduct()->canBeShowInCategory($this->_getCategory()->getId()) &&
+                    in_array($model->getStoreId(), $this->_getProduct()->getStoreIds()) :
+                    $this->_getCategory()->getStoreId() == $model->getStoreId();
+                if (false === $check) {
+                    throw new LocalizedException(
+                        $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.")
+                    );
+                }
+
                 if ($model->getEntityType() === self::ENTITY_TYPE_PRODUCT) {
                     $productRewrites = $this->productAppendRewrites->getProductUrlRewrites(
                         $this->_getProduct(),
@@ -126,22 +138,21 @@ protected function generateTargetPath($model)
                     $productRewrites = array_merge(...$productRewrites);
                     /** @var UrlRewrite $rewrite */
                     foreach ($productRewrites as $rewrite) {
-                        if ($rewrite->getTargetPath() == $model->getTargetPath()) {
-                            $targetPath = $rewrite->getRequestPath();
-                        } else {
-                            $this->missingRewrites[] = $rewrite;
+                        if ($rewrite->getRequestPath() != $model->getRequestPath()) {
+                            $missingRewrite = $this->_objectManager->create(\Magento\UrlRewrite\Model\UrlRewrite::class);
+                            $missingRewrite->setEntityType(self::ENTITY_TYPE_PRODUCT)
+                                ->setRequestPath($rewrite->getRequestPath())
+                                ->setTargetPath($rewrite->getTargetPath())
+                                ->setRedirectType($rewrite->getRedirectType())
+                                ->setStoreId($rewrite->getStoreId())
+                                ->setDescription($rewrite->getDescription())
+                                ->setMetadata($rewrite->getMetadata());
+                            $this->missingRewrites[] = $missingRewrite;
+                            if ($rewrite->getTargetPath() == $targetPath) {
+                                $targetPath = $rewrite->getRequestPath();
+                            }
                         }
                     }
-                    if (!$targetPath) {
-                        throw new LocalizedException(
-                            __(
-                                "The selected product isn't associated with the selected store or category."
-                            )
-                        );
-                    }
-                } else {
-                    throw new
-                    LocalizedException(__("The selected category isn't associated with the selected store."));
                 }
             }
         }
@@ -215,8 +226,11 @@ public function execute()
                 $this->_handleCatalogUrlRewrite($model);
                 $model->save();
                 if (!empty($this->missingRewrites)) {
-                    $this->productAppendRewrites->saveProductUrlRewrites($this->missingRewrites);
+                    foreach ($this->missingRewrites as $missingRewrite) {
+                        $missingRewrite->save();
+                    }
                 }
+
                 $this->messageManager->addSuccess(__('The URL Rewrite has been saved.'));
                 $this->_redirect('adminhtml/*/');
                 return;