ACP2E-1304: Category Product URL is not redirecting to SEO friendly url / SEO friendly url does not exist

Author: Anna Bukatar

app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php

@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\Product;
 use Magento\CatalogUrlRewrite\Model\Product\AnchorUrlRewriteGenerator;
@@ -78,6 +79,11 @@ class ProductScopeRewriteGenerator
      */
     private $categoryRepository;
 
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
     /**
      * @param StoreViewService $storeViewService
      * @param StoreManagerInterface $storeManager
@@ -89,6 +95,7 @@ class ProductScopeRewriteGenerator
      * @param \Magento\UrlRewrite\Model\MergeDataProviderFactory|null $mergeDataProviderFactory
      * @param CategoryRepositoryInterface|null $categoryRepository
      * @param ScopeConfigInterface|null $config
+     * @param ProductRepositoryInterface|null $productRepository
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -101,7 +108,8 @@ public function __construct(
         AnchorUrlRewriteGenerator $anchorUrlRewriteGenerator,
         MergeDataProviderFactory $mergeDataProviderFactory = null,
         CategoryRepositoryInterface $categoryRepository = null,
-        ScopeConfigInterface $config = null
+        ScopeConfigInterface $config = null,
+        ProductRepositoryInterface $productRepository = null
     ) {
         $this->storeViewService = $storeViewService;
         $this->storeManager = $storeManager;
@@ -117,6 +125,8 @@ public function __construct(
         $this->categoryRepository = $categoryRepository ?:
             ObjectManager::getInstance()->get(CategoryRepositoryInterface::class);
         $this->config = $config ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
+        $this->productRepository = $productRepository ?:
+            ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
     }
 
     /**
@@ -144,15 +154,21 @@ public function generateForGlobalScope($productCategories, Product $product, $ro
         $mergeDataProvider = clone $this->mergeDataProviderPrototype;
 
         foreach ($product->getStoreIds() as $id) {
-            if (!$this->isGlobalScope($id) &&
-                !$this->storeViewService->doesEntityHaveOverriddenUrlKeyForStore(
+            if (!$this->isGlobalScope($id)) {
+                if (!$this->storeViewService->doesEntityHaveOverriddenUrlKeyForStore(
                     $id,
                     $productId,
                     Product::ENTITY
                 )) {
-                $mergeDataProvider->merge(
-                    $this->generateForSpecificStoreView($id, $productCategories, $product, $rootCategoryId)
-                );
+                    $mergeDataProvider->merge(
+                        $this->generateForSpecificStoreView($id, $productCategories, $product, $rootCategoryId)
+                    );
+                } else {
+                    $scopedProduct = $this->productRepository->getById($productId, false, $id);
+                    $mergeDataProvider->merge(
+                        $this->generateForSpecificStoreView($id, $productCategories, $scopedProduct, $rootCategoryId)
+                    );
+                }
             }
         }
 

app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductScopeRewriteGeneratorTest.php

@@ -8,6 +8,7 @@
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model;
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\Product;
 use Magento\CatalogUrlRewrite\Model\ObjectRegistry;
@@ -73,6 +74,9 @@ class ProductScopeRewriteGeneratorTest extends TestCase
     /** @var CategoryRepositoryInterface|MockObject */
     private $categoryRepositoryMock;
 
+    /** @var ProductRepositoryInterface|MockObject */
+    private $productRepositoryMock;
+
     protected function setUp(): void
     {
         $this->serializer = $this->createMock(Json::class);
@@ -131,6 +135,7 @@ function ($value) {
             ->getMock();
 
         $this->categoryRepositoryMock = $this->getMockForAbstractClass(CategoryRepositoryInterface::class);
+        $this->productRepositoryMock = $this->getMockForAbstractClass(ProductRepositoryInterface::class);
 
         $this->productScopeGenerator = (new ObjectManager($this))->getObject(
             ProductScopeRewriteGenerator::class,
@@ -144,7 +149,8 @@ function ($value) {
                 'storeManager' => $this->storeManager,
                 'mergeDataProviderFactory' => $mergeDataProviderFactory,
                 'config' => $this->configMock,
-                'categoryRepository' => $this->categoryRepositoryMock
+                'categoryRepository' => $this->categoryRepositoryMock,
+                'productRepository' =>$this->productRepositoryMock
             ]
         );
         $this->categoryMock = $this->getMockBuilder(Category::class)
@@ -161,7 +167,7 @@ public function testGenerationForGlobalScope()
         $product->expects($this->any())->method('getStoreId')->willReturn(null);
         $product->expects($this->any())->method('getStoreIds')->willReturn([1]);
         $this->storeViewService->expects($this->once())->method('doesEntityHaveOverriddenUrlKeyForStore')
-            ->willReturn(false);
+            ->willReturn(true);
         $this->initObjectRegistryFactory([]);
         $canonical = new UrlRewrite([], $this->serializer);
         $canonical->setRequestPath('category-1')
@@ -185,6 +191,7 @@ public function testGenerationForGlobalScope()
             ->setStoreId(4);
         $this->anchorUrlRewriteGenerator->expects($this->any())->method('generate')
             ->willReturn([$anchorCategories]);
+        $this->productRepositoryMock->expects($this->once())->method('getById')->willReturn($product);
 
         $this->assertEquals(
             [
@@ -230,19 +237,6 @@ public function testGenerationForSpecificStore()
         );
     }
 
-    /**
-     * Test method
-     */
-    public function testSkipGenerationForGlobalScope()
-    {
-        $product = $this->createMock(Product::class);
-        $product->expects($this->any())->method('getStoreIds')->willReturn([1, 2]);
-        $this->storeViewService->expects($this->exactly(2))->method('doesEntityHaveOverriddenUrlKeyForStore')
-            ->willReturn(true);
-
-        $this->assertEquals([], $this->productScopeGenerator->generateForGlobalScope([], $product, 1));
-    }
-
     /**
      * @param array $entities
      */