Merge remote-tracking branch 'l3/MC-41550' into PR-L3-20210405

Author: veloraven

app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Model/Product/UpdateProductWebsiteUrlRewrites.php

@@ -8,7 +8,7 @@
 namespace Magento\CatalogUrlRewrite\Plugin\Catalog\Model\Product;
 
 use Magento\Catalog\Model\Product\Action as ProductAction;
-use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\CatalogUrlRewrite\Model\Products\AppendUrlRewritesToProducts;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Store\Api\StoreWebsiteRelationInterface;
@@ -27,9 +27,9 @@ class UpdateProductWebsiteUrlRewrites
     private $urlPersist;
 
     /**
-     * @var Collection
+     * @var CollectionFactory
      */
-    private $productCollection;
+    private $productCollectionFactory;
 
     /**
      * @var AppendUrlRewritesToProducts
@@ -43,18 +43,18 @@ class UpdateProductWebsiteUrlRewrites
 
     /**
      * @param UrlPersistInterface $urlPersist
-     * @param Collection $productCollection
+     * @param CollectionFactory $productCollectionFactory
      * @param AppendUrlRewritesToProducts $appendRewrites
      * @param GetStoresListByWebsiteIds $getStoresList
      */
     public function __construct(
         UrlPersistInterface $urlPersist,
-        Collection $productCollection,
+        CollectionFactory $productCollectionFactory,
         AppendUrlRewritesToProducts $appendRewrites,
         GetStoresListByWebsiteIds $getStoresList
     ) {
         $this->urlPersist = $urlPersist;
-        $this->productCollection = $productCollection;
+        $this->productCollectionFactory = $productCollectionFactory;
         $this->appendRewrites = $appendRewrites;
         $this->getStoresList = $getStoresList;
     }
@@ -90,8 +90,9 @@ public function afterUpdateWebsites(
                 ]
             );
         } else {
-            $collection = $this->productCollection->addFieldToFilter('entity_id', ['in' => implode(',', $productIds)]);
-            $this->appendRewrites->execute($collection->getItems(), $storeIds);
+            $productCollection = $this->productCollectionFactory->create();
+            $productCollection->addFieldToFilter('entity_id', ['in' => implode(',', $productIds)]);
+            $this->appendRewrites->execute($productCollection->getItems(), $storeIds);
         }
     }
 }

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Plugin/Catalog/Model/Product/UpdateProductWebsiteUrlRewritesTest.php

@@ -8,6 +8,7 @@
 namespace Magento\CatalogUrlRewrite\Plugin\Catalog\Model\Product;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Action;
 use Magento\Store\Api\StoreWebsiteRelationInterface;
@@ -69,4 +70,49 @@ public function testUpdateUrlRewrites()
             $url
         );
     }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_url_key.php
+     * @magentoDataFixture Magento/Store/_files/second_website_with_store_group_and_store.php
+     */
+    public function testUpdateUrlRewritesForSecondProduct()
+    {
+        /** @var Website $website */
+        $websiteRepository = Bootstrap::getObjectManager()->get(WebsiteRepository::class);
+        $website = $websiteRepository->get('test');
+        $productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+        // test the first product
+        $product =  $productRepository->get('simple1', false, null, true);
+        // store filter condition about the first product in collection
+        $productCollection = Bootstrap::getObjectManager()->get(ProductCollection::class);
+        $productCollection->addFieldToFilter('entity_id', $product->getId());
+        $this->action->updateWebsites([$product->getId()], [$website->getId()], 'add');
+        $storeIds = $this->storeWebsiteRelation->getStoreByWebsiteId($website->getId());
+        $this->assertStringContainsString(
+            $product->getUrlKey() . '.html',
+            $product->setStoreId(reset($storeIds))->getProductUrl()
+        );
+        $this->action->updateWebsites([$product->getId()], [$website->getId()], 'remove');
+        $product->setRequestPath('');
+        $url = $product->setStoreId(reset($storeIds))->getProductUrl();
+        $this->assertStringNotContainsString(
+            $product->getUrlKey() . '.htmll',
+            $url
+        );
+        // test the second product
+        $product =  $productRepository->get('simple2', false, null, true);
+        $this->action->updateWebsites([$product->getId()], [$website->getId()], 'add');
+        $storeIds = $this->storeWebsiteRelation->getStoreByWebsiteId($website->getId());
+        $this->assertStringContainsString(
+            $product->getUrlKey() . '.html',
+            $product->setStoreId(reset($storeIds))->getProductUrl()
+        );
+        $this->action->updateWebsites([$product->getId()], [$website->getId()], 'remove');
+        $product->setRequestPath('');
+        $url = $product->setStoreId(reset($storeIds))->getProductUrl();
+        $this->assertStringNotContainsString(
+            $product->getUrlKey() . '.html',
+            $url
+        );
+    }
 }