Merge pull request #868 from bakaphp/fix-notifications-settings

add enabled status for all current channels
bakaphp · May 14, 2024 · 2c046a3 · 2c046a3
2 parents 1af378f + 67356f2
commit 2c046a3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/Dto/Notifications/UserSettings.php b/src/Dto/Notifications/UserSettings.php
@@ -9,5 +9,8 @@ class UserSettings
     public ?string $description = null;
     public int $notifications_types_id;
     public int $is_enabled = 1;
+    public int $is_email_enabled = 1;
+    public int $is_push_enabled = 1;
+    public int $is_realtime_enabled = 1;
     public array $channels;
 }
diff --git a/src/Mapper/Notifications/UserSettings.php b/src/Mapper/Notifications/UserSettings.php
@@ -22,12 +22,18 @@ class UserSettings extends CustomMapper
      */
     public function mapToObject($userSettings, $userSettingsDto, array $context = [])
     {
+        $decodedChannels = !empty($userSettings->channels) && isJson($userSettings->channels) ? json_decode($userSettings->channels, true) : [];
+
+        //decode channel json to determine if push. email or realtime are enabled
         $userSettingsDto->users_id = $userSettings->users_id;
         $userSettingsDto->notifications_types_id = $userSettings->notifications_types_id;
         $userSettingsDto->name = $userSettings->notification->name;
         $userSettingsDto->description = $userSettings->notification->description;
         $userSettingsDto->is_enabled = $userSettings->is_enabled;
-        $userSettingsDto->channels = !empty($userSettings->channels) && isJson($userSettings->channels) ? json_decode($userSettings->channels, true) : [];
+        $userSettingsDto->is_email_enabled = (int)array_key_exists("email",$decodedChannels);
+        $userSettingsDto->is_push_enabled = (int)array_key_exists("push",$decodedChannels);
+        $userSettingsDto->is_realtime_enabled = (int)array_key_exists("realtime",$decodedChannels);
+        $userSettingsDto->channels = $decodedChannels;
 
         return $userSettingsDto;
     }