Merge pull request #11 from Vendic/bugfix/MAXFEA-160-check-existing-layout-updates

Exclude db layout updates from remove

Author: artem-lytvynenko-ven

Model/LayoutUpdateFetcher.php

@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * @copyright   Copyright (c) Vendic B.V https://vendic.nl/
+ */
+
+declare(strict_types=1);
+
+namespace Vendic\OptimizeCacheSize\Model;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Select;
+
+readonly class LayoutUpdateFetcher
+{
+    public function __construct(
+        private ResourceConnection $resourceConnection
+    ) {
+    }
+
+    public function fetchDbLayoutHandlers(array $handler, string $themeId, string $storeId): array
+    {
+        $connection = $this->resourceConnection->getConnection();
+
+        $select = $connection->select()->from(
+            ['layout_update' => $connection->getTableName('layout_update')],
+            ['handle']
+        )->join(
+            ['link' => $connection->getTableName('layout_link')],
+            'link.layout_update_id=layout_update.layout_update_id',
+            ''
+        )->where(
+            'link.store_id IN (0, ?)',
+            $storeId
+        )->where(
+            'link.theme_id = ?',
+            $themeId
+        )->where(
+            'handle IN (?)',
+            $handler
+        )->order(
+            'layout_update.sort_order ' . Select::SQL_ASC
+        );
+
+        return $connection->fetchCol($select);
+    }
+}

Plugin/RemoveHandlersPlugin.php

@@ -6,21 +6,35 @@
 
 namespace Vendic\OptimizeCacheSize\Plugin;
 
+use Magento\Framework\App\ScopeInterface;
+use Magento\Framework\View\DesignInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\View\Layout\ProcessorInterface;
 use Vendic\OptimizeCacheSize\Model\Config;
+use Magento\Widget\Model\ResourceModel\Layout\Update;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Vendic\OptimizeCacheSize\Model\LayoutUpdateFetcher;
 
 class RemoveHandlersPlugin
 {
 
-    private const PRODUCT_ID_HANDLER_STRING = 'catalog_product_view_id_';
-    private const PRODUCT_SKU_HANDLER_STRING = 'catalog_product_view_sku_';
-    private const CATEGORY_ID_HANDLER_STRING = 'catalog_category_view_id_';
+    private const string PRODUCT_ID_HANDLER_STRING = 'catalog_product_view_id_';
+    private const string PRODUCT_SKU_HANDLER_STRING = 'catalog_product_view_sku_';
+    private const string CATEGORY_ID_HANDLER_STRING = 'catalog_category_view_id_';
 
     public function __construct(
-        private Config $config
+        private readonly Config $config,
+        private readonly LayoutUpdateFetcher $layoutUpdateFetcher,
+        private readonly StoreManagerInterface $storeManager,
+        private readonly DesignInterface $design
     ) {
     }
 
+    /**
+     * @throws NoSuchEntityException
+     * @throws LocalizedException
+     */
     public function afterAddHandle(
         ProcessorInterface $subject,
         ProcessorInterface $result,
@@ -29,20 +43,37 @@ public function afterAddHandle(
         if (!$this->config->isModuleEnabled()) {
             return $result;
         }
+
+        $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)) {
+            if (
+                $this->config->isRemoveCategoryIdHandlers()
+                && str_contains($handler, self::CATEGORY_ID_HANDLER_STRING)
+                && !in_array($handler, $dbLayoutHandlers)
+            ) {
                 $result->removeHandle($handler);
                 continue;
             }
-            if ($this->config->isRemoveProductIdHandlers()
-                && str_contains($handler, self::PRODUCT_ID_HANDLER_STRING)) {
+
+            if (
+                $this->config->isRemoveProductIdHandlers()
+                && str_contains($handler, self::PRODUCT_ID_HANDLER_STRING)
+                && !in_array($handler, $dbLayoutHandlers)
+            ) {
                 $result->removeHandle($handler);
                 continue;
             }
-            if ($this->config->isRemoveProductSkuHandlers()
-                && str_contains($handler, self::PRODUCT_SKU_HANDLER_STRING)) {
+
+            if (
+                $this->config->isRemoveProductSkuHandlers()
+                && str_contains($handler, self::PRODUCT_SKU_HANDLER_STRING)
+                && !in_array($handler, $dbLayoutHandlers)
+            ) {
                 $result->removeHandle($handler);
             }
         }