Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-2964' into Tier4-Kings-PR-06-12-2024

Author: glo23503

app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Move.php

@@ -75,7 +75,7 @@ public function afterChangeParent(
         $categoryStoreId = $category->getStoreId();
         foreach ($category->getStoreIds() as $storeId) {
             $category->setStoreId($storeId);
-            $this->removeObsoleteUrlPathEntries($category);
+            $this->removeObsoleteUrlPathEntries($category, $categoryStoreId);
             $this->updateCategoryUrlKeyForStore($category);
             $category->unsUrlPath();
             $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
@@ -121,9 +121,10 @@ private function updateUrlPathForChildren(Category $category): void
      * Clean obsolete entries
      *
      * @param Category $category
+     * @param int $categoryStoreId
      * @return void
      */
-    private function removeObsoleteUrlPathEntries(Category $category): void
+    private function removeObsoleteUrlPathEntries(Category $category, $categoryStoreId): void
     {
         if ($this->storeManager->hasSingleStore()) {
             return;
@@ -132,6 +133,10 @@ private function removeObsoleteUrlPathEntries(Category $category): void
         $path = $category->getData('path');
         if ($origPath != null && $path != null && $origPath != $path) {
             $category->unsUrlPath();
+            if ($category->getStoreId() !== $categoryStoreId) {
+                $category->setStoreId($categoryStoreId);
+                $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
+            }
             $category->getResource()->saveAttribute($category, 'url_path');
             foreach ($this->childrenCategoriesProvider->getChildren($category, true) as $childCategory) {
                 $childCategory->unsUrlPath();

app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/MoveTest.php

@@ -117,11 +117,11 @@ public function testAfterChangeParent()
         $storeIds = [0, 1];
 
         $this->storeManagerMock->expects($this->exactly(2))->method('hasSingleStore')->willReturn(false);
-        $this->categoryMock->expects($this->exactly(4))->method('getStoreId')
-            ->willReturnOnConsecutiveCalls(0, 0, 1, 0);
+        $this->categoryMock->expects($this->exactly(6))->method('getStoreId')
+            ->willReturnOnConsecutiveCalls(0, 0, 1, 0, 1, 0);
         $this->categoryMock->expects($this->once())->method('getStoreIds')->willReturn($storeIds);
-        $this->categoryMock->expects($this->exactly(4))->method('setStoreId')
-            ->willReturnOnConsecutiveCalls(0, 0, 1, 0);
+        $this->categoryMock->expects($this->exactly(5))->method('setStoreId')
+            ->willReturnOnConsecutiveCalls(0, 0, 1, 0, 1);
 
         $this->categoryMock->expects($this->exactly(2))->method('getData')
             ->willReturnOnConsecutiveCalls('1/3/5', '1/3/5');
@@ -146,9 +146,9 @@ public function testAfterChangeParent()
         $this->categoryMock->expects($this->exactly(2))->method('setUrlKey')->with('url-key')
             ->willReturnSelf();
 
-        $this->categoryUrlPathGeneratorMock->expects($this->exactly(3))->method('getUrlPath')
+        $this->categoryUrlPathGeneratorMock->expects($this->exactly(4))->method('getUrlPath')
             ->with($this->categoryMock)->willReturn($urlPath);
-        $this->categoryMock->expects($this->exactly(3))->method('setUrlPath')->with($urlPath);
+        $this->categoryMock->expects($this->exactly(4))->method('setUrlPath')->with($urlPath);
 
         $this->assertSame(
             $this->subjectMock,