Optimize db layouts load

Author: artem-lytvynenko-ven

Model/LayoutUpdateFetcher.php

@@ -18,16 +18,10 @@ public function __construct(
     ) {
     }
 
-    public function isDbLayoutHandler(string $handler, string $themeId, string $storeId): bool
+    public function fetchDbLayoutHandlers(array $handler, string $themeId, string $storeId): array
     {
         $connection = $this->resourceConnection->getConnection();
 
-        $bind = [
-            'theme_id' => $themeId,
-            'store_id' => $storeId,
-            'handle' => $handler,
-        ];
-
         $select = $connection->select()->from(
             ['layout_update' => $connection->getTableName('layout_update')],
             ['handle']
@@ -36,15 +30,18 @@ public function isDbLayoutHandler(string $handler, string $themeId, string $stor
             'link.layout_update_id=layout_update.layout_update_id',
             ''
         )->where(
-            'link.store_id IN (0, :store_id)'
+            'link.store_id IN (0, ?)',
+            $storeId
         )->where(
-            'link.theme_id = :theme_id'
+            'link.theme_id = ?',
+            $themeId
         )->where(
-            'handle = :handle'
+            'handle IN (?)',
+            $handler
         )->order(
             'layout_update.sort_order ' . Select::SQL_ASC
         );
 
-        return (bool)$connection->fetchOne($select, $bind);
+        return $connection->fetchCol($select);
     }
 }

Plugin/RemoveHandlersPlugin.php

@@ -47,11 +47,14 @@ public function afterAddHandle(
         $store = (string)$this->storeManager->getStore()->getId();
         $theme = (string)$this->design->getDesignTheme()->getId();
         $handlers = $result->getHandles();
+
+        $dbLayoutHandlers = $this->layoutUpdateFetcher->fetchDbLayoutHandlers($handlers, $theme, $store);
+
         foreach ($handlers as $handler) {
             if (
                 $this->config->isRemoveCategoryIdHandlers()
                 && str_contains($handler, self::CATEGORY_ID_HANDLER_STRING)
-                && !$this->layoutUpdateFetcher->isDbLayoutHandler($handler, $theme, $store)
+                && !in_array($handler, $dbLayoutHandlers)
             ) {
                 $result->removeHandle($handler);
                 continue;
@@ -60,7 +63,7 @@ public function afterAddHandle(
             if (
                 $this->config->isRemoveProductIdHandlers()
                 && str_contains($handler, self::PRODUCT_ID_HANDLER_STRING)
-                && !$this->layoutUpdateFetcher->isDbLayoutHandler($handler, $theme, $store)
+                && !in_array($handler, $dbLayoutHandlers)
             ) {
                 $result->removeHandle($handler);
                 continue;
@@ -69,6 +72,7 @@ public function afterAddHandle(
             if (
                 $this->config->isRemoveProductSkuHandlers()
                 && str_contains($handler, self::PRODUCT_SKU_HANDLER_STRING)
+                && !in_array($handler, $dbLayoutHandlers)
             ) {
                 $result->removeHandle($handler);
             }