ContactForm: Fix saving and populating contact addresses (#198)

fix #197

Author: sukhwinder33445

library/Notifications/Web/Form/ContactForm.php

@@ -161,31 +161,17 @@ protected function assemble()
     public function populate($values)
     {
         if ($values instanceof Contact) {
-            $formValues = [];
-            if (! isset($formValues['contact'])) {
-                $formValues['contact'] = [
+            $formValues = [
+                'contact' => [
                     'full_name'          => $values->full_name,
                     'username'           => $values->username,
                     'color'              => $values->color,
                     'default_channel_id' => $values->default_channel_id
-                ];
-            }
+                ]
+            ];
 
             foreach ($values->contact_address as $contactInfo) {
-                if (! isset($formValues['contact_address'])) {
-                    $formValues['contact_address'] = [
-                        'email'       => null,
-                        'rocketchat' => null
-                    ];
-                }
-
-                if ($contactInfo->type === 'email') {
-                    $formValues['contact_address']['email' ] = $contactInfo->address;
-                }
-
-                if ($contactInfo->type === 'rocketchat') {
-                    $formValues['contact_address']['rocketchat'] = $contactInfo->address;
-                }
+                $formValues['contact_address'][$contactInfo->type] = $contactInfo->address;
             }
 
             $values = $formValues;
@@ -196,7 +182,12 @@ public function populate($values)
         return $this;
     }
 
-    public function addOrUpdateContact()
+    /**
+     * Add or update the contact and its corresponding contact addresses
+     *
+     * @return void
+     */
+    public function addOrUpdateContact(): void
     {
         $contactInfo = $this->getValues();
 
@@ -208,22 +199,27 @@ public function addOrUpdateContact()
         $addressFromDb = [];
         if ($this->contactId === null) {
             $this->db->insert('contact', $contact);
-
             $this->contactId = $this->db->lastInsertId();
         } else {
-            $this->db->update('contact', $contact, ['id = ?' => $this->contactId]);
+            $contactFromDb = (array) $this->db->fetchOne(
+                Contact::on($this->db)->withoutColumns(['id'])
+                    ->filter(Filter::equal('id', $this->contactId))
+                    ->assembleSelect()
+            );
 
-            $addressObjects = ContactAddress::on($this->db);
+            if (! empty(array_diff_assoc($contact, $contactFromDb))) {
+                $this->db->update('contact', $contact, ['id = ?' => $this->contactId]);
+            }
 
-            $addressObjects->filter(Filter::equal('contact_id', $this->contactId));
+            $addressObjects = (ContactAddress::on($this->db))
+                ->filter(Filter::equal('contact_id', $this->contactId));
 
             foreach ($addressObjects as $addressRow) {
-                    $addressFromDb[$addressRow->type] = [$addressRow->id, $addressRow->address];
+                $addressFromDb[$addressRow->type] = [$addressRow->id, $addressRow->address];
             }
         }
 
-        $addr = ! empty($addressFromDb) ? $addressFromDb : $addressFromForm;
-        foreach ($addr as $type => $value) {
+        foreach ($addressFromForm as $type => $value) {
             $this->insertOrUpdateAddress($type, $addressFromForm, $addressFromDb);
         }
 

phpstan-baseline-standard.neon

@@ -940,14 +940,9 @@ parameters:
 			count: 1
 			path: library/Notifications/Web/Form/ContactForm.php
 
-		-
-			message: "#^Call to an undefined method ipl\\\\Sql\\\\Connection\\:\\:lastInsertId\\(\\)\\.$#"
-			count: 1
-			path: library/Notifications/Web/Form/ContactForm.php
-
 		-
 			message: "#^Cannot access property \\$address on mixed\\.$#"
-			count: 3
+			count: 2
 			path: library/Notifications/Web/Form/ContactForm.php
 
 		-
@@ -957,7 +952,7 @@ parameters:
 
 		-
 			message: "#^Cannot access property \\$type on mixed\\.$#"
-			count: 3
+			count: 2
 			path: library/Notifications/Web/Form/ContactForm.php
 
 		-
@@ -970,11 +965,6 @@ parameters:
 			count: 1
 			path: library/Notifications/Web/Form/ContactForm.php
 
-		-
-			message: "#^Method Icinga\\\\Module\\\\Notifications\\\\Web\\\\Form\\\\ContactForm\\:\\:addOrUpdateContact\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: library/Notifications/Web/Form/ContactForm.php
-
 		-
 			message: "#^Method Icinga\\\\Module\\\\Notifications\\\\Web\\\\Form\\\\ContactForm\\:\\:assemble\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -995,11 +985,6 @@ parameters:
 			count: 1
 			path: library/Notifications/Web/Form/ContactForm.php
 
-		-
-			message: "#^Offset 'contact' on array\\{\\} in isset\\(\\) does not exist\\.$#"
-			count: 1
-			path: library/Notifications/Web/Form/ContactForm.php
-
 		-
 			message: "#^Method Icinga\\\\Module\\\\Notifications\\\\Web\\\\Form\\\\EventRuleDecorator\\:\\:assemble\\(\\) has no return type specified\\.$#"
 			count: 1