Channel: Add and use external_uuid as default-channel value

As the channel names are not unique, uuid should be used in GET responses
Icinga · Jun 27, 2024 · cc77780 · cc77780
1 parent a976477
commit cc77780
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/application/controllers/ApiV1ContactsController.php b/application/controllers/ApiV1ContactsController.php
@@ -99,7 +99,7 @@ function (Filter\Condition $condition) {
                         'id'                => 'co.external_uuid',
                         'full_name',
                         'username',
-                        'default_channel'   => 'ch.name',
+                        'default_channel'   => 'ch.external_uuid',
                     ])
                     ->joinLeft('contact_address ca', 'ca.contact_id = co.id')
                     ->joinLeft('channel ch', 'ch.id = co.default_channel_id');

diff --git a/application/forms/ChannelForm.php b/application/forms/ChannelForm.php
@@ -16,6 +16,7 @@
 use ipl\Validator\EmailAddressValidator;
 use ipl\Web\Common\CsrfCounterMeasure;
 use ipl\Web\Compat\CompatForm;
+use Ramsey\Uuid\Uuid;
 
 /**
  * @phpstan-type ChannelOptionConfig array{
@@ -189,6 +190,7 @@ function ($configItem, $key) {
         );
 
         $channel['config'] = json_encode($config);
+        $channel['external_uuid'] = Uuid::uuid4()->toString();
         if ($this->channelId === null) {
             $this->db->insert('channel', $channel);
         } else {

diff --git a/library/Notifications/Model/Channel.php b/library/Notifications/Model/Channel.php
@@ -26,15 +26,17 @@ public function getColumns(): array
         return [
             'name',
             'type',
-            'config'
+            'config',
+            'external_uuid'
         ];
     }
 
     public function getColumnDefinitions()
     {
         return [
-            'name'   => t('Name'),
-            'type'   => t('Type'),
+            'name'          => t('Name'),
+            'type'          => t('Type'),
+            'external_uuid' => t('UUID')
         ];
     }