From acd782929016a6171fed2c5b9c331906e65af32b Mon Sep 17 00:00:00 2001
From: Dmytro Skarzhynets <d.skarzh@protonmail.com>
Date: Thu, 18 Jan 2024 15:55:38 +0200
Subject: [PATCH] Fix 'create alarm' node not sending 'ENTITY_CREATED' if
 severity has changed.

---
 .../thingsboard/rule/engine/action/TbAbstractAlarmNode.java  | 4 ++--
 .../org/thingsboard/rule/engine/action/TbAlarmResult.java    | 5 +++--
 .../org/thingsboard/rule/engine/action/TbAlarmNodeTest.java  | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractAlarmNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractAlarmNode.java
index 7c8afe18bf..855727494e 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractAlarmNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractAlarmNode.java
@@ -60,7 +60,7 @@ public abstract class TbAbstractAlarmNode<C extends TbAbstractAlarmNodeConfigura
                         ctx.tellNext(msg, TbNodeConnectionType.FALSE);
                     } else if (alarmResult.isCreated) {
                         tellNext(ctx, msg, alarmResult, TbMsgType.ENTITY_CREATED, "Created");
-                    } else if (alarmResult.isUpdated) {
+                    } else if (alarmResult.isUpdated || alarmResult.isSeverityUpdated) {
                         tellNext(ctx, msg, alarmResult, TbMsgType.ENTITY_UPDATED, "Updated");
                     } else if (alarmResult.isCleared) {
                         tellNext(ctx, msg, alarmResult, TbMsgType.ALARM_CLEAR, "Cleared");
@@ -93,7 +93,7 @@ public abstract class TbAbstractAlarmNode<C extends TbAbstractAlarmNodeConfigura
         TbMsgMetaData metaData = originalMsg.getMetaData().copy();
         if (alarmResult.isCreated) {
             metaData.putValue(DataConstants.IS_NEW_ALARM, Boolean.TRUE.toString());
-        } else if (alarmResult.isUpdated) {
+        } else if (alarmResult.isUpdated || alarmResult.isSeverityUpdated) {
             metaData.putValue(DataConstants.IS_EXISTING_ALARM, Boolean.TRUE.toString());
         } else if (alarmResult.isCleared) {
             metaData.putValue(DataConstants.IS_CLEARED_ALARM, Boolean.TRUE.toString());
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmResult.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmResult.java
index 6dc9d418e3..c7fb87fcdf 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmResult.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmResult.java
@@ -37,10 +37,11 @@ public class TbAlarmResult {
     }
 
     public static TbAlarmResult fromAlarmResult(AlarmApiCallResult result) {
+        boolean isSeverityChanged = result.isSeverityChanged();
         return new TbAlarmResult(
                 result.isCreated(),
-                result.isModified() && !result.isSeverityChanged(),
-                result.isSeverityChanged(),
+                result.isModified() && !isSeverityChanged,
+                isSeverityChanged,
                 result.isCleared(),
                 result.getAlarm());
     }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAlarmNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAlarmNodeTest.java
index d323863b39..837a80d626 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAlarmNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAlarmNodeTest.java
@@ -253,6 +253,7 @@ public class TbAlarmNodeTest {
                 AlarmApiCallResult.builder()
                         .successful(true)
                         .modified(true)
+                        .old(new Alarm(activeAlarm))
                         .alarm(new AlarmInfo(expectedAlarm))
                         .build());
         node.onMsg(ctx, msg);