ACP2E-2964: [Cloud] URL update only for store_id=0

Author: Adiglo70550

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

@@ -73,13 +73,16 @@ public function afterChangeParent(
         $afterCategoryId
     ) {
         $categoryStoreId = $category->getStoreId();
+        foreach ($category->getStoreIds() as $storeId) {
+            $category->setStoreId($storeId);
+            $this->removeObsoleteUrlPathEntries($category, $categoryStoreId);
+            $this->updateCategoryUrlKeyForStore($category);
+            $category->unsUrlPath();
+            $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
+            $category->getResource()->saveAttribute($category, 'url_path');
+            $this->updateUrlPathForChildren($category);
+        }
         $category->setStoreId($categoryStoreId);
-        $this->removeObsoleteUrlPathEntries($category);
-        $this->updateCategoryUrlKeyForStore($category);
-        $category->unsUrlPath();
-        $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
-        $category->getResource()->saveAttribute($category, 'url_path');
-        $this->updateUrlPathForChildren($category);
 
         return $result;
     }
@@ -120,7 +123,7 @@ private function updateUrlPathForChildren(Category $category): void
      * @param Category $category
      * @return void
      */
-    private function removeObsoleteUrlPathEntries(Category $category): void
+    private function removeObsoleteUrlPathEntries(Category $category, $categoryStoreId): void
     {
         if ($this->storeManager->hasSingleStore()) {
             return;
@@ -129,6 +132,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

@@ -114,40 +114,41 @@ protected function setUp(): void
     public function testAfterChangeParent()
     {
         $urlPath = 'test/path';
-        $storeId = 0;
+        $storeIds = [0, 1];
 
-        $this->storeManagerMock->expects($this->once())->method('hasSingleStore')->willReturn(false);
-        $this->categoryMock->expects($this->exactly(3))->method('getStoreId')
-            ->willReturn($storeId);
-        $this->categoryMock->expects($this->exactly(2))->method('setStoreId')
-            ->willReturnOnConsecutiveCalls($storeId);
+        $this->storeManagerMock->expects($this->exactly(2))->method('hasSingleStore')->willReturn(false);
+        $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(5))->method('setStoreId')
+            ->willReturnOnConsecutiveCalls(0, 0, 1, 0, 1);
 
-        $this->categoryMock->expects($this->once())->method('getData')
+        $this->categoryMock->expects($this->exactly(2))->method('getData')
             ->willReturnOnConsecutiveCalls('1/3/5', '1/3/5');
-        $this->categoryMock->expects($this->once())->method('getOrigData')
+        $this->categoryMock->expects($this->exactly(2))->method('getOrigData')
             ->willReturnOnConsecutiveCalls('1/2/5', '1/2/5');
-        $this->categoryMock->expects($this->exactly(4))->method('unsUrlPath')->willReturnSelf();
-        $this->childrenCategoriesProviderMock->expects($this->exactly(2))->method('getChildren')
+        $this->categoryMock->expects($this->exactly(6))->method('unsUrlPath')->willReturnSelf();
+        $this->childrenCategoriesProviderMock->expects($this->exactly(4))->method('getChildren')
             ->with($this->categoryMock, true)
             ->willReturnOnConsecutiveCalls([$this->categoryMock], [$this->categoryMock], [], []);
 
-        $this->categoryMock->expects($this->exactly(4))->method('getResource')->willReturn($this->subjectMock);
-        $this->subjectMock->expects($this->exactly(4))->method('saveAttribute')
+        $this->categoryMock->expects($this->exactly(6))->method('getResource')->willReturn($this->subjectMock);
+        $this->subjectMock->expects($this->exactly(6))->method('saveAttribute')
             ->with($this->categoryMock, 'url_path')->willReturnSelf();
-        $this->categoryMock->expects($this->once())->method('getId')->willReturnSelf();
+        $this->categoryMock->expects($this->exactly(2))->method('getId')->willReturnSelf();
 
         $originalCategory = $this->getMockBuilder(Category::class)->disableOriginalConstructor()->getMock();
-        $originalCategory->expects($this->once())->method('getUrlKey')->willReturn('url-key');
-        $originalCategory->expects($this->once())->method('setStoreId')->willReturnSelf();
-        $originalCategory->expects($this->once())->method('load')->willReturnSelf();
-        $this->categoryFactory->expects($this->once())->method('create')
+        $originalCategory->expects($this->exactly(2))->method('getUrlKey')->willReturn('url-key');
+        $originalCategory->expects($this->exactly(2))->method('setStoreId')->willReturnSelf();
+        $originalCategory->expects($this->exactly(2))->method('load')->willReturnSelf();
+        $this->categoryFactory->expects($this->exactly(2))->method('create')
             ->willReturn($originalCategory);
-        $this->categoryMock->expects($this->once())->method('setUrlKey')->with('url-key')
+        $this->categoryMock->expects($this->exactly(2))->method('setUrlKey')->with('url-key')
             ->willReturnSelf();
 
-        $this->categoryUrlPathGeneratorMock->expects($this->exactly(2))->method('getUrlPath')
+        $this->categoryUrlPathGeneratorMock->expects($this->exactly(4))->method('getUrlPath')
             ->with($this->categoryMock)->willReturn($urlPath);
-        $this->categoryMock->expects($this->exactly(2))->method('setUrlPath')->with($urlPath);
+        $this->categoryMock->expects($this->exactly(4))->method('setUrlPath')->with($urlPath);
 
         $this->assertSame(
             $this->subjectMock,