fixed delete alarm events

application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java

@@ -107,6 +107,8 @@ public class EdgeEventSourcingListener {
     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;
     }

application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java

@@ -540,6 +540,7 @@ public final class EdgeGrpcSession implements Closeable {
                     case UNASSIGNED_FROM_EDGE:
                     case ALARM_ACK:
                     case ALARM_CLEAR:
+                    case ALARM_DELETE:
                     case CREDENTIALS_UPDATED:
                     case RELATION_ADD_OR_UPDATE:
                     case RELATION_DELETED:

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessor.java

@@ -460,6 +460,7 @@ public abstract class BaseEdgeProcessor {
             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;

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/AlarmEdgeProcessor.java

@@ -105,7 +105,7 @@ public abstract class AlarmEdgeProcessor extends BaseAlarmProcessor implements A
         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);

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/BaseAlarmProcessor.java

@@ -154,6 +154,7 @@ public abstract class BaseAlarmProcessor extends BaseEdgeProcessor {
                             .constructAlarmUpdatedMsg(msgType, alarm, findOriginatorEntityName(tenantId, alarm));
                 }
                 break;
+            case ALARM_DELETE:
             case DELETED:
                 Alarm deletedAlarm = JacksonUtil.convertValue(body, Alarm.class);
                 if (deletedAlarm != null) {

application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java

@@ -196,7 +196,7 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
     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());
     }
 

application/src/test/java/org/thingsboard/server/controller/AlarmControllerTest.java

@@ -261,7 +261,7 @@ public class AlarmControllerTest extends AbstractControllerTest {
         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 class AlarmControllerTest extends AbstractControllerTest {
         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

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),

dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogServiceImpl.java

@@ -190,6 +190,7 @@ public class AuditLogServiceImpl implements AuditLogService {
                 AlarmComment comment = extractParameter(AlarmComment.class, additionalInfo);
                 actionData.set("comment", comment.getComment());
                 break;
+            case ALARM_DELETE:
             case DELETED:
             case ACTIVATED:
             case SUSPENDED: