Merge remote-tracking branch 'origin/MC-33028' into 2.4-develop-pr27

serhii-balko · serhii-balko · commit 99c8f54ee0d8 · 2020-06-02T10:13:46.000+03:00
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/View.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/View.php
@@ -19,7 +19,6 @@
  *
  * @see \Magento\Store\Model\ResourceModel\Store
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @package Magento\CatalogUrlRewrite\Model\Category\Plugin\Store
  */
 class View
 {
@@ -39,7 +38,7 @@ class View
     protected $productFactory;
 
     /**
-     * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator
+     * @var CategoryUrlRewriteGenerator
      */
     protected $categoryUrlRewriteGenerator;
 
@@ -75,6 +74,8 @@ public function __construct(
     }
 
     /**
+     * Setter for Orig Store data
+     *
      * @param \Magento\Store\Model\ResourceModel\Store $object
      * @param AbstractModel $store
      * @return void
@@ -100,14 +101,13 @@ public function afterSave(
         \Magento\Store\Model\ResourceModel\Store $store
     ) {
         if ($this->origStore->isObjectNew() || $this->origStore->dataHasChangedFor('group_id')) {
-            if (!$this->origStore->isObjectNew()) {
-                $this->urlPersist->deleteByData([UrlRewrite::STORE_ID => $this->origStore->getId()]);
-            }
-
-            $this->urlPersist->replace(
-                $this->generateCategoryUrls($this->origStore->getRootCategoryId(), $this->origStore->getId())
+            $categoryRewriteUrls = $this->generateCategoryUrls(
+                $this->origStore->getRootCategoryId(),
+                $this->origStore->getId()
             );
 
+            $this->urlPersist->replace($categoryRewriteUrls);
+
             $this->urlPersist->replace(
                 $this->generateProductUrls(
                     $this->origStore->getWebsiteId(),
@@ -139,33 +139,34 @@ protected function generateProductUrls($websiteId, $originWebsiteId, $storeId)
             ->addAttributeToSelect(['name', 'url_path', 'url_key', 'visibility'])
             ->addWebsiteFilter($websiteIds);
         foreach ($collection as $product) {
-            $product->setStoreId($storeId);
             /** @var \Magento\Catalog\Model\Product $product */
-            $urls = array_merge(
-                $urls,
-                $this->productUrlRewriteGenerator->generate($product)
-            );
+            $product->setStoreId($storeId);
+            $urls[] = $this->productUrlRewriteGenerator->generate($product);
         }
+        $urls = array_merge([], ...$urls);
+
         return $urls;
     }
 
     /**
+     * Generate url rewrites for categories
+     *
      * @param int $rootCategoryId
      * @param int $storeId
      * @return array
      */
     protected function generateCategoryUrls($rootCategoryId, $storeId)
     {
         $urls = [];
-        $categories = $this->categoryFactory->create()->getCategories($rootCategoryId, 1, false, true);
+        $categories = $this->categoryFactory->create()->getCategories($rootCategoryId, 1, false, true, false);
+        $categories->setStoreId($storeId);
         foreach ($categories as $category) {
-            /** @var \Magento\Catalog\Model\Category $category */
+            /** @var Category $category */
             $category->setStoreId($storeId);
-            $urls = array_merge(
-                $urls,
-                $this->categoryUrlRewriteGenerator->generate($category)
-            );
+            $urls[] = $this->categoryUrlRewriteGenerator->generate($category);
         }
+        $urls = array_merge([], ...$urls);
+
         return $urls;
     }
 
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Store/ViewTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Store/ViewTest.php
@@ -7,6 +7,7 @@
 
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Category\Plugin\Store;
 
+use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
 use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\CategoryFactory;
 use Magento\Catalog\Model\Product;
@@ -87,6 +88,9 @@ class ViewTest extends TestCase
      */
     private $productMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp(): void
     {
         $this->objectManager = new ObjectManager($this);
@@ -139,7 +143,12 @@ protected function setUp(): void
         );
     }
 
-    public function testAfterSave()
+    /**
+     * Test after save
+     *
+     * @return void
+     */
+    public function testAfterSave(): void
     {
         $origStoreMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
             ->disableOriginalConstructor()
@@ -155,9 +164,16 @@ public function testAfterSave()
         $this->abstractModelMock->expects($this->any())
             ->method('isObjectNew')
             ->willReturn(true);
+        $categoryCollection = $this->getMockBuilder(CategoryCollection::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getIterator'])
+            ->getMock();
+        $categoryCollection->expects($this->any())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator([]));
         $this->categoryMock->expects($this->once())
             ->method('getCategories')
-            ->willReturn([]);
+            ->willReturn($categoryCollection);
         $this->categoryFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($this->categoryMock);
@@ -191,7 +207,12 @@ public function testAfterSave()
         );
     }
 
-    public function testAfterDelete()
+    /**
+     * Test after delete
+     *
+     * @return void
+     */
+    public function testAfterDelete(): void
     {
         $this->urlPersistMock->expects($this->once())
             ->method('deleteByData');
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteTest.php
@@ -15,6 +15,7 @@
 use Magento\CatalogUrlRewrite\Model\Map\DataCategoryUrlRewriteDatabaseMap;
 use Magento\CatalogUrlRewrite\Model\Map\DataProductUrlRewriteDatabaseMap;
 use Magento\CatalogUrlRewrite\Model\ResourceModel\Category\Product;
+use Magento\Store\Api\WebsiteRepositoryInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
 use Magento\UrlRewrite\Model\OptionProvider;
@@ -63,6 +64,8 @@ protected function setUp(): void
     }
 
     /**
+     * Test url rewrite after category save
+     *
      * @magentoDataFixture Magento/Catalog/_files/category_with_position.php
      * @dataProvider categoryProvider
      * @param array $data
@@ -80,6 +83,8 @@ public function testUrlRewriteOnCategorySave(array $data): void
     }
 
     /**
+     * Provider. categoryProvider
+     *
      * @return array
      */
     public function categoryProvider(): array
@@ -123,6 +128,8 @@ public function categoryProvider(): array
     }
 
     /**
+     * Test category product url rewrite
+     *
      * @magentoDataFixture Magento/Catalog/_files/category_tree.php
      * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
      * @dataProvider productRewriteProvider
@@ -140,6 +147,8 @@ public function testCategoryProductUrlRewrite(array $data): void
     }
 
     /**
+     * Provider. productRewriteProvider
+     *
      * @return array
      */
     public function productRewriteProvider(): array
@@ -165,6 +174,8 @@ public function productRewriteProvider(): array
     }
 
     /**
+     * Test url rewrites after category save with existing url key
+     *
      * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories_with_products.php
      * @magentoAppIsolation enabled
      * @dataProvider existingUrlProvider
@@ -179,6 +190,8 @@ public function testUrlRewriteOnCategorySaveWithExistingUrlKey(array $data): voi
     }
 
     /**
+     * Provider. existingUrlProvider
+     *
      * @return array
      */
     public function existingUrlProvider(): array
@@ -226,6 +239,8 @@ public function existingUrlProvider(): array
     }
 
     /**
+     * Test url rewrites after category move
+     *
      * @magentoDataFixture Magento/Catalog/_files/category_product.php
      * @magentoDataFixture Magento/Catalog/_files/catalog_category_with_slash.php
      * @dataProvider categoryMoveProvider
@@ -287,6 +302,7 @@ public function categoryMoveProvider(): array
     }
 
     /**
+     * Test url rewrites after category delete
      * @magentoDataFixture Magento/Catalog/_files/category.php
      * @return void
      */
@@ -302,6 +318,8 @@ public function testUrlRewritesAfterCategoryDelete(): void
     }
 
     /**
+     * Test url rewrites after category with products delete
+     *
      * @magentoAppArea adminhtml
      * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories_with_product_ids.php
      * @return void
@@ -325,6 +343,8 @@ public function testUrlRewritesAfterCategoryWithProductsDelete(): void
     }
 
     /**
+     * Test category url rewrite per Store Views
+     *
      * @magentoDataFixture Magento/Store/_files/second_store.php
      * @magentoDataFixture Magento/Catalog/_files/category.php
      * @return void
@@ -353,6 +373,53 @@ public function testCategoryUrlRewritePerStoreViews(): void
         }
     }
 
+    /**
+     * Test category url rewrite while reassign store view
+     *
+     * @magentoAppArea adminhtml
+     * @magentoDataFixture Magento/Store/_files/second_store_group_with_second_website.php
+     * @magentoDataFixture Magento/Catalog/_files/category.php
+     * @return void
+     */
+    public function testCategoryUrlRewriteMovingToOtherStoreView(): void
+    {
+        $categoryId = 333;
+        $store = $this->storeRepository->get('default');
+        $storeId = $store->getId();
+        $urlRewrites = [
+            ['category-1-updated.html', 'category-1.html'],
+            ['category-1-most-recent.html', 'category-1-updated.html'],
+        ];
+        foreach ($urlRewrites as $rewrite) {
+            /** @var \Magento\UrlRewrite\Model\UrlRewrite $urlRewrite */
+            $urlRewrite = $this->objectManager->create(\Magento\UrlRewrite\Model\UrlRewrite::class);
+            $urlRewrite->setEntityType(\Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator::ENTITY_TYPE)
+                ->setEntityId($categoryId)
+                ->setRequestPath($rewrite[0])
+                ->setTargetPath($rewrite[1])
+                ->setRedirectType(\Magento\UrlRewrite\Model\OptionProvider::PERMANENT)
+                ->setStoreId($storeId);
+            $urlRewrite->save();
+        }
+
+        /** @var WebsiteRepositoryInterface $websiteRepo */
+        $websiteRepo = $this->objectManager->get(WebsiteRepositoryInterface::class);
+        $website = $websiteRepo->get('test');
+        $group = $website->getDefaultGroup();
+        $group->setRootCategoryId(2);
+        $group->save();
+        $groupId = $group->getId();
+        $store->setStoreGroupId($groupId);
+        $store->save();
+
+        $urlRewriteItems = $this->getEntityRewriteCollection($categoryId)->getItems();
+        $this->assertTrue(count($urlRewriteItems) === 3);
+        $expectedRewriteRequestPaths = ['category-1.html', 'category-1-updated.html', 'category-1-most-recent.html'];
+        foreach ($urlRewriteItems as $item) {
+            $this->assertTrue(in_array($item->getRequestPath(), $expectedRewriteRequestPaths));
+        }
+    }
+
     /**
      * @inheritdoc
      */
