From d8a2290935851bd66bec71e319e6429172df6941 Mon Sep 17 00:00:00 2001
From: Anshu Mishra <mishra.anshu1710@gmail.com>
Date: Wed, 20 Feb 2019 16:51:32 +0530
Subject: [PATCH 1/2] issue #21329 rewrite fix while product website update
 using mass action

---
 .../ProductToWebsiteChangeObserver.php        | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php
index 94798753ca63f..b405de9be8c87 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php
@@ -13,6 +13,8 @@
 use Magento\Store\Model\Store;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use Magento\Store\Api\StoreWebsiteRelationInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Observer to assign the products to website.
@@ -39,22 +41,31 @@ class ProductToWebsiteChangeObserver implements ObserverInterface
      */
     protected $request;
 
+    /**
+     * @var StoreWebsiteRelationInterface
+     */
+    private $storeWebsiteRelation;
+
     /**
      * @param ProductUrlRewriteGenerator $productUrlRewriteGenerator
      * @param UrlPersistInterface $urlPersist
      * @param ProductRepositoryInterface $productRepository
      * @param RequestInterface $request
+     * @param StoreWebsiteRelationInterface $storeWebsiteRelation
      */
     public function __construct(
         ProductUrlRewriteGenerator $productUrlRewriteGenerator,
         UrlPersistInterface $urlPersist,
         ProductRepositoryInterface $productRepository,
-        RequestInterface $request
+        RequestInterface $request,
+        StoreWebsiteRelationInterface $storeWebsiteRelation = null
     ) {
         $this->productUrlRewriteGenerator = $productUrlRewriteGenerator;
         $this->urlPersist = $urlPersist;
         $this->productRepository = $productRepository;
         $this->request = $request;
+        $this->storeWebsiteRelation = $storeWebsiteRelation ?:
+            ObjectManager::getInstance()->get(StoreWebsiteRelationInterface::class);
     }
 
     /**
@@ -73,10 +84,17 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             );
 
             if (!empty($this->productUrlRewriteGenerator->generate($product))) {
-                $this->urlPersist->deleteByData([
-                    UrlRewrite::ENTITY_ID => $product->getId(),
-                    UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
-                ]);
+                if($this->request->getParam('remove_website_ids')) {
+                    foreach($this->request->getParam('remove_website_ids') as $webId){
+                        foreach($this->storeWebsiteRelation->getStoreByWebsiteId($webId) as $storeId){
+                            $this->urlPersist->deleteByData([
+                                UrlRewrite::ENTITY_ID => $product->getId(),
+                                UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
+                                UrlRewrite::STORE_ID => $storeId
+                            ]);
+                        }
+                    }
+                }
                 if ($product->getVisibility() != Visibility::VISIBILITY_NOT_VISIBLE) {
                     $this->urlPersist->replace($this->productUrlRewriteGenerator->generate($product));
                 }

From fbda060d650ea19dbf77b723fbdb5a91062208de Mon Sep 17 00:00:00 2001
From: Anshu Mishra <mishra.anshu1710@gmail.com>
Date: Thu, 21 Feb 2019 14:49:31 +0530
Subject: [PATCH 2/2] issue #21329 rewrite fix while product website update
 using mass action

---
 .../Observer/ProductToWebsiteChangeObserver.php             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php
index b405de9be8c87..474f6be9a1482 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php
@@ -84,9 +84,9 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             );
 
             if (!empty($this->productUrlRewriteGenerator->generate($product))) {
-                if($this->request->getParam('remove_website_ids')) {
-                    foreach($this->request->getParam('remove_website_ids') as $webId){
-                        foreach($this->storeWebsiteRelation->getStoreByWebsiteId($webId) as $storeId){
+                if ($this->request->getParam('remove_website_ids')) {
+                    foreach ($this->request->getParam('remove_website_ids') as $webId) {
+                        foreach ($this->storeWebsiteRelation->getStoreByWebsiteId($webId) as $storeId) {
                             $this->urlPersist->deleteByData([
                                 UrlRewrite::ENTITY_ID => $product->getId(),
                                 UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,