Moved DeleteEntitiesFromStores into own class.

Author: Graham Wharton

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

@@ -13,12 +13,11 @@
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
+use Magento\UrlRewrite\Model\Storage\DeleteEntitiesFromStores;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Api\StoreWebsiteRelationInterface;
-use Magento\UrlRewrite\Model\Storage\DbStorage;
-use Magento\Store\Model\Store;
 
 /**
  * Class ProductProcessUrlRewriteSavingObserver
@@ -30,17 +29,17 @@
 class ProductProcessUrlRewriteSavingObserver implements ObserverInterface
 {
     /**
-     * @var ProductUrlRewriteGenerator
+     * @var ProductUrlRewriteGenerator $productUrlRewriteGenerator
      */
     private $productUrlRewriteGenerator;
 
     /**
-     * @var UrlPersistInterface
+     * @var UrlPersistInterface $urlPersist
      */
     private $urlPersist;
 
     /**
-     * @var ProductUrlPathGenerator
+     * @var ProductUrlPathGenerator $productUrlPathGenerator
      */
     private $productUrlPathGenerator;
 
@@ -50,7 +49,7 @@ class ProductProcessUrlRewriteSavingObserver implements ObserverInterface
     private $storeManager;
 
     /**
-     * @var StoreWebsiteRelationInterface
+     * @var StoreWebsiteRelationInterface $storeWebsiteRelation
      */
     private $storeWebsiteRelation;
 
@@ -60,14 +59,14 @@ class ProductProcessUrlRewriteSavingObserver implements ObserverInterface
     private $productRepository;
 
     /**
-     * @var ProductScopeRewriteGenerator
+     * @var ProductScopeRewriteGenerator $productScopeRewriteGenerator
      */
     private $productScopeRewriteGenerator;
 
     /**
-     * @var DbStorage
+     * @var DeleteEntitiesFromStores $deleteEntitiesFromStores
      */
-    private $dbStorage;
+    private $deleteEntitiesFromStores;
 
     /**
      * @param ProductUrlRewriteGenerator $productUrlRewriteGenerator
@@ -77,7 +76,7 @@ class ProductProcessUrlRewriteSavingObserver implements ObserverInterface
      * @param StoreWebsiteRelationInterface $storeWebsiteRelation
      * @param ProductRepository $productRepository
      * @param ProductScopeRewriteGenerator $productScopeRewriteGenerator
-     * @param DbStorage $dbStorage
+     * @param DeleteEntitiesFromStores $deleteEntitiesFromStores
      */
     public function __construct(
         ProductUrlRewriteGenerator $productUrlRewriteGenerator,
@@ -87,7 +86,7 @@ public function __construct(
         StoreWebsiteRelationInterface $storeWebsiteRelation,
         ProductRepository $productRepository,
         ProductScopeRewriteGenerator $productScopeRewriteGenerator,
-        DbStorage $dbStorage
+        DeleteEntitiesFromStores $deleteEntitiesFromStores
     ) {
         $this->productUrlRewriteGenerator = $productUrlRewriteGenerator;
         $this->urlPersist = $urlPersist;
@@ -96,7 +95,7 @@ public function __construct(
         $this->storeWebsiteRelation = $storeWebsiteRelation;
         $this->productRepository = $productRepository;
         $this->productScopeRewriteGenerator = $productScopeRewriteGenerator;
-        $this->dbStorage = $dbStorage;
+        $this->deleteEntitiesFromStores = $deleteEntitiesFromStores;
     }
 
     /**
@@ -152,7 +151,7 @@ public function execute(Observer $observer)
                 }
             }
             if (count($storeIdsToRemove)) {
-                $this->dbStorage->deleteEntitiesFromStores(
+                $this->deleteEntitiesFromStores->execute(
                     $storeIdsToRemove,
                     [$product->getId()],
                     ProductUrlRewriteGenerator::ENTITY_TYPE

app/code/Magento/CatalogUrlRewrite/Plugin/ProductProcessUrlRewriteRemovingPlugin.php

@@ -13,7 +13,7 @@
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Store\Api\StoreWebsiteRelationInterface;
 use Magento\Store\Model\Store;
-use Magento\UrlRewrite\Model\Storage\DbStorage;
+use Magento\UrlRewrite\Model\Storage\DeleteEntitiesFromStores;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
 
 /**
@@ -46,29 +46,29 @@ class ProductProcessUrlRewriteRemovingPlugin
     private $productUrlRewriteGenerator;
 
     /**
-     * @var DbStorage $dbStorage
+     * @var DeleteEntitiesFromStores $deleteEntitiesFromStores
      */
-    private $dbStorage;
+    private $deleteEntitiesFromStores;
 
     /**
      * @param ProductRepositoryInterface $productRepository
      * @param StoreWebsiteRelationInterface $storeWebsiteRelation
      * @param UrlPersistInterface $urlPersist
      * @param ProductUrlRewriteGenerator $productUrlRewriteGenerator
-     * @param DbStorage $dbStorage
+     * @param DeleteEntitiesFromStores $deleteEntitiesFromStores
      */
     public function __construct(
         ProductRepositoryInterface $productRepository,
         StoreWebsiteRelationInterface $storeWebsiteRelation,
         UrlPersistInterface $urlPersist,
         ProductUrlRewriteGenerator $productUrlRewriteGenerator,
-        DbStorage $dbStorage
+        DeleteEntitiesFromStores $deleteEntitiesFromStores
     ) {
         $this->productRepository = $productRepository;
         $this->storeWebsiteRelation = $storeWebsiteRelation;
         $this->urlPersist = $urlPersist;
         $this->productUrlRewriteGenerator = $productUrlRewriteGenerator;
-        $this->dbStorage = $dbStorage;
+        $this->deleteEntitiesFromStores = $deleteEntitiesFromStores;
     }
 
     /**
@@ -109,14 +109,14 @@ public function afterUpdateWebsites(
 
         $storeIdsToRemove = [];
         // Remove the URLs from websites this product no longer belongs to
-        if ($type == "remove" && $websiteIds && $productIds) {
+        if ($type === "remove" && $websiteIds && $productIds) {
             foreach ($websiteIds as $webId) {
                 foreach ($this->storeWebsiteRelation->getStoreByWebsiteId($webId) as $storeid) {
                     $storeIdsToRemove[] = $storeid;
                 }
             }
             if (count($storeIdsToRemove)) {
-                $this->dbStorage->deleteEntitiesFromStores(
+                $this->deleteEntitiesFromStores->execute(
                     $storeIdsToRemove,
                     $productIds,
                     ProductUrlRewriteGenerator::ENTITY_TYPE

app/code/Magento/UrlRewrite/Model/Storage/DeleteEntitiesFromStores.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\UrlRewrite\Model\Storage;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+
+/**
+ * Class DeleteEntitiesFromStores
+ *
+ * Deletes multiple URL Rewrites from database
+ */
+class DeleteEntitiesFromStores
+{
+    /**
+     * @var AdapterInterface $connection
+     */
+    private $connection;
+
+    /**
+     * @var Resource $resource
+     */
+    private $resource;
+
+    /**
+     * @param ResourceConnection $resource
+     */
+    public function __construct(
+        ResourceConnection $resource
+    ) {
+        $this->connection = $resource->getConnection();
+        $this->resource = $resource;
+    }
+
+    /**
+     * Function execute
+     *
+     * Deletes multiple URL Rewrites from database
+     *
+     * @param array $storeIds
+     * @param array $entityIds
+     * @param int $entityType
+     */
+    public function execute($storeIds, $entityIds, $entityType)
+    {
+        $select = $this->connection->select();
+        $select->from($this->resource->getTableName(DbStorage::TABLE_NAME));
+
+        $select->where(
+            $this->connection->quoteIdentifier(
+                UrlRewrite::STORE_ID
+            ) . ' IN (' . $this->connection->quote($storeIds, 'INTEGER') . ')' .
+            ' AND ' . $this->connection->quoteIdentifier(
+                UrlRewrite::ENTITY_ID
+            ) . ' IN (' . $this->connection->quote($entityIds, 'INTEGER') . ')' .
+            ' AND ' . $this->connection->quoteIdentifier(
+                UrlRewrite::ENTITY_TYPE
+            ) . ' = ' . $this->connection->quote($entityType)
+        );
+        $select = $select->deleteFromSelect($this->resource->getTableName(DbStorage::TABLE_NAME));
+        $this->connection->query($select);
+    }
+}