Utilize ContactRepository where suitable

Author: nilmerg

application/controllers/ContactController.php

@@ -11,10 +11,12 @@
 use Icinga\Authentication\User\UserBackend;
 use Icinga\Data\Selectable;
 use Icinga\Module\Notifications\Common\Database;
+use Icinga\Module\Notifications\Repository\ContactRepository;
 use Icinga\Module\Notifications\Web\Form\ContactForm;
 use Icinga\Repository\Repository;
 use Icinga\Web\Notification;
 use ipl\Html\Contract\Form;
+use ipl\Sql\Connection;
 use ipl\Web\Compat\CompatController;
 use ipl\Web\FormElement\SearchSuggestions;
 
@@ -27,29 +29,35 @@ public function init(): void
 
     public function indexAction(): void
     {
-        $contactId = $this->params->getRequired('id');
-
-        $form = (new ContactForm(Database::get()))
-            ->loadContact($contactId)
+        $contact = (new ContactRepository(Database::get()))
+            ->find((int) $this->params->getRequired('id'));
+        if ($contact === null) {
+            $this->httpNotFound($this->translate('Contact not found'));
+        }
+
+        $form = (new ContactForm())
+            ->setContact($contact)
             ->on(Form::ON_SUBMIT, function (ContactForm $form) {
-                $form->editContact();
+                $contact = $form->getContact();
+                Database::get()->transaction(fn (Connection $db) => (new ContactRepository($db))->update($contact));
                 Notification::success(sprintf(
-                    t('Contact "%s" has successfully been saved'),
-                    $form->getContactName()
+                    $this->translate('Contact "%s" has successfully been saved'),
+                    $contact->full_name
                 ));
 
                 $this->redirectNow('__CLOSE__');
             })->on(ContactForm::ON_REMOVE, function (ContactForm $form) {
-                $form->removeContact();
+                $contact = $form->getContact();
+                Database::get()->transaction(fn (Connection $db) => (new ContactRepository($db))->delete($contact));
                 Notification::success(sprintf(
-                    t('Deleted contact "%s" successfully'),
-                    $form->getContactName()
+                    $this->translate('Deleted contact "%s" successfully'),
+                    $contact->full_name
                 ));
 
                 $this->redirectNow('__CLOSE__');
             })->handleRequest($this->getServerRequest());
 
-        $this->addTitleTab(sprintf(t('Contact: %s'), $form->getContactName()));
+        $this->addTitleTab(sprintf($this->translate('Contact: %s'), $contact->full_name));
 
         $this->addContent($form);
     }

application/controllers/ContactsController.php

@@ -10,6 +10,7 @@
 use Icinga\Module\Notifications\Common\Links;
 use Icinga\Module\Notifications\Model\Channel;
 use Icinga\Module\Notifications\Model\Contact;
+use Icinga\Module\Notifications\Repository\ContactRepository;
 use Icinga\Module\Notifications\View\ContactRenderer;
 use Icinga\Module\Notifications\Web\Control\SearchBar\ObjectSuggestions;
 use Icinga\Module\Notifications\Web\Form\ContactForm;
@@ -129,9 +130,10 @@ public function addAction(): void
     {
         $this->addTitleTab($this->translate('Create Contact'));
 
-        $form = (new ContactForm($this->db))
+        $form = (new ContactForm())
             ->on(Form::ON_SUBMIT, function (ContactForm $form) {
-                $form->addContact();
+                $contact = $form->getContact();
+                Database::get()->transaction(fn (Connection $db) => (new ContactRepository($db))->create($contact));
                 Notification::success($this->translate('New contact has successfully been added'));
                 $this->switchToSingleColumnLayout();
             })->handleRequest($this->getServerRequest());