Don't require relation state in state summarie queries

Lets the models add the relation on their own, using `utilize()` as the relation is only needed inside expressions.
Icinga · May 20, 2022 · 854151f · 854151f
1 parent 12624b3
commit 854151f
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 11 deletions.
diff --git a/application/controllers/HealthController.php b/application/controllers/HealthController.php
@@ -26,8 +26,8 @@ public function indexAction()
         $db = $this->getDb();
 
         $instance = Instance::on($db)->with('endpoint');
-        $hoststateSummary = HoststateSummary::on($db)->with('state');
-        $servicestateSummary = ServicestateSummary::on($db)->with('state');
+        $hoststateSummary = HoststateSummary::on($db);
+        $servicestateSummary = ServicestateSummary::on($db);
 
         $this->applyRestrictions($hoststateSummary);
         $this->applyRestrictions($servicestateSummary);

diff --git a/application/controllers/HostController.php b/application/controllers/HostController.php
@@ -63,7 +63,7 @@ public function init()
 
     public function indexAction()
     {
-        $serviceSummary = ServicestateSummary::on($this->getDb())->with('state');
+        $serviceSummary = ServicestateSummary::on($this->getDb());
         $serviceSummary->filter(Filter::equal('service.host_id', $this->host->id));
 
         $this->applyRestrictions($serviceSummary);

diff --git a/application/controllers/HostsController.php b/application/controllers/HostsController.php
@@ -48,7 +48,7 @@ public function indexAction()
 
         $summary = null;
         if (! $compact) {
-            $summary = HoststateSummary::on($db)->with('state');
+            $summary = HoststateSummary::on($db);
         }
 
         $limitControl = $this->createLimitControl();
@@ -226,7 +226,7 @@ protected function getCommandTargetsUrl(): Url
 
     protected function getFeatureStatus()
     {
-        $summary = HoststateSummary::on($this->getDb())->with(['state']);
+        $summary = HoststateSummary::on($this->getDb());
         $this->filter($summary);
 
         return new FeatureStatus('host', $summary->first());

diff --git a/application/controllers/ServicesController.php b/application/controllers/ServicesController.php
@@ -53,7 +53,7 @@ public function indexAction()
 
         $summary = null;
         if (! $compact) {
-            $summary = ServicestateSummary::on($db)->with('state');
+            $summary = ServicestateSummary::on($db);
         }
 
         $limitControl = $this->createLimitControl();
@@ -347,7 +347,7 @@ protected function getCommandTargetsUrl(): Url
 
     protected function getFeatureStatus()
     {
-        $summary = ServicestateSummary::on($this->getDb())->with(['state']);
+        $summary = ServicestateSummary::on($this->getDb());
         $this->filter($summary);
 
         return new FeatureStatus('service', $summary->first());

diff --git a/application/controllers/TacticalController.php b/application/controllers/TacticalController.php
@@ -23,8 +23,8 @@ public function indexAction()
 
         $db = $this->getDb();
 
-        $hoststateSummary = HoststateSummary::on($db)->with('state');
-        $servicestateSummary = ServicestateSummary::on($db)->with(['state']);
+        $hoststateSummary = HoststateSummary::on($db);
+        $servicestateSummary = ServicestateSummary::on($db);
 
         $this->handleSearchRequest($servicestateSummary);
 

diff --git a/library/Icingadb/Model/HoststateSummary.php b/library/Icingadb/Model/HoststateSummary.php
@@ -71,6 +71,7 @@ public static function on(Connection $db)
         /** @var static $m */
         $m = $q->getModel();
         $q->columns($m->getSummaryColumns());
+        $q->utilize('state');
 
         return $q;
     }

diff --git a/library/Icingadb/Model/ServicestateSummary.php b/library/Icingadb/Model/ServicestateSummary.php
@@ -76,6 +76,7 @@ public static function on(Connection $db)
         /** @var static $m */
         $m = $q->getModel();
         $q->columns($m->getSummaryColumns());
+        $q->utilize('state');
 
         return $q;
     }

diff --git a/library/Icingadb/Web/Navigation/Renderer/HostProblemsBadge.php b/library/Icingadb/Web/Navigation/Renderer/HostProblemsBadge.php
@@ -15,7 +15,7 @@ class HostProblemsBadge extends ProblemsBadge
 
     protected function fetchProblemsCount()
     {
-        $summary = HoststateSummary::on($this->getDb())->with('state');
+        $summary = HoststateSummary::on($this->getDb());
         $this->applyRestrictions($summary);
         $count = (int) $summary->first()->hosts_down_unhandled;
         if ($count) {

diff --git a/library/Icingadb/Web/Navigation/Renderer/ServiceProblemsBadge.php b/library/Icingadb/Web/Navigation/Renderer/ServiceProblemsBadge.php
@@ -15,7 +15,7 @@ class ServiceProblemsBadge extends ProblemsBadge
 
     protected function fetchProblemsCount()
     {
-        $summary = ServicestateSummary::on($this->getDb())->with('state');
+        $summary = ServicestateSummary::on($this->getDb());
         $this->applyRestrictions($summary);
         $count = (int) $summary->first()->services_critical_unhandled;
         if ($count) {