Add ids in VolatileStateResults instead of Controller and remove them from the results

Author: BastianLedererIcinga

library/Icingadb/Redis/VolatileStateResults.php

@@ -36,8 +36,11 @@ class VolatileStateResults extends ResultSet
     /** @var string Object type service */
     protected const TYPE_SERVICE = 'service';
 
-    /** @var array Columns to be selected if they were explicitly set, if empty all columns are selected */
-    protected array $columns;
+    /** @var array|null Columns to be selected if they were explicitly set, if empty all columns are selected */
+    protected ?array $columns;
+
+    /** @var bool Whether the model's ID should be contained in the results */
+    protected bool $includeModelID = true;
 
     public static function fromQuery(Query $query)
     {
@@ -46,6 +49,20 @@ public static function fromQuery(Query $query)
         $self->redisUnavailable = Backend::getRedis()->isUnavailable();
         $self->columns = $query->getColumns();
 
+        if (! empty($self->columns)) {
+            // The id is necessary to apply the redis-updates
+            if ($query->getModel() instanceof Host && empty(array_intersect(['host.id', 'id'], $self->columns))) {
+                $query->withColumns('host.id');
+                $self->includeModelID = false;
+            } elseif (
+                $query->getModel() instanceof Service &&
+                empty(array_intersect(['service.id', 'id'], $self->columns))
+            ) {
+                $query->withColumns('service.id');
+                $self->includeModelID = false;
+            }
+        }
+
         return $self;
     }
 
@@ -66,7 +83,12 @@ public function current()
             $this->rewind();
         }
 
-        return parent::current();
+        $result = parent::current();
+        if (! $this->includeModelID) {
+            unset($result['id']);
+        }
+
+        return $result;
     }
 
     public function next(): void

library/Icingadb/Web/Controller.php

@@ -105,14 +105,7 @@ public function createColumnControl(Query $query, ViewModeSwitcher $viewModeSwit
         }
 
         // When exporting as CSV or JSON, and the user requested specific columns, only those should be included
-        // The model's id must always be selected, to ensure redis updates can be applied.
         if ($this->format === 'csv' || $this->format === 'json') {
-            if ($query->getModel() instanceof Host && ! in_array('host.id', $columns)) {
-                $columns[] = 'host.id';
-            } elseif ($query->getModel() instanceof Service && ! in_array('service.id', $columns)) {
-                $columns[] = 'service.id';
-            }
-
             $query->columns($columns);
         } else {
             $query->withColumns($columns);