ACP2E-808: Url Rewrite is not regenerated for store view with overridden url_key after switching visibility from "Not Visible Individually" on global scope

Author: bubasuma

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

@@ -10,6 +10,7 @@
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\CatalogUrlRewrite\Model\Products\AppendUrlRewritesToProducts;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
+use Magento\CatalogUrlRewrite\Service\V1\StoreViewService;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
@@ -46,22 +47,30 @@ class ProductProcessUrlRewriteSavingObserver implements ObserverInterface
      */
     private $getStoresList;
 
+    /**
+     * @var StoreViewService
+     */
+    private $storeViewService;
+
     /**
      * @param UrlPersistInterface $urlPersist
-     * @param AppendUrlRewritesToProducts|null $appendRewrites
+     * @param AppendUrlRewritesToProducts $appendRewrites
      * @param ScopeConfigInterface $scopeConfig
      * @param GetStoresListByWebsiteIds $getStoresList
+     * @param StoreViewService $storeViewService
      */
     public function __construct(
         UrlPersistInterface $urlPersist,
         AppendUrlRewritesToProducts $appendRewrites,
         ScopeConfigInterface $scopeConfig,
-        GetStoresListByWebsiteIds $getStoresList
+        GetStoresListByWebsiteIds $getStoresList,
+        StoreViewService $storeViewService
     ) {
         $this->urlPersist = $urlPersist;
         $this->appendRewrites = $appendRewrites;
         $this->scopeConfig = $scopeConfig;
         $this->getStoresList = $getStoresList;
+        $this->storeViewService = $storeViewService;
     }
 
     /**
@@ -82,6 +91,23 @@ public function execute(Observer $observer)
             $storesToAdd = $this->getStoresList->execute(
                 array_diff($product->getWebsiteIds(), $oldWebsiteIds)
             );
+
+            if ($product->getStoreId() === Store::DEFAULT_STORE_ID
+                && $product->dataHasChangedFor('visibility')
+                && (int) $product->getOrigData('visibility') === Visibility::VISIBILITY_NOT_VISIBLE
+            ) {
+                foreach ($product->getStoreIds() as $storeId) {
+                    if (!$this->storeViewService->doesEntityHaveOverriddenVisibilityForStore(
+                        $storeId,
+                        $product->getId(),
+                        Product::ENTITY
+                    )
+                    ) {
+                        $storesToAdd[] = $storeId;
+                    }
+                }
+                $storesToAdd = array_unique($storesToAdd);
+            }
             $this->appendRewrites->execute([$product], $storesToAdd);
         }
     }
@@ -102,8 +128,21 @@ private function deleteObsoleteRewrites(Product $product): void
             array_diff($oldWebsiteIds, $product->getWebsiteIds())
         );
         if ((int)$product->getVisibility() === Visibility::VISIBILITY_NOT_VISIBLE) {
-            $isGlobalScope = $product->getStoreId() == Store::DEFAULT_STORE_ID;
-            $storesToRemove[] = $isGlobalScope ? $product->getStoreIds() : $product->getStoreId();
+            if ($product->getStoreId() === Store::DEFAULT_STORE_ID) {
+                foreach ($product->getStoreIds() as $storeId) {
+                    if (!$this->storeViewService->doesEntityHaveOverriddenVisibilityForStore(
+                        $storeId,
+                        $product->getId(),
+                        Product::ENTITY
+                    )
+                    ) {
+                        $storesToRemove[] = $storeId;
+                    }
+                }
+            } else {
+                $storesToRemove[] = $product->getStoreId();
+            }
+            $storesToRemove = array_unique($storesToRemove);
         }
         if ($storesToRemove) {
             $this->urlPersist->deleteByData(
@@ -130,7 +169,6 @@ private function isWebsiteChanged(Product $product)
         return array_diff($oldWebsiteIds, $newWebsiteIds) || array_diff($newWebsiteIds, $oldWebsiteIds);
     }
 
-
     /**
      * Is product rewrites need to be updated
      *

app/code/Magento/CatalogUrlRewrite/Service/V1/StoreViewService.php

@@ -11,7 +11,7 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 
 /**
- * Store view service
+ * Service that checks scope overridden values
  */
 class StoreViewService
 {
@@ -70,6 +70,20 @@ public function doesEntityHaveOverriddenUrlPathForStore($storeId, $entityId, $en
         return $this->doesEntityHaveOverriddenUrlAttributeForStore($storeId, $entityId, $entityType, 'url_path');
     }
 
+    /**
+     * Check that entity has overridden visibility for specific store
+     *
+     * @param int $storeId
+     * @param int $entityId
+     * @param string $entityType
+     * @throws \InvalidArgumentException
+     * @return bool
+     */
+    public function doesEntityHaveOverriddenVisibilityForStore($storeId, $entityId, $entityType)
+    {
+        return $this->doesEntityHaveOverriddenUrlAttributeForStore($storeId, $entityId, $entityType, 'visibility');
+    }
+
     /**
      * Check that entity has overridden url attribute for specific store
      *