ACP2E-1754: Store level URL rewrites are removed after product import

Author: o-iegorov

app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php

@@ -467,15 +467,8 @@ private function canonicalUrlRewriteGenerate(array $products)
                     $targetPath = $this->productUrlPathGenerator->getCanonicalUrlPath($product);
                     if ((int) $storeId !== (int) $product->getStoreId()
                         && $this->isGlobalScope($product->getStoreId())) {
-                        if ($this->cachedValues === null) {
-                            $this->cachedValues = $this->getScopeBasedUrlKeyValues($products);
-                        }
-                        if (!empty($this->cachedValues) && isset($this->cachedValues[$productId][$storeId])) {
-                            $storeProduct = clone $product;
-                            $storeProduct->setStoreId($storeId);
-                            $storeProduct->setUrlKey($this->cachedValues[$productId][$storeId]);
-                            $reqPath = $this->productUrlPathGenerator->getUrlPathWithSuffix($storeProduct, $storeId);
-                        }
+                        $this->initializeCacheForProducts($products);
+                        $reqPath = $this->getReqPath((int)$productId, (int)$storeId, $product);
                     }
                     $urls[] = $this->urlRewriteFactory->create()
                         ->setEntityType(ProductUrlRewriteGenerator::ENTITY_TYPE)
@@ -489,6 +482,40 @@ private function canonicalUrlRewriteGenerate(array $products)
         return $urls;
     }
 
+    /**
+     * Initialization for cache with scop based values
+     *
+     * @param array $products
+     * @return void
+     */
+    private function initializeCacheForProducts(array $products) : void
+    {
+        if ($this->cachedValues === null) {
+            $this->cachedValues = $this->getScopeBasedUrlKeyValues($products);
+        }
+    }
+
+    /**
+     * Get request path for the selected scope
+     *
+     * @param int $productId
+     * @param int $storeId
+     * @param Product $product
+     * @pram Category|null $category
+     * @return string
+     */
+    private function getReqPath(int $productId, int $storeId, Product $product, ?Category $category = null) : string
+    {
+        $reqPath = $this->productUrlPathGenerator->getUrlPathWithSuffix($product, $storeId, $category);
+        if (!empty($this->cachedValues) && isset($this->cachedValues[$productId][$storeId])) {
+            $storeProduct = clone $product;
+            $storeProduct->setStoreId($storeId);
+            $storeProduct->setUrlKey($this->cachedValues[$productId][$storeId]);
+            $reqPath = $this->productUrlPathGenerator->getUrlPathWithSuffix($storeProduct, $storeId, $category);
+        }
+        return $reqPath;
+    }
+
     /**
      * Get url key attribute values for the specified scope
      *
@@ -541,19 +568,8 @@ private function categoriesUrlRewriteGenerate(array $products): array
                     $targetPath = $this->productUrlPathGenerator->getCanonicalUrlPath($product, $category);
                     if ((int) $storeId !== (int) $product->getStoreId()
                         && $this->isGlobalScope($product->getStoreId())) {
-                        if ($this->cachedValues === null) {
-                            $this->cachedValues = $this->getScopeBasedUrlKeyValues($products);
-                        }
-                        if (!empty($this->cachedValues) && isset($this->cachedValues[$productId][$storeId])) {
-                            $storeProduct = clone $product;
-                            $storeProduct->setStoreId($storeId);
-                            $storeProduct->setUrlKey($this->cachedValues[$productId][$storeId]);
-                            $requestPath = $this->productUrlPathGenerator->getUrlPathWithSuffix(
-                                $storeProduct,
-                                $storeId,
-                                $category
-                            );
-                        }
+                        $this->initializeCacheForProducts($products);
+                        $requestPath = $this->getReqPath($productId, $storeId, $product, $category);
                     }
                     $urls[] = [
                             $this->urlRewriteFactory->create()
@@ -662,9 +678,7 @@ private function generateForCustom(UrlRewrite $url, ?Category $category, array $
                 : $url->getTargetPath();
             if ((int) $storeId !== (int) $product->getStoreId()
                 && $this->isGlobalScope($product->getStoreId())) {
-                if ($this->cachedValues === null) {
-                    $this->cachedValues = $this->getScopeBasedUrlKeyValues($products);
-                }
+                $this->initializeCacheForProducts($products);
                 if (!empty($this->cachedValues) && isset($this->cachedValues[$productId][$storeId])) {
                     $storeProduct = clone $product;
                     $storeProduct->setStoreId($storeId);