From db975f45682cdcf002a1a04e94625e9abf9aea82 Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Wed, 28 Feb 2024 12:54:05 +0200
Subject: [PATCH] Add alarm info to mobile notification data

---
 .../channels/MobileAppNotificationChannel.java    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/notification/channels/MobileAppNotificationChannel.java b/application/src/main/java/org/thingsboard/server/service/notification/channels/MobileAppNotificationChannel.java
index 8b90a8c69c..dc7f3f9d99 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/channels/MobileAppNotificationChannel.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/channels/MobileAppNotificationChannel.java
@@ -84,7 +84,10 @@ public class MobileAppNotificationChannel implements NotificationChannel<User, M
         Map<String, String> data = Optional.ofNullable(processedTemplate.getAdditionalConfig())
                 .map(JacksonUtil::toFlatMap).orElseGet(HashMap::new);
         NotificationInfo info = ctx.getRequest().getInfo();
-        Optional.ofNullable(info).map(NotificationInfo::getStateEntityId).ifPresent(stateEntityId -> {
+        if (info == null) {
+            return data;
+        }
+        Optional.ofNullable(info.getStateEntityId()).ifPresent(stateEntityId -> {
             data.put("stateEntityId", stateEntityId.getId().toString());
             data.put("stateEntityType", stateEntityId.getEntityType().name());
             if (!"true".equals(data.get("onClick.enabled")) && info.getDashboardId() != null) {
@@ -94,6 +97,16 @@ public class MobileAppNotificationChannel implements NotificationChannel<User, M
                 data.put("onClick.dashboardId", info.getDashboardId().toString());
             }
         });
+        data.put("notificationType", ctx.getNotificationType().name());
+        switch (ctx.getNotificationType()) {
+            case ALARM:
+            case ALARM_ASSIGNMENT:
+            case ALARM_COMMENT:
+                info.getTemplateData().forEach((key, value) -> {
+                    data.put("info." + key, value);
+                });
+                break;
+        }
         return data;
     }