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

- refactored solution

Author: aplapana

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

@@ -99,8 +99,9 @@ protected function getTargetPath($model)
             if (!$rewrite) {
                 $model->getEntityType() === self::ENTITY_TYPE_PRODUCT ? $this->checkProductCorrelation($model) :
                     $this->checkCategoryCorrelation($model);
+            } else {
+                $targetPath = $rewrite->getRequestPath();
             }
-            $targetPath = $rewrite->getRequestPath();
         }
         return $targetPath;
     }
@@ -114,7 +115,7 @@ protected function getTargetPath($model)
      */
     private function checkCategoryCorrelation(\Magento\UrlRewrite\Model\UrlRewrite $model): void
     {
-        if (false === ($this->_getCategory()->getStoreId() == $model->getStoreId())) {
+        if (false === in_array($model->getStoreId(), $this->_getCategory()->getStoreIds())) {
             throw new LocalizedException(
                 __("The selected category isn't associated with the selected store.")
             );