Merge pull request #10205 from YevhenBondarenko/fix/delete-alarm

fixed delete alarm events (device profile node)
thingsboard · Feb 16, 2024 · b934610 · b934610
2 parents d5da538 + 5c26757
commit b934610
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 5 deletions.
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java b/application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java
@@ -107,6 +107,8 @@ public void handleEvent(DeleteEntityEvent<?> event) {
     private EdgeEventActionType getEdgeEventActionTypeForEntityEvent(Object entity) {
         if (entity instanceof AlarmComment) {
             return EdgeEventActionType.DELETED_COMMENT;
+        } else if (entity instanceof Alarm) {
+            return EdgeEventActionType.ALARM_DELETE;
         }
         return EdgeEventActionType.DELETED;
     }

diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
@@ -540,6 +540,7 @@ private List<DownlinkMsg> convertToDownlinkMsgsPack(List<EdgeEvent> edgeEvents)
                     case UNASSIGNED_FROM_EDGE:
                     case ALARM_ACK:
                     case ALARM_CLEAR:
+                    case ALARM_DELETE:
                     case CREDENTIALS_UPDATED:
                     case RELATION_ADD_OR_UPDATE:
                     case RELATION_DELETED:

diff --git a/...on/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessor.java b/...on/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessor.java
@@ -460,6 +460,7 @@ protected UpdateMsgType getUpdateMsgType(EdgeEventActionType actionType) {
             case UNASSIGNED_FROM_EDGE:
             case RELATION_DELETED:
             case DELETED_COMMENT:
+            case ALARM_DELETE:
                 return UpdateMsgType.ENTITY_DELETED_RPC_MESSAGE;
             case ALARM_ACK:
                 return UpdateMsgType.ALARM_ACK_RPC_MESSAGE;

diff --git a/...main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/AlarmEdgeProcessor.java b/...main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/AlarmEdgeProcessor.java
@@ -105,7 +105,7 @@ public ListenableFuture<Void> processAlarmNotification(TenantId tenantId, Transp
         EdgeEventActionType actionType = EdgeEventActionType.valueOf(edgeNotificationMsg.getAction());
         AlarmId alarmId = new AlarmId(new UUID(edgeNotificationMsg.getEntityIdMSB(), edgeNotificationMsg.getEntityIdLSB()));
         EdgeId originatorEdgeId = safeGetEdgeId(edgeNotificationMsg.getOriginatorEdgeIdMSB(), edgeNotificationMsg.getOriginatorEdgeIdLSB());
-        if (EdgeEventActionType.DELETED.equals(actionType)) {
+        if (EdgeEventActionType.DELETED.equals(actionType) || EdgeEventActionType.ALARM_DELETE.equals(actionType)) {
             Alarm deletedAlarm = JacksonUtil.fromString(edgeNotificationMsg.getBody(), Alarm.class);
             if (deletedAlarm == null) {
                 return Futures.immediateFuture(null);

diff --git a/...main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/BaseAlarmProcessor.java b/...main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/BaseAlarmProcessor.java
@@ -154,6 +154,7 @@ protected AlarmUpdateMsg convertAlarmEventToAlarmMsg(TenantId tenantId, UUID ent
                             .constructAlarmUpdatedMsg(msgType, alarm, findOriginatorEntityName(tenantId, alarm));
                 }
                 break;
+            case ALARM_DELETE:
             case DELETED:
                 Alarm deletedAlarm = JacksonUtil.convertValue(body, Alarm.class);
                 if (deletedAlarm != null) {

diff --git a/...ion/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java b/...ion/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java
@@ -196,7 +196,7 @@ public List<AlarmId> unassignDeletedUserAlarms(TenantId tenantId, User user, lon
     public Boolean delete(Alarm alarm, User user) {
         TenantId tenantId = alarm.getTenantId();
         notificationEntityService.logEntityAction(tenantId, alarm.getOriginator(), alarm, alarm.getCustomerId(),
-                ActionType.DELETED, user);
+                ActionType.ALARM_DELETE, user);
         return alarmSubscriptionService.deleteAlarm(tenantId, alarm.getId());
     }
 

diff --git a/application/src/test/java/org/thingsboard/server/controller/AlarmControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AlarmControllerTest.java
@@ -261,7 +261,7 @@ public void testDeleteAlarmViaCustomer() throws Exception {
         doDelete("/api/alarm/" + alarm.getId()).andExpect(status().isOk());
 
         testNotifyEntityAllOneTime(new Alarm(alarm), alarm.getId(), alarm.getOriginator(),
-                tenantId, customerId, customerUserId, CUSTOMER_USER_EMAIL, ActionType.DELETED);
+                tenantId, customerId, customerUserId, CUSTOMER_USER_EMAIL, ActionType.ALARM_DELETE);
     }
 
     @Test
@@ -274,7 +274,7 @@ public void testDeleteAlarmViaTenant() throws Exception {
         doDelete("/api/alarm/" + alarm.getId()).andExpect(status().isOk());
 
         testNotifyEntityAllOneTime(new Alarm(alarm), alarm.getId(), alarm.getOriginator(),
-                tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.DELETED);
+                tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.ALARM_DELETE);
     }
 
     @Test

diff --git a/...src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java b/...src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java
@@ -129,7 +129,7 @@ public void testClear() throws ThingsboardException {
     public void testDelete() {
         service.delete(new Alarm(), new User());
 
-        verify(notificationEntityService, times(1)).logEntityAction(any(), any(), any(), any(), eq(ActionType.DELETED), any());
+        verify(notificationEntityService, times(1)).logEntityAction(any(), any(), any(), any(), eq(ActionType.ALARM_DELETE), any());
         verify(alarmSubscriptionService, times(1)).deleteAlarm(any(), any());
     }
 

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeEventActionType.java b/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeEventActionType.java
@@ -35,6 +35,7 @@ public enum EdgeEventActionType {
     RPC_CALL(ActionType.RPC_CALL),
     ALARM_ACK(ActionType.ALARM_ACK),
     ALARM_CLEAR(ActionType.ALARM_CLEAR),
+    ALARM_DELETE(ActionType.ALARM_DELETE),
     ALARM_ASSIGNED(ActionType.ALARM_ASSIGNED),
     ALARM_UNASSIGNED(ActionType.ALARM_UNASSIGNED),
     ADDED_COMMENT(ActionType.ADDED_COMMENT),

diff --git a/dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogServiceImpl.java
@@ -190,6 +190,7 @@ private <E extends HasName, I extends EntityId> JsonNode constructActionData(I e
                 AlarmComment comment = extractParameter(AlarmComment.class, additionalInfo);
                 actionData.set("comment", comment.getComment());
                 break;
+            case ALARM_DELETE:
             case DELETED:
             case ACTIVATED:
             case SUSPENDED: