BUG - Prevent Magento from Creating incorrect URLs for category/products when Store View has modified URL keys

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

@@ -21,6 +21,9 @@
 
 /**
  * Class ProductScopeRewriteGenerator
+ *
+ * Generates Product/Category URLs for different scopes
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ProductScopeRewriteGenerator
@@ -174,7 +177,6 @@ public function generateForSpecificStoreView($storeId, $productCategories, Produ
                 continue;
             }
 
-            // category should be loaded per appropriate store if category's URL key has been changed
             $categories[] = $this->getCategoryWithOverriddenUrlKey($storeId, $category);
         }
 
@@ -252,9 +254,14 @@ private function getCategoryWithOverriddenUrlKey($storeId, Category $category)
             Category::ENTITY
         );
 
-        if (!$isUrlKeyOverridden) {
+        // Category should be loaded per appropriate store at all times. This is because whilst the URL key on the
+        // category in focus might be unchanged, parent category URL keys might be. If the category store ID
+        // and passed store ID are the same then return current category as it is correct but may have changed in memory
+
+        if (!$isUrlKeyOverridden && $storeId == $category->getStoreId()) {
             return $category;
         }
+
         return $this->categoryRepository->get($category->getEntityId(), $storeId);
     }
 

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

@@ -7,6 +7,7 @@
 
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model;
 
+use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\Product;
 use Magento\CatalogUrlRewrite\Model\ObjectRegistry;
@@ -69,6 +70,9 @@ class ProductScopeRewriteGeneratorTest extends TestCase
     /** @var ScopeConfigInterface|MockObject */
     private $configMock;
 
+    /** @var CategoryRepositoryInterface|MockObject */
+    private $categoryRepository;
+
     protected function setUp(): void
     {
         $this->serializer = $this->createMock(Json::class);
@@ -126,6 +130,8 @@ function ($value) {
         $this->configMock = $this->getMockBuilder(ScopeConfigInterface::class)
             ->getMock();
 
+        $this->categoryRepository = $this->getMockForAbstractClass(CategoryRepositoryInterface::class);
+
         $this->productScopeGenerator = (new ObjectManager($this))->getObject(
             ProductScopeRewriteGenerator::class,
             [
@@ -137,7 +143,8 @@ function ($value) {
                 'storeViewService' => $this->storeViewService,
                 'storeManager' => $this->storeManager,
                 'mergeDataProviderFactory' => $mergeDataProviderFactory,
-                'config' => $this->configMock
+                'config' => $this->configMock,
+                'categoryRepository' => $this->categoryRepository
             ]
         );
         $this->categoryMock = $this->getMockBuilder(Category::class)
@@ -215,6 +222,8 @@ public function testGenerationForSpecificStore()
         $this->anchorUrlRewriteGenerator->expects($this->any())->method('generate')
             ->willReturn([]);
 
+        $this->categoryRepository->expects($this->once())->method('get')->willReturn($this->categoryMock);
+
         $this->assertEquals(
             ['category-1_1' => $canonical],
             $this->productScopeGenerator->generateForSpecificStoreView(1, [$this->categoryMock], $product, 1)