From 2a2a5583499bcc09afb5adeddc8da288f5e84f07 Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Thu, 21 Nov 2024 17:00:02 +0200
Subject: [PATCH] fixed alarmStatusWs command

---
 .../service/subscription/TbAlarmStatusSubCtx.java    | 12 +++++-------
 .../subscription/TbAlarmStatusSubscription.java      | 12 ++++--------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubCtx.java b/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubCtx.java
index fb330085a7..29e7d99688 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubCtx.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubCtx.java
@@ -15,21 +15,16 @@
  */
 package org.thingsboard.server.service.subscription;
 
-import lombok.Getter;
-import lombok.Setter;
 import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
-import org.thingsboard.server.common.data.query.AlarmCountQuery;
 import org.thingsboard.server.common.data.query.OriginatorAlarmFilter;
 import org.thingsboard.server.dao.alarm.AlarmService;
-import org.thingsboard.server.dao.attributes.AttributesService;
-import org.thingsboard.server.dao.entity.EntityService;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.ws.WebSocketService;
 import org.thingsboard.server.service.ws.WebSocketSessionRef;
-import org.thingsboard.server.service.ws.telemetry.cmd.v2.AlarmCountUpdate;
 import org.thingsboard.server.service.ws.telemetry.cmd.v2.AlarmStatusCmd;
+import org.thingsboard.server.service.ws.telemetry.cmd.v2.AlarmStatusUpdate;
 import org.thingsboard.server.service.ws.telemetry.sub.AlarmSubscriptionUpdate;
 
 import java.util.List;
@@ -82,7 +77,10 @@ public class TbAlarmStatusSubCtx extends TbAbstractSubCtx {
     }
 
     public void sendUpdate() {
-        sendWsMsg(subscription.createUpdate());
+        sendWsMsg(AlarmStatusUpdate.builder()
+                .cmdId(cmdId)
+                .active(subscription.hasAlarms())
+                .build());
     }
 
     public void fetchActiveAlarms() {
diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubscription.java b/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubscription.java
index 6e80d817d7..f153178fa0 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubscription.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubscription.java
@@ -22,7 +22,6 @@ import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.service.ws.telemetry.cmd.v2.AlarmStatusUpdate;
 import org.thingsboard.server.service.ws.telemetry.sub.AlarmSubscriptionUpdate;
 
 import java.util.HashSet;
@@ -53,15 +52,12 @@ public class TbAlarmStatusSubscription extends TbSubscription<AlarmSubscriptionU
         this.severityList = severityList;
     }
 
-    public AlarmStatusUpdate createUpdate() {
-        return AlarmStatusUpdate.builder()
-                .cmdId(getSubscriptionId())
-                .active(!alarmIds.isEmpty())
-                .build();
-    }
-
     public boolean matches(AlarmInfo alarm) {
         return !alarm.isCleared() && (this.typeList == null || this.typeList.contains(alarm.getType())) &&
                 (this.severityList == null || this.severityList.contains(alarm.getSeverity()));
     }
+
+    public boolean hasAlarms() {
+        return !alarmIds.isEmpty();
+    }
 }