Merge remote-tracking branch 'tango/MAGETWO-97210' into TANGO-PR-2019-2.3

Author: dhorytskyi

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

@@ -87,15 +87,15 @@ protected function prepareSelect(array $data)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function doFindAllByData(array $data)
     {
         return $this->connection->fetchAll($this->prepareSelect($data));
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function doFindOneByData(array $data)
     {
@@ -161,26 +161,22 @@ private function deleteOldUrls(array $urls): void
         $oldUrlsSelect->from(
             $this->resource->getTableName(self::TABLE_NAME)
         );
-        /** @var UrlRewrite $url */
-        foreach ($urls as $url) {
-            $oldUrlsSelect->orWhere(
-                $this->connection->quoteIdentifier(
-                    UrlRewrite::ENTITY_TYPE
-                ) . ' = ?',
-                $url->getEntityType()
-            );
-            $oldUrlsSelect->where(
-                $this->connection->quoteIdentifier(
-                    UrlRewrite::ENTITY_ID
-                ) . ' = ?',
-                $url->getEntityId()
-            );
-            $oldUrlsSelect->where(
-                $this->connection->quoteIdentifier(
-                    UrlRewrite::STORE_ID
-                ) . ' = ?',
-                $url->getStoreId()
-            );
+
+        $uniqueEntities = $this->prepareUniqueEntities($urls);
+        foreach ($uniqueEntities as $storeId => $entityTypes) {
+            foreach ($entityTypes as $entityType => $entities) {
+                $oldUrlsSelect->orWhere(
+                    $this->connection->quoteIdentifier(
+                        UrlRewrite::STORE_ID
+                    ) . ' = ' . $this->connection->quote($storeId, 'INTEGER') .
+                    ' AND ' . $this->connection->quoteIdentifier(
+                        UrlRewrite::ENTITY_ID
+                    ) . ' IN (' . $this->connection->quote($entities, 'INTEGER') . ')' .
+                    ' AND ' . $this->connection->quoteIdentifier(
+                        UrlRewrite::ENTITY_TYPE
+                    ) . ' = ' . $this->connection->quote($entityType)
+                );
+            }
         }
 
         // prevent query locking in a case when nothing to delete
@@ -198,6 +194,28 @@ private function deleteOldUrls(array $urls): void
         }
     }
 
+    /**
+     * Prepare array with unique entities
+     *
+     * @param UrlRewrite[] $urls
+     * @return array
+     */
+    private function prepareUniqueEntities(array $urls): array
+    {
+        $uniqueEntities = [];
+        /** @var UrlRewrite $url */
+        foreach ($urls as $url) {
+            $entityIds = (!empty($uniqueEntities[$url->getStoreId()][$url->getEntityType()])) ?
+                $uniqueEntities[$url->getStoreId()][$url->getEntityType()] : [];
+
+            if (!\in_array($url->getEntityId(), $entityIds)) {
+                $entityIds[] = $url->getEntityId();
+            }
+            $uniqueEntities[$url->getStoreId()][$url->getEntityType()] = $entityIds;
+        }
+        return $uniqueEntities;
+    }
+
     /**
      * @inheritDoc
      */
@@ -289,7 +307,7 @@ protected function createFilterDataBasedOnUrls($urls)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function deleteByData(array $data)
     {

app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php

@@ -445,7 +445,6 @@ public function testReplace()
         $urlSecond = $this->createMock(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class);
 
         // delete
-
         $urlFirst->expects($this->any())
             ->method('getEntityType')
             ->willReturn('product');
@@ -479,10 +478,6 @@ public function testReplace()
             ->with(DbStorage::TABLE_NAME)
             ->will($this->returnValue('table_name'));
 
-        $this->connectionMock->expects($this->any())
-            ->method('query')
-            ->with('sql delete query');
-
         // insert
 
         $urlFirst->expects($this->any())
@@ -497,10 +492,6 @@ public function testReplace()
             ->with(DbStorage::TABLE_NAME)
             ->will($this->returnValue('table_name'));
 
-        $this->connectionMock->expects($this->once())
-            ->method('insertMultiple')
-            ->with('table_name', [['row1'], ['row2']]);
-
         $this->storage->replace([$urlFirst, $urlSecond]);
     }