From 1706fcbec746f959abe1c84d7c9288fbb7fc74ed Mon Sep 17 00:00:00 2001
From: Valerii Sosliuk <valerii.sosliuk@gmail.com>
Date: Thu, 21 Feb 2019 17:56:35 +0200
Subject: [PATCH] Create Alarm Node add originator and status when using
 message data (#1503)

---
 .../server/controller/AlarmController.java       |  1 +
 .../rule/engine/action/TbCreateAlarmNode.java    | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/controller/AlarmController.java b/application/src/main/java/org/thingsboard/server/controller/AlarmController.java
index 673d341681..5f9585209d 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AlarmController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AlarmController.java
@@ -103,6 +103,7 @@ public class AlarmController extends BaseController {
         checkParameter(ALARM_ID, strAlarmId);
         try {
             AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
+            checkAlarmId(alarmId, Operation.WRITE);
             return alarmService.deleteAlarm(getTenantId(), alarmId);
         } catch (Exception e) {
             throw handleException(e);
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNode.java
index a0d0a2da57..a8c8cfe9fa 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNode.java
@@ -69,8 +69,7 @@ public class TbCreateAlarmNode extends TbAbstractAlarmNode<TbCreateAlarmNodeConf
             msgAlarm = null;
         } else {
             try {
-                msgAlarm = mapper.readValue(msg.getData(), Alarm.class);
-                msgAlarm.setTenantId(ctx.getTenantId());
+                msgAlarm = getAlarmFromMessage(ctx, msg);
                 alarmType = msgAlarm.getType();
             } catch (IOException e) {
                 ctx.tellFailure(msg, e);
@@ -89,6 +88,19 @@ public class TbCreateAlarmNode extends TbAbstractAlarmNode<TbCreateAlarmNodeConf
 
     }
 
+    private Alarm getAlarmFromMessage(TbContext ctx, TbMsg msg) throws IOException {
+        Alarm msgAlarm;
+        msgAlarm = mapper.readValue(msg.getData(), Alarm.class);
+        msgAlarm.setTenantId(ctx.getTenantId());
+        if (msgAlarm.getOriginator() == null) {
+            msgAlarm.setOriginator(msg.getOriginator());
+        }
+        if (msgAlarm.getStatus() == null) {
+            msgAlarm.setStatus(AlarmStatus.ACTIVE_UNACK);
+        }
+        return msgAlarm;
+    }
+
     private ListenableFuture<AlarmResult> createNewAlarm(TbContext ctx, TbMsg msg, Alarm msgAlarm) {
         ListenableFuture<Alarm> asyncAlarm;
         if (msgAlarm != null ) {