ENGCOM-7974: Fix Replace nestead query with separate queries in the entity filter processor #29422

Author: slavvka

app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Entity.php

@@ -11,7 +11,6 @@
 use Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor\CustomFilterInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Data\Collection\AbstractDb;
-use Magento\Framework\DB\Select;
 
 /**
  * Custom filter to filter collection by entity type
@@ -49,30 +48,36 @@ public function apply(Filter $filter, AbstractDb $collection): bool
         $ids = $filter->getValue();
         if (is_array($ids)) {
             $collection->addFieldToFilter(
-                self::TABLE_ALIAS . '.id',
-                ['in' => $this->getSelectByEntityIds($ids)]
+                [self::TABLE_ALIAS . '.id'],
+                [
+                    ['in' => $this->getSelectByEntityIds($ids)]
+                ]
             );
         }
         return true;
     }
 
     /**
-     * Return select asset ids by entity type
+     * Return asset ids by entity type
      *
      * @param array $ids
-     * @return Select
+     * @return array
      */
-    private function getSelectByEntityIds(array $ids): Select
+    private function getSelectByEntityIds(array $ids): array
     {
-        return $this->connection->getConnection()->select()->from(
-            ['asset_content_table' => $this->connection->getTableName(self::TABLE_MEDIA_CONTENT_ASSET)],
-            ['asset_id']
-        )->where(
-            'entity_type = ?',
-            $this->entityType
-        )->where(
-            'entity_id IN (?)',
-            $ids
+        $connection = $this->connection->getConnection();
+
+        return $connection->fetchAssoc(
+            $connection->select()->from(
+                ['asset_content_table' => $this->connection->getTableName(self::TABLE_MEDIA_CONTENT_ASSET)],
+                ['asset_id']
+            )->where(
+                'entity_type = ?',
+                $this->entityType
+            )->where(
+                'entity_id IN (?)',
+                $ids
+            )
         );
     }
 }

app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Keyword.php

@@ -11,7 +11,6 @@
 use Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor\CustomFilterInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Data\Collection\AbstractDb;
-use Magento\Framework\DB\Select;
 
 class Keyword implements CustomFilterInterface
 {
@@ -59,20 +58,21 @@ public function apply(Filter $filter, AbstractDb $collection): bool
     private function getAssetIdsByKeyword(string $value): array
     {
         $connection = $this->connection->getConnection();
+
         return $connection->fetchAssoc(
             $connection->select()->from(
                 $connection->select()
-                           ->from(
-                               ['asset_keywords_table' => $this->connection->getTableName(self::TABLE_ASSET_KEYWORD)],
-                               ['id']
-                           )->where(
-                               'keyword = ?',
-                               $value
-                           )->joinInner(
-                               ['keywords_table' => $this->connection->getTableName(self::TABLE_KEYWORDS)],
-                               'keywords_table.keyword_id = asset_keywords_table.id',
-                               ['asset_id']
-                           ),
+                    ->from(
+                        ['asset_keywords_table' => $this->connection->getTableName(self::TABLE_ASSET_KEYWORD)],
+                        ['id']
+                    )->where(
+                        'keyword = ?',
+                        $value
+                    )->joinInner(
+                        ['keywords_table' => $this->connection->getTableName(self::TABLE_KEYWORDS)],
+                        'keywords_table.keyword_id = asset_keywords_table.id',
+                        ['asset_id']
+                    ),
                 ['asset_id']
             )
         );