MAGETWO-90331: [Magento Cloud] Custom URL rewrites of a product get deleted in multi store views

Author: zakdma

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

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\UrlRewrite\Model\Storage;
 
 use Magento\Framework\Api\DataObjectHelper;
@@ -12,7 +13,8 @@
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory;
 use Psr\Log\LoggerInterface;
-use Magento\UrlRewrite\Service\V1\Data\UrlRewrite as UrlRewriteData;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DB\Adapter\AdapterInterface;
 
 /**
  * Url rewrites DB storage.
@@ -32,7 +34,7 @@ class DbStorage extends AbstractStorage
     const ERROR_CODE_DUPLICATE_ENTRY = 1062;
 
     /**
-     * @var \Magento\Framework\DB\Adapter\AdapterInterface
+     * @var AdapterInterface
      */
     protected $connection;
 
@@ -47,9 +49,9 @@ class DbStorage extends AbstractStorage
     private $logger;
 
     /**
-     * @param \Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory $urlRewriteFactory
+     * @param UrlRewriteFactory $urlRewriteFactory
      * @param DataObjectHelper $dataObjectHelper
-     * @param \Magento\Framework\App\ResourceConnection $resource
+     * @param ResourceConnection $resource
      * @param LoggerInterface|null $logger
      */
     public function __construct(
@@ -60,7 +62,7 @@ public function __construct(
     ) {
         $this->connection = $resource->getConnection();
         $this->resource = $resource;
-        $this->logger = $logger ?: \Magento\Framework\App\ObjectManager::getInstance()
+        $this->logger = $logger ?: ObjectManager::getInstance()
             ->get(LoggerInterface::class);
 
         parent::__construct($urlRewriteFactory, $dataObjectHelper);
@@ -70,7 +72,7 @@ public function __construct(
      * Prepare select statement for specific filter
      *
      * @param array $data
-     * @return \Magento\Framework\DB\Select
+     * @return Select
      */
     protected function prepareSelect(array $data)
     {
@@ -80,6 +82,7 @@ protected function prepareSelect(array $data)
         foreach ($data as $column => $value) {
             $select->where($this->connection->quoteIdentifier($column) . ' IN (?)', $value);
         }
+
         return $select;
     }
 
@@ -214,12 +217,12 @@ protected function doReplace(array $urls)
             foreach ($urls as $url) {
                 $urlFound = $this->doFindOneByData(
                     [
-                        UrlRewriteData::REQUEST_PATH => $url->getRequestPath(),
-                        UrlRewriteData::STORE_ID => $url->getStoreId(),
+                        UrlRewrite::REQUEST_PATH => $url->getRequestPath(),
+                        UrlRewrite::STORE_ID => $url->getStoreId(),
                     ]
                 );
-                if (isset($urlFound[UrlRewriteData::URL_REWRITE_ID])) {
-                    $urlConflicted[$urlFound[UrlRewriteData::URL_REWRITE_ID]] = $url->toArray();
+                if (isset($urlFound[UrlRewrite::URL_REWRITE_ID])) {
+                    $urlConflicted[$urlFound[UrlRewrite::URL_REWRITE_ID]] = $url->toArray();
                 }
             }
             if ($urlConflicted) {
@@ -281,6 +284,7 @@ protected function createFilterDataBasedOnUrls($urls)
                 }
             }
         }
+
         return $data;
     }