wip

Author: sukhwinder33445

application/controllers/ApiV1ContactgroupsController.php

@@ -213,8 +213,7 @@ function (Filter\Condition $condition) {
                 $contactgroupId = $this->getContactgroupId($identifier);
                 if ($contactgroupId !== null) {
                     $db->update('contactgroup', ['name' => $data['name']], ['id = ?' => $contactgroupId]);
-
-                    $db->delete('contactgroup_member', ['contactgroup_id = ?' => $contactgroupId]);
+                    $db->update('contactgroup_member', ['deleted' => 'y'], ['contactgroup_id = ?' => $contactgroupId, 'deleted = ?' => 'n']);
 
                     if (! empty($data['users'])) {
                         $this->addUsers($contactgroupId, $data['users']);
@@ -374,8 +373,25 @@ private function addUsers(int $contactgroupId, array $users): void
      */
     private function removeContactgroup(int $id): void
     {
-        Database::get()->delete('contactgroup_member', ['contactgroup_id = ?' => $id]);
-        Database::get()->delete('contactgroup', ['id = ?' => $id]);
+        $db = Database::get();
+        $markAsDeleted = ['deleted' => 'y'];
+
+        $db->update(
+            'rotation_member',
+            $markAsDeleted + ['position' => null],
+            ['contactgroup_id = ?' => $id, 'deleted = ?' => 'n']
+        );
+
+        $db->update(
+            'rule_escalation_recipient',
+            $markAsDeleted,
+            ['contactgroup_id = ?' => $id, 'deleted = ?' => 'n']
+        );
+
+        $db->update('contactgroup_member', $markAsDeleted, ['contactgroup_id = ?' => $id, 'deleted = ?' => 'n']);
+        $db->update('contactgroup', $markAsDeleted, ['id = ?' => $id]);
+
+        //TODO: properly remove rotations|escalations with no members as in form
     }
 
     /**

application/controllers/ApiV1ContactsController.php

@@ -226,11 +226,12 @@ function (Filter\Condition $condition) {
                     $db->update('contact', [
                         'full_name'             => $data['full_name'],
                         'username'              => $data['username'] ?? null,
-                        'default_channel_id'    => $this->getChannelId($data['default_channel'])
+                        'default_channel_id'    => $this->getChannelId($data['default_channel']),
                     ], ['id = ?' => $contactId]);
 
-                    $db->delete('contact_address', ['contact_id = ?' => $contactId]);
-                    $db->delete('contactgroup_member', ['contact_id = ?' => $contactId]);
+                    $markAsDeleted = ['deleted' => 'y'];
+                    $db->update('contact_address', $markAsDeleted, ['contact_id = ?' => $contactId, 'deleted = ?' => 'n']);
+                    $db->update('contactgroup_member', $markAsDeleted, ['contact_id = ?' => $contactId, 'deleted = ?' => 'n']);
 
                     if (! empty($data['addresses'])) {
                         $this->addAddresses($contactId, $data['addresses']);
@@ -497,9 +498,26 @@ private function addAddresses(int $contactId, array $addresses): void
      */
     private function removeContact(int $id): void
     {
-        Database::get()->delete('contactgroup_member', ['contact_id = ?' => $id]);
-        Database::get()->delete('contact_address', ['contact_id = ?' => $id]);
-        Database::get()->delete('contact', ['id = ?' => $id]);
+        $db = Database::get();
+        $markAsDeleted = ['deleted' => 'y'];
+
+        $db->update(
+            'rotation_member',
+            $markAsDeleted + ['position' => null],
+            ['contact_id = ?' => $id, 'deleted = ?' => 'n']
+        );
+
+        $db->update(
+            'rule_escalation_recipient',
+            $markAsDeleted,
+            ['contact_id = ?' => $id, 'deleted = ?' => 'n']
+        );
+
+        $db->update('contactgroup_member', $markAsDeleted, ['contact_id = ?' => $id, 'deleted = ?' => 'n']);
+        $db->update('contact_address', $markAsDeleted, ['contact_id = ?' => $id, 'deleted = ?' => 'n']);
+        $db->update('contact', $markAsDeleted, ['id = ?' => $id]);
+
+        //TODO: properly remove rotations|escalations with no members as in form
     }
 
     /**