ENGCOM-9072: Prevent Category URL Rewrites generation when no Store Group assigned #32790

Author: gabrieldagama

app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/View.php

@@ -104,7 +104,10 @@ public function afterSave(
         Store $object,
         Store $store
     ): Store {
-        if ($this->origStore->isObjectNew() || $this->origStore->dataHasChangedFor('group_id')) {
+        if (
+            $this->origStore->getData('group_id')
+            && ($this->origStore->isObjectNew() || $this->origStore->dataHasChangedFor('group_id'))
+        ) {
             $categoryRewriteUrls = $this->generateCategoryUrls(
                 (int)$this->origStore->getRootCategoryId(),
                 (int)$this->origStore->getId()

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

@@ -7,18 +7,18 @@
 
 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;
 use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
 use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
 use Magento\CatalogUrlRewrite\Model\Category\Plugin\Store\View as StoreViewPlugin;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Framework\Model\AbstractModel;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Store\Model\ResourceModel\Store;
+use Magento\Store\Model\ResourceModel\Store as StoreResourceModel;
+use Magento\Store\Model\Store;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -28,11 +28,6 @@
  */
 class ViewTest extends TestCase
 {
-    /**
-     * @var ObjectManager
-     */
-    private $objectManager;
-
     /**
      * @var StoreViewPlugin
      */
@@ -44,7 +39,7 @@ class ViewTest extends TestCase
     private $abstractModelMock;
 
     /**
-     * @var Store|MockObject
+     * @var StoreResourceModel|MockObject
      */
     private $subjectMock;
 
@@ -93,12 +88,11 @@ class ViewTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->objectManager = new ObjectManager($this);
         $this->abstractModelMock = $this->getMockBuilder(AbstractModel::class)
             ->disableOriginalConstructor()
             ->setMethods(['isObjectNew'])
             ->getMockForAbstractClass();
-        $this->subjectMock = $this->getMockBuilder(Store::class)
+        $this->subjectMock = $this->getMockBuilder(StoreResourceModel::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->urlPersistMock = $this->getMockBuilder(UrlPersistInterface::class)
@@ -131,15 +125,12 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->setMethods(['getCollection'])
             ->getMock();
-        $this->plugin = $this->objectManager->getObject(
-            StoreViewPlugin::class,
-            [
-                'urlPersist' => $this->urlPersistMock,
-                'categoryFactory' => $this->categoryFactoryMock,
-                'productFactory' => $this->productFactoryMock,
-                'categoryUrlRewriteGenerator' => $this->categoryUrlRewriteGeneratorMock,
-                'productUrlRewriteGenerator' => $this->productUrlRewriteGeneratorMock
-            ]
+        $this->plugin = new StoreViewPlugin(
+            $this->urlPersistMock,
+            $this->categoryFactoryMock,
+            $this->productFactoryMock,
+            $this->categoryUrlRewriteGeneratorMock,
+            $this->productUrlRewriteGeneratorMock
         );
     }
 
@@ -150,13 +141,19 @@ protected function setUp(): void
      */
     public function testAfterSave(): void
     {
-        $origStoreMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
+        $origStoreMock = $this->getMockBuilder(Store::class)
             ->disableOriginalConstructor()
             ->getMock();
         $reflectionStore = new \ReflectionClass($this->plugin);
         $origStore = $reflectionStore->getProperty('origStore');
         $origStore->setAccessible(true);
         $origStore->setValue($this->plugin, $origStoreMock);
+
+        $origStoreMock->expects($this->atLeastOnce())
+            ->method('getData')
+            ->with('group_id')
+            ->willReturn('1');
+
         $origStoreMock->expects($this->atLeastOnce())
             ->method('isObjectNew')
             ->willReturn(true);
@@ -203,7 +200,54 @@ public function testAfterSave(): void
 
         $this->assertSame(
             $this->subjectMock,
-            $this->plugin->afterSave($this->subjectMock, $this->subjectMock, $this->abstractModelMock)
+            $this->plugin->afterSave($this->subjectMock, $this->subjectMock)
+        );
+    }
+
+    public function testAfterSaveWhenNoGroupId()
+    {
+        $origStoreMock = $this->getMockBuilder(Store::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $reflectionStore = new \ReflectionClass($this->plugin);
+        $origStore = $reflectionStore->getProperty('origStore');
+        $origStore->setAccessible(true);
+        $origStore->setValue($this->plugin, $origStoreMock);
+
+        $origStoreMock->expects($this->atLeastOnce())
+            ->method('getData')
+            ->with('group_id')
+            ->willReturn(null);
+
+        $origStoreMock->expects($this->any())
+            ->method('isObjectNew')
+            ->willReturn(true);
+
+        $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->never())
+            ->method('getCategories');
+        $this->categoryFactoryMock->expects($this->never())->method('create');
+        $this->productFactoryMock->expects($this->never())->method('create');
+        $this->productMock->expects($this->never())->method('getCollection');
+        $this->productCollectionMock->expects($this->never())->method('addCategoryIds');
+        $this->productCollectionMock->expects($this->never())->method('addAttributeToSelect');
+        $this->productCollectionMock->expects($this->never())->method('addStoreFilter');
+
+        $this->productCollectionMock->expects($this->never())->method('getIterator');
+        $this->productUrlRewriteGeneratorMock->expects($this->never())->method('generate');
+
+        $this->assertSame(
+            $this->subjectMock,
+            $this->plugin->afterSave($this->subjectMock, $this->subjectMock)
         );
     }