Database: Use ON_ASSEMBLE_SELECT event to add deleted flag to que…

…ries Only add it to the base table. If the filter is already set for the base table, do nothing (return) - Remove `deleted` filter from all other files.
Icinga · Jul 9, 2024 · 9d823af · 9d823af
1 parent 41f671c
commit 9d823af
Show file tree

Hide file tree

Showing 30 changed files with 127 additions and 236 deletions.
diff --git a/application/controllers/ChannelsController.php b/application/controllers/ChannelsController.php
@@ -43,8 +43,7 @@ public function init()
 
     public function indexAction()
     {
-        $channels = Channel::on($this->db)
-            ->filter(Filter::equal('deleted', 'n'));
+        $channels = Channel::on($this->db);
         $this->mergeTabs($this->Module()->getConfigTabs());
         $this->getTabs()->activate('channels');
 

diff --git a/application/controllers/ContactGroupController.php b/application/controllers/ContactGroupController.php
@@ -35,10 +35,7 @@ public function indexAction(): void
 
         $query = Contactgroup::on(Database::get())
             ->columns(['id', 'name'])
-            ->filter(Filter::all(
-                Filter::equal('id', $groupId),
-                Filter::equal('deleted', 'n')
-            ));
+            ->filter(Filter::equal('id', $groupId));
 
         $group = $query->first();
         if ($group === null) {
@@ -51,10 +48,7 @@ public function indexAction(): void
 
         $contacts = $group
             ->contact
-            ->filter(Filter::all(
-                Filter::equal('contactgroup_member.deleted', 'n'),
-                Filter::equal('deleted', 'n')
-            ));
+            ->filter(Filter::equal('contactgroup_member.deleted', 'n'));
 
         $this->addControl($this->createPaginationControl($contacts));
         $this->addControl($this->createLimitControl());

diff --git a/application/controllers/ContactGroupsController.php b/application/controllers/ContactGroupsController.php
@@ -39,8 +39,7 @@ public function init(): void
 
     public function indexAction(): void
     {
-        $groups = Contactgroup::on(Database::get())
-            ->filter(Filter::equal('deleted', 'n'));
+        $groups = Contactgroup::on(Database::get());
 
         $limitControl = $this->createLimitControl();
         $paginationControl = $this->createPaginationControl($groups);

diff --git a/application/controllers/ContactsController.php b/application/controllers/ContactsController.php
@@ -43,8 +43,7 @@ public function init()
     public function indexAction()
     {
         $contacts = Contact::on($this->db)
-            ->withColumns('has_email')
-            ->filter(Filter::equal('deleted', 'n'));
+            ->withColumns('has_email');
 
         $limitControl = $this->createLimitControl();
         $paginationControl = $this->createPaginationControl($contacts);

diff --git a/application/controllers/EventRuleController.php b/application/controllers/EventRuleController.php
@@ -151,10 +151,7 @@ public function fromDb(int $ruleId): array
     {
         $query = Rule::on(Database::get())
             ->columns(['id', 'name', 'object_filter'])
-            ->filter(Filter::all(
-                Filter::equal('id', $ruleId),
-                Filter::equal('deleted', 'n')
-            ));
+            ->filter(Filter::equal('id', $ruleId));
 
         $rule = $query->first();
         if ($rule === null) {
@@ -165,8 +162,7 @@ public function fromDb(int $ruleId): array
 
         $ruleEscalations = $rule
             ->rule_escalation
-            ->withoutColumns(['changed_at', 'deleted'])
-            ->filter(Filter::equal('deleted', 'n'));
+            ->withoutColumns(['changed_at', 'deleted']);
 
         foreach ($ruleEscalations as $re) {
             foreach ($re as $k => $v) {
@@ -175,8 +171,7 @@ public function fromDb(int $ruleId): array
 
             $escalationRecipients = $re
                 ->rule_escalation_recipient
-                ->withoutColumns(['changed_at', 'deleted'])
-                ->filter(Filter::equal('deleted', 'n'));
+                ->withoutColumns(['changed_at', 'deleted']);
 
             foreach ($escalationRecipients as $recipient) {
                 $config[$re->getTableName()][$re->position]['recipient'][] = iterator_to_array($recipient);

diff --git a/application/controllers/EventRulesController.php b/application/controllers/EventRulesController.php
@@ -44,8 +44,7 @@ public function init()
 
     public function indexAction(): void
     {
-        $eventRules = Rule::on(Database::get())
-            ->filter(Filter::equal('deleted', 'n'));
+        $eventRules = Rule::on(Database::get());
 
         $limitControl = $this->createLimitControl();
         $paginationControl = $this->createPaginationControl($eventRules);

diff --git a/application/controllers/IncidentController.php b/application/controllers/IncidentController.php
@@ -47,10 +47,7 @@ public function indexAction(): void
 
         $contact = Contact::on(Database::get())
             ->columns('id')
-            ->filter(Filter::all(
-                Filter::equal('username', $this->Auth()->getUser()->getUsername()),
-                Filter::equal('deleted', 'n')
-            ))
+            ->filter(Filter::equal('username', $this->Auth()->getUser()->getUsername()))
             ->first();
 
         if ($contact !== null) {

diff --git a/application/controllers/ScheduleController.php b/application/controllers/ScheduleController.php
@@ -4,7 +4,6 @@
 
 namespace Icinga\Module\Notifications\Controllers;
 
-use Icinga\Exception\Http\HttpNotFoundException;
 use Icinga\Module\Notifications\Common\Database;
 use Icinga\Module\Notifications\Common\Links;
 use Icinga\Module\Notifications\Forms\MoveRotationForm;
@@ -27,10 +26,7 @@ public function indexAction(): void
         $id = (int) $this->params->getRequired('id');
 
         $query = Schedule::on(Database::get())
-            ->filter(Filter::all(
-                Filter::equal('schedule.id', $id),
-                Filter::equal('schedule.deleted', 'n')
-            ));
+            ->filter(Filter::equal('schedule.id', $id));
 
         /** @var ?Schedule $schedule */
         $schedule = $query->first();
@@ -116,7 +112,6 @@ public function addAction(): void
     public function addRotationAction(): void
     {
         $scheduleId = (int) $this->params->getRequired('schedule');
-        $this->assertScheduleExists($scheduleId);
 
         $form = new RotationConfigForm($scheduleId, Database::get());
         $form->setAction($this->getRequest()->getUrl()->setParam('showCompact')->getAbsoluteUrl());
@@ -150,7 +145,6 @@ public function editRotationAction(): void
     {
         $id = (int) $this->params->getRequired('id');
         $scheduleId = (int) $this->params->getRequired('schedule');
-        $this->assertScheduleExists($scheduleId);
 
         $form = new RotationConfigForm($scheduleId, Database::get());
         $form->disableModeSelection();
@@ -214,29 +208,4 @@ public function suggestRecipientAction(): void
 
         $this->getDocument()->addHtml($suggestions);
     }
-
-    /**
-     * Assert that a schedule with the given ID exists
-     *
-     * @param int $id
-     *
-     * @return void
-     *
-     * @throws HttpNotFoundException If the schedule with the given ID does not exist
-     */
-    private function assertScheduleExists(int $id): void
-    {
-        $query = Schedule::on(Database::get())
-            ->columns('1')
-            ->filter(Filter::all(
-                Filter::equal('schedule.id', $id),
-                Filter::equal('schedule.deleted', 'n')
-            ));
-
-        /** @var ?Schedule $schedule */
-        $schedule = $query->first();
-        if ($schedule === null) {
-            $this->httpNotFound(t('Schedule not found'));
-        }
-    }
 }
diff --git a/application/controllers/SchedulesController.php b/application/controllers/SchedulesController.php
@@ -27,8 +27,7 @@ class SchedulesController extends CompatController
 
     public function indexAction(): void
     {
-        $schedules = Schedule::on(Database::get())
-            ->filter(Filter::equal('deleted', 'n'));
+        $schedules = Schedule::on(Database::get());
 
         $limitControl = $this->createLimitControl();
         $sortControl = $this->createSortControl(

diff --git a/application/controllers/SourcesController.php b/application/controllers/SourcesController.php
@@ -12,7 +12,6 @@
 use Icinga\Web\Notification;
 use Icinga\Web\Widget\Tabs;
 use ipl\Html\ValidHtml;
-use ipl\Stdlib\Filter;
 use ipl\Web\Common\BaseItemList;
 use ipl\Web\Compat\CompatController;
 use ipl\Web\Compat\SearchControls;
@@ -34,8 +33,7 @@ public function init()
     public function indexAction(): void
     {
         $sources = Source::on(Database::get())
-            ->columns(['id', 'type',  'name'])
-            ->filter(Filter::equal('deleted', 'n'));
+            ->columns(['id', 'type',  'name']);
 
         $limitControl = $this->createLimitControl();
         $paginationControl = $this->createPaginationControl($sources);

diff --git a/application/forms/ChannelForm.php b/application/forms/ChannelForm.php
@@ -115,12 +115,9 @@ protected function assemble()
         if ($this->channelId !== null) {
             $isInUse = RuleEscalationRecipient::on($this->db)
                 ->columns('1')
-                ->filter(Filter::all(
-                    Filter::equal('deleted', 'n'),
-                    Filter::any(
-                        Filter::equal('channel_id', $this->channelId),
-                        Filter::equal('contact.default_channel_id', $this->channelId)
-                    )
+                ->filter(Filter::any(
+                    Filter::equal('channel_id', $this->channelId),
+                    Filter::equal('contact.default_channel_id', $this->channelId)
                 ))
                 ->first();
 
@@ -418,10 +415,7 @@ private function fetchDbValues(): array
     {
         /** @var Channel $channel */
         $channel = Channel::on($this->db)
-            ->filter(Filter::all(
-                Filter::equal('id', $this->channelId),
-                Filter::equal('deleted', 'n')
-            ))
+            ->filter(Filter::equal('id', $this->channelId))
             ->first();
 
         if ($channel === null) {

diff --git a/application/forms/ContactGroupForm.php b/application/forms/ContactGroupForm.php
@@ -5,7 +5,6 @@
 namespace Icinga\Module\Notifications\Forms;
 
 use Icinga\Exception\Http\HttpNotFoundException;
-use Icinga\Module\Notifications\Common\Database;
 use Icinga\Module\Notifications\Common\Links;
 use Icinga\Module\Notifications\Model\Contact;
 use Icinga\Module\Notifications\Model\Contactgroup;
@@ -253,7 +252,6 @@ public function editGroup(): void
                     ->columns(['contact_id'])
                     ->where([
                         'contactgroup_id = ?'   => $this->contactgroupId,
-                        'deleted = ?'           => 'y',
                         'contact_id IN (?)'     => $toAdd
                     ])
             );
@@ -313,8 +311,7 @@ public function removeContactgroup(): void
                     ->filter(
                         Filter::all(
                             Filter::equal('rotation_id', $rotationIds),
-                            Filter::unequal('contactgroup_id', $this->contactgroupId),
-                            Filter::equal('deleted', 'n')
+                            Filter::unequal('contactgroup_id', $this->contactgroupId)
                         )
                     )->assembleSelect()
             );
@@ -353,22 +350,14 @@ private function fetchDbValues(): array
     {
         $query = Contactgroup::on($this->db)
             ->columns(['id', 'name'])
-            ->filter(Filter::all(
-                Filter::equal('id', $this->contactgroupId),
-                Filter::equal('deleted', 'n')
-            ));
+            ->filter(Filter::equal('id', $this->contactgroupId));
 
         $group = $query->first();
         if ($group === null) {
             throw new HttpNotFoundException($this->translate('Contact group not found'));
         }
 
-        $contacts = Contact::on(Database::get())
-            ->filter(Filter::all(
-                Filter::equal('contactgroup_member.contactgroup_id', $group->id),
-                Filter::equal('contactgroup_member.deleted', 'n'),
-                Filter::equal('deleted', 'n')
-            ));
+        $contacts = $group->contact->filter(Filter::equal('contactgroup_member.deleted', 'n'));
 
         $groupMembers = [];
         foreach ($contacts as $contact) {

diff --git a/application/forms/EscalationRecipientForm.php b/application/forms/EscalationRecipientForm.php
@@ -11,7 +11,6 @@
 use Icinga\Module\Notifications\Model\Schedule;
 use ipl\Html\Contract\FormElement;
 use ipl\Html\Html;
-use ipl\Stdlib\Filter;
 use ipl\Web\Widget\Icon;
 
 class EscalationRecipientForm extends BaseEscalationForm
@@ -26,15 +25,15 @@ public function __construct(?int $count)
     protected function fetchOptions(): array
     {
         $options = [];
-        foreach (Contact::on(Database::get())->filter(Filter::equal('deleted', 'n')) as $contact) {
+        foreach (Contact::on(Database::get()) as $contact) {
             $options['Contacts']['contact_' . $contact->id] = $contact->full_name;
         }
 
-        foreach (Contactgroup::on(Database::get())->filter(Filter::equal('deleted', 'n')) as $contactgroup) {
+        foreach (Contactgroup::on(Database::get()) as $contactgroup) {
             $options['Contact Groups']['contactgroup_' . $contactgroup->id] = $contactgroup->name;
         }
 
-        foreach (Schedule::on(Database::get())->filter(Filter::equal('deleted', 'n')) as $schedule) {
+        foreach (Schedule::on(Database::get()) as $schedule) {
             $options['Schedules']['schedule_' . $schedule->id] = $schedule->name;
         }
 

diff --git a/application/forms/MoveRotationForm.php b/application/forms/MoveRotationForm.php
@@ -87,10 +87,7 @@ protected function onSuccess()
         /** @var ?Rotation $rotation */
         $rotation = Rotation::on($this->db)
             ->columns(['schedule_id', 'priority'])
-            ->filter(Filter::all(
-                Filter::equal('id', $rotationId),
-                Filter::equal('deleted', 'n')
-            ))
+            ->filter(Filter::equal('id', $rotationId))
             ->first();
         if ($rotation === null) {
             throw new HttpNotFoundException('Rotation not found');
@@ -114,7 +111,6 @@ protected function onSuccess()
                     ->columns('id')
                     ->from('rotation')
                     ->where([
-                        'deleted = ?' => 'n',
                         'schedule_id = ?' => $rotation->schedule_id,
                         'priority >= ?' => $newPriority,
                         'priority < ?' => $rotation->priority
@@ -134,7 +130,6 @@ protected function onSuccess()
                     ->columns('id')
                     ->from('rotation')
                     ->where([
-                        'deleted = ?' => 'n',
                         'schedule_id = ?' => $rotation->schedule_id,
                         'priority > ?' => $rotation->priority,
                         'priority <= ?' => $newPriority