MAGETWO-70726: [GITHUB] [2.1] Store View Language switch leads to 404 on some cases #5416

Author: Oleksandr Gorkun

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

@@ -12,47 +12,37 @@
 class DbStorage extends BaseDbStorage
 {
     /**
-     * @param array $data
-     * @return \Magento\Framework\DB\Select
+     * {@inheritDoc}
      */
     protected function prepareSelect(array $data)
     {
-        if (!array_key_exists(UrlRewrite::ENTITY_ID, $data)
-            || !array_key_exists(UrlRewrite::ENTITY_TYPE, $data)
-            || !array_key_exists(UrlRewrite::STORE_ID, $data)
-        ) {
-            throw new \InvalidArgumentException(
-                UrlRewrite::ENTITY_ID . ', ' . UrlRewrite::ENTITY_TYPE
-                . ' and ' . UrlRewrite::STORE_ID . ' parameters are required.'
-            );
+        $metadata = [];
+        if (array_key_exists(UrlRewrite::METADATA, $data)) {
+            $metadata = $data[UrlRewrite::METADATA];
+            unset($data[UrlRewrite::METADATA]);
         }
 
         $select = $this->connection->select();
-        $select->from(['url_rewrite' => $this->resource->getTableName('url_rewrite')])
-            ->joinLeft(
-                ['relation' => $this->resource->getTableName(Product::TABLE_NAME)],
-                'url_rewrite.url_rewrite_id = relation.url_rewrite_id'
-            )
-            ->where(
-                'url_rewrite.entity_id IN (?)',
-                $data[UrlRewrite::ENTITY_ID]
-            )
-            ->where(
-                'url_rewrite.entity_type = ?',
-                $data[UrlRewrite::ENTITY_TYPE]
-            )
-            ->where('url_rewrite.store_id IN (?)', $data[UrlRewrite::STORE_ID]);
-        if (array_key_exists(UrlRewrite::REDIRECT_TYPE, $data)) {
-            $select->where(
-                'url_rewrite.redirect_type = ?',
-                $data[UrlRewrite::REDIRECT_TYPE]
-            );
+        $select->from([
+            'url_rewrite' => $this->resource->getTableName(self::TABLE_NAME)
+        ]);
+        $select->joinLeft(
+            ['relation' => $this->resource->getTableName(Product::TABLE_NAME)],
+            'url_rewrite.url_rewrite_id = relation.url_rewrite_id'
+        );
+
+        foreach ($data as $column => $value) {
+            $select->where('url_rewrite.' . $column . ' IN (?)', $value);
         }
-        if (empty($data[UrlRewrite::METADATA]['category_id'])) {
+        if (empty($metadata['category_id'])) {
             $select->where('relation.category_id IS NULL');
         } else {
-            $select->where('relation.category_id = ?', $data[UrlRewrite::METADATA]['category_id']);
+            $select->where(
+                'relation.category_id = ?',
+                $metadata['category_id']
+            );
         }
+
         return $select;
     }
 }

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

@@ -89,18 +89,6 @@ protected function setUp()
 
     public function testPrepareSelect()
     {
-        //Not passing requried parameters.
-        try {
-            $this->storage->findOneByData(['SomeOtherParam'=>42]);
-            $this->fail('Didn\'t ask for required parameters');
-        } catch (\InvalidArgumentException $exception) {
-            $this->assertEquals(
-                UrlRewrite::ENTITY_ID . ', ' . UrlRewrite::ENTITY_TYPE
-                . ' and ' . UrlRewrite::STORE_ID . ' parameters are required.',
-                $exception->getMessage()
-            );
-        }
-
         //Passing expected parameters, checking select built.
         $entityType = 'custom';
         $entityId= 42;
@@ -116,7 +104,7 @@ public function testPrepareSelect()
         $this->select
             ->expects($this->at(3))
             ->method('where')
-            ->with('url_rewrite.entity_type = ?', $entityType)
+            ->with('url_rewrite.entity_type IN (?)', $entityType)
             ->willReturn($this->select);
         $this->select
             ->expects($this->at(4))
@@ -126,7 +114,7 @@ public function testPrepareSelect()
         $this->select
             ->expects($this->at(5))
             ->method('where')
-            ->with('url_rewrite.redirect_type = ?', $redirectType)
+            ->with('url_rewrite.redirect_type IN (?)', $redirectType)
             ->willReturn($this->select);
         $this->select
             ->expects($this->at(6))