Merge branch 'ACP2E-84' of https://github.com/magento-l3/magento2ce into L3-PR-20220202

Author: ArtemVasyliev

app/code/Magento/CatalogUrlRewrite/Model/Products/AdaptUrlRewritesToVisibilityAttribute.php

@@ -65,11 +65,12 @@ public function __construct(
      *
      * @param array $productIds
      * @param int $visibility
+     * @param int $storeId
      * @throws UrlAlreadyExistsException
      */
-    public function execute(array $productIds, int $visibility): void
+    public function execute(array $productIds, int $visibility, int $storeId): void
     {
-        $products = $this->getProductsByIds($productIds);
+        $products = $this->getProductsByIds($productIds, $storeId);
 
         /** @var Product $product */
         foreach ($products as $product) {
@@ -110,11 +111,13 @@ public function execute(array $productIds, int $visibility): void
      * Get Product Models by Id's
      *
      * @param array $productIds
+     * @param int $storeId
      * @return array
      */
-    private function getProductsByIds(array $productIds): array
+    private function getProductsByIds(array $productIds, int $storeId): array
     {
         $productCollection = $this->productCollectionFactory->create();
+        $productCollection->setStoreId($storeId);
         $productCollection->addAttributeToSelect(ProductInterface::VISIBILITY);
         $productCollection->addAttributeToSelect('url_key');
         $productCollection->addFieldToFilter(

app/code/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeProductVisibilityObserver.php

@@ -43,12 +43,13 @@ public function execute(Observer $observer)
         $event = $observer->getEvent();
         $attrData = $event->getAttributesData();
         $productIds = $event->getProductIds();
+        $storeIdFromScope = $event->getStoreId();
         $visibility = $attrData[ProductInterface::VISIBILITY] ?? 0;
 
         if (!$visibility || !$productIds) {
             return;
         }
 
-        $this->adaptUrlRewritesToVisibility->execute($productIds, (int)$visibility);
+        $this->adaptUrlRewritesToVisibility->execute($productIds, (int)$visibility, (int)$storeIdFromScope);
     }
 }

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeVisibilityObserverTest.php

@@ -9,13 +9,18 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Framework\Event\ManagerInterface;
+use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Fixture\DataFixtureStorage;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 
 /**
  * @magentoAppArea adminhtml
  * @magentoDbIsolation disabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ProcessUrlRewriteOnChangeVisibilityObserverTest extends \PHPUnit\Framework\TestCase
 {
@@ -34,6 +39,11 @@ class ProcessUrlRewriteOnChangeVisibilityObserverTest extends \PHPUnit\Framework
      */
     private $eventManager;
 
+    /**
+     * @var DataFixtureStorage
+     */
+    private $fixtures;
+
     /**
      * Set up
      */
@@ -42,6 +52,8 @@ protected function setUp(): void
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
         $this->eventManager = $this->objectManager->create(ManagerInterface::class);
+
+        $this->fixtures = Bootstrap::getObjectManager()->get(DataFixtureStorageManager::class)->getStorage();
     }
 
     /**
@@ -148,6 +160,78 @@ public function testMakeProductVisibleViaMassAction()
         }
     }
 
+    /**
+     * Test for multistore properties of the product to be respected in generated UrlRewrites
+     * during the mass update for visibility change
+     *
+     * phpcs:disable Generic.Files.LineLength.TooLong
+     * @magentoDataFixture Magento\Store\Test\Fixture\Website as:w1
+     * @magentoDataFixture Magento\Store\Test\Fixture\Store as:s1
+     * @magentoDataFixture Magento\Store\Test\Fixture\Group as:g1 with:{"website_id": "$w1.id$", "default_store_id": "$s1.id$"}
+     * @magentoDataFixture Magento\Catalog\Test\Fixture\Category as:c1
+     * @magentoDataFixture Magento\Catalog\Test\Fixture\Product with:{"category_ids":["$c1.id$"], "visibility": "1", "extension_attributes": {"website_ids": [1, "$w1.id$"]}} as:p1
+     * @magentoAppIsolation enabled
+     * phpcs:enable Generic.Files.LineLength.TooLong
+     */
+    public function testMassActionUrlRewriteForStore()
+    {
+        $product = $this->fixtures->get('p1');
+        $category = $this->fixtures->get('c1');
+        $store = $this->fixtures->get('s1');
+
+        $productFilter = [
+            UrlRewrite::ENTITY_TYPE => 'product',
+        ];
+
+        $beforeUpdate = $this->getActualResults($productFilter);
+        $this->assertCount(0, $beforeUpdate);
+
+        $this->eventManager->dispatch(
+            'catalog_product_attribute_update_before',
+            [
+                'attributes_data' => [ ProductInterface::VISIBILITY => Visibility::VISIBILITY_BOTH ],
+                'product_ids' => [$product->getId()],
+                'store_id' => Store::DEFAULT_STORE_ID
+            ]
+        );
+
+        $expected = [
+            [
+                'request_path' => $product->getUrlKey() . ".html",
+                'target_path' => "catalog/product/view/id/" . $product->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => (String) Store::DISTRO_STORE_ID
+            ],
+            [
+                'request_path' => $category->getUrlKey() . '/' . $product->getUrlKey() . ".html",
+                'target_path' => "catalog/product/view/id/" . $product->getId() . '/category/' . $category->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => (String) Store::DISTRO_STORE_ID
+            ],
+            [
+                'request_path' => $product->getUrlKey() . ".html",
+                'target_path' => "catalog/product/view/id/" . $product->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => (String) $store->getId()
+            ],
+            [
+                'request_path' => $category->getUrlKey() . '/' . $product->getUrlKey() . ".html",
+                'target_path' => "catalog/product/view/id/" . $product->getId() . '/category/' . $category->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => (String) $store->getId()
+            ],
+        ];
+
+        $actual = $this->getActualResults($productFilter);
+        foreach ($expected as $row) {
+            $this->assertContains($row, $actual);
+        }
+    }
+
     /**
      * @magentoDataFixture Magento/CatalogUrlRewrite/_files/products_invisible.php
      * @magentoAppIsolation enabled