Contact(group)Form: Delete timeperiod_entry when the member is deleted

Icinga · Jul 11, 2024 · 49ca621 · 49ca621
1 parent 2ebe803
commit 49ca621
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/application/forms/ContactGroupForm.php b/application/forms/ContactGroupForm.php
@@ -297,15 +297,24 @@ public function removeContactgroup(): void
         $markAsDeleted = ['changed_at' => time() * 1000, 'deleted' => 'y'];
         $updateCondition = ['contactgroup_id = ?' => $this->contactgroupId, 'deleted = ?' => 'n'];
 
-        $rotationIds = $this->db->fetchCol(
+        $rotationAndMemberIds = $this->db->fetchPairs(
             RotationMember::on($this->db)
-                ->columns('rotation_id')
+                ->columns(['id', 'rotation_id'])
                 ->filter(Filter::equal('contactgroup_id', $this->contactgroupId))
                 ->assembleSelect()
         );
 
+        $rotationMemberIds = array_keys($rotationAndMemberIds);
+        $rotationIds = array_values($rotationAndMemberIds);
+
         $this->db->update('rotation_member', $markAsDeleted + ['position' => null], $updateCondition);
 
+        $this->db->update(
+            'timeperiod_entry',
+            $markAsDeleted,
+            ['rotation_member_id IN (?)' => $rotationMemberIds, 'deleted = ?' => 'n']
+        );
+
         if (! empty($rotationIds)) {
             $rotationIdsWithOtherMembers = $this->db->fetchCol(
                 RotationMember::on($this->db)

diff --git a/library/Notifications/Web/Form/ContactForm.php b/library/Notifications/Web/Form/ContactForm.php
@@ -265,15 +265,24 @@ public function removeContact(): void
         $markAsDeleted = ['changed_at' => time() * 1000, 'deleted' => 'y'];
         $updateCondition = ['contact_id = ?' => $this->contactId, 'deleted = ?' => 'n'];
 
-        $rotationIds = $this->db->fetchCol(
+        $rotationAndMemberIds = $this->db->fetchPairs(
             RotationMember::on($this->db)
-                ->columns('rotation_id')
+                ->columns(['id', 'rotation_id'])
                 ->filter(Filter::equal('contact_id', $this->contactId))
                 ->assembleSelect()
         );
 
+        $rotationMemberIds = array_keys($rotationAndMemberIds);
+        $rotationIds = array_values($rotationAndMemberIds);
+
         $this->db->update('rotation_member', $markAsDeleted + ['position' => null], $updateCondition);
 
+        $this->db->update(
+            'timeperiod_entry',
+            $markAsDeleted,
+            ['rotation_member_id IN (?)' => $rotationMemberIds, 'deleted = ?' => 'n']
+        );
+
         if (! empty($rotationIds)) {
             $rotationIdsWithOtherMembers = $this->db->fetchCol(
                 RotationMember::on($this->db)