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

- addressed static issues

Author: aplapana

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

@@ -66,7 +66,7 @@ public function __construct(
         \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator,
         \Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator      $cmsPageUrlPathGenerator,
         UrlFinderInterface                                        $urlFinder,
-        ?AppendUrlRewritesToProducts                               $productAppendRewrites = null
+        ?AppendUrlRewritesToProducts                              $productAppendRewrites = null
     ) {
         parent::__construct($context);
         $this->productUrlPathGenerator = $productUrlPathGenerator;
@@ -82,7 +82,7 @@ public function __construct(
      *
      * @param \Magento\UrlRewrite\Model\UrlRewrite $model
      * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     protected function _handleCatalogUrlRewrite($model)
     {
@@ -96,17 +96,17 @@ protected function _handleCatalogUrlRewrite($model)
                     $model->setMetadata(['category_id' => $categoryId]);
                 }
             }
-            $this->generateTargetPath($model);
+            $model->setTargetPath($this->generateTargetPath($model));
         }
     }
 
     /**
      * Generate Target Path
      *
      * @param \Magento\UrlRewrite\Model\UrlRewrite $model
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
-    protected function generateTargetPath($model)
+    protected function generateTargetPath($model): ?string
     {
         $targetPath = $this->getCanonicalTargetPath();
         if ($model->getRedirectType() && !$model->getIsAutogenerated()) {
@@ -118,46 +118,109 @@ 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.")
-                    );
-                }
-
+                $this->checkEntityAssociations($model);
                 if ($model->getEntityType() === self::ENTITY_TYPE_PRODUCT) {
                     $productRewrites = $this->productAppendRewrites->getProductUrlRewrites(
                         $this->_getProduct(),
                         [$this->getRequest()->getParam('store_id', 0)]
                     );
                     $productRewrites = array_merge(...$productRewrites);
-                    /** @var UrlRewrite $rewrite */
-                    foreach ($productRewrites as $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();
-                            }
-                        }
-                    }
+                    $targetPath = $this->getAdjustedTargetPath($model, $productRewrites, $targetPath);
+                    $this->setMissingRewrites($model, $productRewrites);
+                }
+            }
+        }
+
+        return $targetPath;
+    }
+
+    /**
+     * Checks for missing product rewrites
+     *
+     * @param \Magento\UrlRewrite\Model\UrlRewrite $model
+     * @param array $rewrites
+     * @return void
+     */
+    private function setMissingRewrites(\Magento\UrlRewrite\Model\UrlRewrite $model, array $rewrites): void
+    {
+        if (!empty($rewrites)) {
+            foreach ($rewrites as $rewrite) {
+                if ($rewrite->getRequestPath() != $model->getRequestPath()) {
+                    $this->missingRewrites[] = $this->generateRewriteModel($rewrite);
                 }
             }
         }
+    }
 
-        $model->setTargetPath($targetPath);
+    /**
+     * Checks for potential target path adjustments
+     *
+     * @param \Magento\UrlRewrite\Model\UrlRewrite $model
+     * @param array $productRewrites
+     * @param string $canonicalTargetPath
+     * @return string|null
+     */
+    private function getAdjustedTargetPath(
+        \Magento\UrlRewrite\Model\UrlRewrite $model,
+        array                                $productRewrites,
+        string                               $canonicalTargetPath
+    ): ?string {
+        if (empty($productRewrites)) {
+            return null;
+        }
+
+        foreach ($productRewrites as $rewrite) {
+            if ($rewrite->getRequestPath() != $model->getRequestPath()) {
+                $this->missingRewrites[] = $this->generateRewriteModel($rewrite);
+                if ($rewrite->getTargetPath() == $canonicalTargetPath) {
+                    return $rewrite->getRequestPath();
+                }
+            }
+        }
+
+        return $canonicalTargetPath;
+    }
+
+    /**
+     * Generates rewrite model
+     *
+     * @param UrlRewrite $rewrite
+     * @return \Magento\UrlRewrite\Model\UrlRewrite
+     */
+    private function generateRewriteModel(UrlRewrite $rewrite): \Magento\UrlRewrite\Model\UrlRewrite
+    {
+        $rewriteModel = $this->_objectManager->create(\Magento\UrlRewrite\Model\UrlRewrite::class);
+        $rewriteModel->setEntityType(self::ENTITY_TYPE_PRODUCT)
+            ->setRequestPath($rewrite->getRequestPath())
+            ->setTargetPath($rewrite->getTargetPath())
+            ->setRedirectType($rewrite->getRedirectType())
+            ->setStoreId($rewrite->getStoreId())
+            ->setDescription($rewrite->getDescription())
+            ->setMetadata($rewrite->getMetadata());
+
+        return $rewriteModel;
+    }
+
+    /**
+     * Checks if rewrite can be created for product or category
+     *
+     * @param \Magento\UrlRewrite\Model\UrlRewrite $model
+     * @return void
+     * @throws LocalizedException
+     */
+    private function checkEntityAssociations(\Magento\UrlRewrite\Model\UrlRewrite $model): void
+    {
+        $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.")
+            );
+        }
     }
 
     /**