BpConfig: Add method applyDbStates() to clean-up redundant code

sukhwinder33445 · lippserd · commit e99bb0d26c74 · 2026-03-25T12:24:02.000+01:00
diff --git a/application/clicommands/CleanupCommand.php b/application/clicommands/CleanupCommand.php
@@ -7,12 +7,8 @@
 
 use Exception;
 use Icinga\Application\Logger;
-use Icinga\Application\Modules\Module;
 use Icinga\Cli\Command;
 use Icinga\Module\Businessprocess\Modification\NodeRemoveAction;
-use Icinga\Module\Businessprocess\ProvidedHook\Icingadb\IcingadbSupport;
-use Icinga\Module\Businessprocess\State\IcingaDbState;
-use Icinga\Module\Businessprocess\State\MonitoringState;
 use Icinga\Module\Businessprocess\Storage\LegacyStorage;
 
 class CleanupCommand extends Command
@@ -62,14 +58,7 @@ public function cleanupAction(): void
                 continue;
             }
 
-            if (
-                Module::exists('icingadb')
-                && (! $bp->hasBackendName() && IcingadbSupport::useIcingaDbAsBackend())
-            ) {
-                IcingaDbState::apply($bp);
-            } else {
-                MonitoringState::apply($bp);
-            }
+            $bp->applyDbStates();
 
             $removedNodes = [];
             foreach (array_keys($bp->getMissingChildren()) as $missingNode) {
diff --git a/application/clicommands/ProcessCommand.php b/application/clicommands/ProcessCommand.php
@@ -7,16 +7,12 @@
 
 use Exception;
 use Icinga\Application\Logger;
-use Icinga\Application\Modules\Module;
 use Icinga\Cli\Command;
 use Icinga\Module\Businessprocess\BpConfig;
 use Icinga\Module\Businessprocess\BpNode;
 use Icinga\Module\Businessprocess\HostNode;
 use Icinga\Module\Businessprocess\Node;
-use Icinga\Module\Businessprocess\ProvidedHook\Icingadb\IcingadbSupport;
 use Icinga\Module\Businessprocess\ServiceNode;
-use Icinga\Module\Businessprocess\State\IcingaDbState;
-use Icinga\Module\Businessprocess\State\MonitoringState;
 use Icinga\Module\Businessprocess\Storage\LegacyStorage;
 
 class ProcessCommand extends Command
@@ -139,14 +135,7 @@ public function checkAction()
         try {
             /** @var BpNode $node */
             $node = $bp->getNode($nodeName);
-            if (
-                Module::exists('icingadb')
-                && (! $bp->hasBackendName() && IcingadbSupport::useIcingaDbAsBackend())
-            ) {
-                IcingaDbState::apply($bp);
-            } else {
-                MonitoringState::apply($bp);
-            }
+            $bp->applyDbStates();
 
             if ($bp->hasErrors()) {
                 Logger::error("Checking Business Process '%s' failed: %s\n", $name, $bp->getErrors());
diff --git a/application/controllers/NodeController.php b/application/controllers/NodeController.php
@@ -6,13 +6,9 @@
 namespace Icinga\Module\Businessprocess\Controllers;
 
 use Exception;
-use Icinga\Application\Modules\Module;
-use Icinga\Module\Businessprocess\ProvidedHook\Icingadb\IcingadbSupport;
 use Icinga\Module\Businessprocess\Renderer\Breadcrumb;
 use Icinga\Module\Businessprocess\Renderer\TileRenderer;
 use Icinga\Module\Businessprocess\Simulation;
-use Icinga\Module\Businessprocess\State\IcingaDbState;
-use Icinga\Module\Businessprocess\State\MonitoringState;
 use Icinga\Module\Businessprocess\Web\Controller;
 use Icinga\Module\Businessprocess\Web\Url;
 use ipl\Html\Html;
@@ -98,14 +94,7 @@ public function impactAction()
                 continue;
             }
 
-            if (
-                Module::exists('icingadb') &&
-                (! $config->getBackendName() && IcingadbSupport::useIcingaDbAsBackend())
-            ) {
-                IcingaDbState::apply($config);
-            } else {
-                MonitoringState::apply($config);
-            }
+            $config->applyDbStates();
             $config->applySimulation($simulation);
 
             foreach ($parents as $parentAndPath) {
diff --git a/application/controllers/ProcessController.php b/application/controllers/ProcessController.php
@@ -5,21 +5,17 @@
 
 namespace Icinga\Module\Businessprocess\Controllers;
 
-use Icinga\Application\Modules\Module;
 use Icinga\Date\DateFormatter;
 use Icinga\Module\Businessprocess\BpConfig;
 use Icinga\Module\Businessprocess\BpNode;
 use Icinga\Module\Businessprocess\Forms\AddNodeForm;
 use Icinga\Module\Businessprocess\Forms\EditNodeForm;
 use Icinga\Module\Businessprocess\Node;
-use Icinga\Module\Businessprocess\ProvidedHook\Icingadb\IcingadbSupport;
 use Icinga\Module\Businessprocess\Renderer\Breadcrumb;
 use Icinga\Module\Businessprocess\Renderer\Renderer;
 use Icinga\Module\Businessprocess\Renderer\TileRenderer;
 use Icinga\Module\Businessprocess\Renderer\TreeRenderer;
 use Icinga\Module\Businessprocess\Simulation;
-use Icinga\Module\Businessprocess\State\IcingaDbState;
-use Icinga\Module\Businessprocess\State\MonitoringState;
 use Icinga\Module\Businessprocess\Storage\ConfigDiff;
 use Icinga\Module\Businessprocess\Storage\LegacyConfigRenderer;
 use Icinga\Module\Businessprocess\Web\Component\ActionBar;
@@ -97,14 +93,7 @@ public function showAction()
         $bp = $this->loadModifiedBpConfig();
         $node = $this->getNode($bp);
 
-        if (
-            Module::exists('icingadb') &&
-            (! $bp->hasBackendName() && IcingadbSupport::useIcingaDbAsBackend())
-        ) {
-            IcingaDbState::apply($bp);
-        } else {
-            MonitoringState::apply($bp);
-        }
+        $bp->applyDbStates();
 
         $this->handleSimulations($bp);
 
diff --git a/library/Businessprocess/BpConfig.php b/library/Businessprocess/BpConfig.php
@@ -157,6 +157,23 @@ public function getMetadata()
         return $this->metadata;
     }
 
+    /**
+     * Apply database states
+     *
+     * @return void
+     */
+    public function applyDbStates(): void
+    {
+        if (
+            Module::exists('icingadb')
+            && (! $this->hasBackendName() && IcingadbSupport::useIcingaDbAsBackend())
+        ) {
+            IcingaDbState::apply($this);
+        } else {
+            MonitoringState::apply($this);
+        }
+    }
+
     /**
      * Set metadata
      *
@@ -179,14 +196,7 @@ public function setMetadata(Metadata $metadata)
      */
     public function applyChanges(ProcessChanges $changes)
     {
-        if (
-            Module::exists('icingadb')
-            && (! $this->hasBackendName() && IcingadbSupport::useIcingaDbAsBackend())
-        ) {
-            IcingaDbState::apply($this);
-        } else {
-            MonitoringState::apply($this);
-        }
+        $this->applyDbStates();
 
         $cnt = 0;
         foreach ($changes->getChanges() as $change) {
diff --git a/library/Businessprocess/Web/Component/Dashboard.php b/library/Businessprocess/Web/Component/Dashboard.php
@@ -6,12 +6,8 @@
 namespace Icinga\Module\Businessprocess\Web\Component;
 
 use Exception;
-use Icinga\Application\Modules\Module;
 use Icinga\Authentication\Auth;
 use Icinga\Module\Businessprocess\BpConfig;
-use Icinga\Module\Businessprocess\ProvidedHook\Icingadb\IcingadbSupport;
-use Icinga\Module\Businessprocess\State\IcingaDbState;
-use Icinga\Module\Businessprocess\State\MonitoringState;
 use Icinga\Module\Businessprocess\Storage\Storage;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
@@ -112,14 +108,7 @@ protected function __construct(Auth $auth, Storage $storage)
                 continue;
             }
 
-            if (
-                Module::exists('icingadb') &&
-                (! $bp->hasBackendName() && IcingadbSupport::useIcingaDbAsBackend())
-            ) {
-                IcingaDbState::apply($bp);
-            } else {
-                MonitoringState::apply($bp);
-            }
+            $bp->applyDbStates();
 
             $this->add(new BpDashboardTile(
                 $bp,
diff --git a/library/Businessprocess/Web/Component/DashboardFullscreen.php b/library/Businessprocess/Web/Component/DashboardFullscreen.php
@@ -6,12 +6,7 @@
 namespace Icinga\Module\Businessprocess\Web\Component;
 
 use Exception;
-use Icinga\Application\Modules\Module;
-use Icinga\Authentication\Auth;
 use Icinga\Module\Businessprocess\BpConfig;
-use Icinga\Module\Businessprocess\ProvidedHook\Icingadb\IcingadbSupport;
-use Icinga\Module\Businessprocess\State\IcingaDbState;
-use Icinga\Module\Businessprocess\State\MonitoringState;
 use Icinga\Module\Businessprocess\Storage\Storage;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
@@ -69,14 +64,7 @@ protected function assemble()
                 continue;
             }
 
-            if (
-                Module::exists('icingadb') &&
-                (! $bp->hasBackendName() && IcingadbSupport::useIcingaDbAsBackend())
-            ) {
-                IcingaDbState::apply($bp);
-            } else {
-                MonitoringState::apply($bp);
-            }
+            $bp->applyDbStates();
 
             $this->add(new BpDashboardFullscreenTile(
                 $bp,
diff --git a/library/Businessprocess/Web/Form/Validator/HostServiceTermValidator.php b/library/Businessprocess/Web/Form/Validator/HostServiceTermValidator.php
@@ -8,9 +8,6 @@
 use Icinga\Module\Businessprocess\BpConfig;
 use Icinga\Module\Businessprocess\BpNode;
 use Icinga\Module\Businessprocess\ServiceNode;
-use Icinga\Module\Businessprocess\State\IcingaDbState;
-use Icinga\Module\Businessprocess\State\MonitoringState;
-use Icinga\Module\Monitoring\Backend\MonitoringBackend;
 use ipl\I18n\Translation;
 use ipl\Validator\BaseValidator;
 use ipl\Web\FormElement\TermInput\Term;
@@ -72,11 +69,7 @@ public function isValid($terms)
             }
         }
 
-        if ($testConfig->getBackend() instanceof MonitoringBackend) {
-            MonitoringState::apply($testConfig);
-        } else {
-            IcingaDbState::apply($testConfig);
-        }
+        $testConfig->applyDbStates();
 
         foreach ($terms as $term) {
             /** @var Term $term */
diff --git a/library/Businessprocess/Web/Navigation/Renderer/ProcessesProblemsBadge.php b/library/Businessprocess/Web/Navigation/Renderer/ProcessesProblemsBadge.php
@@ -6,11 +6,7 @@
 namespace Icinga\Module\Businessprocess\Web\Navigation\Renderer;
 
 use Icinga\Application\Logger;
-use Icinga\Application\Modules\Module;
 use Icinga\Module\Businessprocess\Node;
-use Icinga\Module\Businessprocess\ProvidedHook\Icingadb\IcingadbSupport;
-use Icinga\Module\Businessprocess\State\IcingaDbState;
-use Icinga\Module\Businessprocess\State\MonitoringState;
 use Icinga\Module\Businessprocess\Storage\LegacyStorage;
 use Icinga\Web\Navigation\Renderer\BadgeNavigationItemRenderer;
 use Throwable;
@@ -35,14 +31,7 @@ public function getCount()
 
                 foreach ($storage->listProcessNames() as $processName) {
                     $bp = $storage->loadProcess($processName);
-                    if (
-                        Module::exists('icingadb') &&
-                        (! $bp->hasBackendName() && IcingadbSupport::useIcingaDbAsBackend())
-                    ) {
-                        IcingaDbState::apply($bp);
-                    } else {
-                        MonitoringState::apply($bp);
-                    }
+                    $bp->applyDbStates();
 
                     foreach ($bp->getRootNodes() as $rootNode) {
                         $nodeState = $rootNode->getState();
