fixed audit logs

application/src/main/java/org/thingsboard/server/service/entitiy/DefaultTbNotificationEntityService.java

@@ -231,15 +231,10 @@ public class DefaultTbNotificationEntityService implements TbNotificationEntityS
     }
 
     @Override
-    public void notifyCreateOrUpdateAlarmComment(Alarm alarm, AlarmComment alarmComment, ActionType actionType, User user) {
+    public void notifyAlarmComment(Alarm alarm, AlarmComment alarmComment, ActionType actionType, User user) {
         logEntityAction(alarm.getTenantId(), alarm.getId(), alarm, alarm.getCustomerId(), actionType, user, alarmComment);
     }
 
-    @Override
-    public void notifyDeleteAlarmComment(Alarm alarm, AlarmComment alarmComment, User user) {
-        logEntityAction(alarm.getTenantId(), alarm.getId(), alarm, alarm.getCustomerId(), ActionType.DELETED_COMMENT, user, alarmComment);
-    }
-
     @Override
     public <E extends HasName, I extends EntityId> void notifyCreateOrUpdateOrDelete(TenantId tenantId, CustomerId customerId,
                                                                                      I entityId, E entity, User user,

application/src/main/java/org/thingsboard/server/service/entitiy/TbNotificationEntityService.java

@@ -103,9 +103,8 @@ public interface TbNotificationEntityService {
 
     void notifyCreateOrUpdateAlarm(Alarm alarm, ActionType actionType, User user, Object... additionalInfo);
 
-    void notifyCreateOrUpdateAlarmComment(Alarm alarm, AlarmComment alarmComment, ActionType actionType, User user);
+    void notifyAlarmComment(Alarm alarm, AlarmComment alarmComment, ActionType actionType, User user);
 
-    void notifyDeleteAlarmComment(Alarm alarm,  AlarmComment alarmComment, User user);
 
     <E extends HasName, I extends EntityId> void notifyCreateOrUpdateOrDelete(TenantId tenantId, CustomerId customerId,
                                                                               I entityId, E entity, User user,

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

@@ -36,7 +36,7 @@ public class DefaultTbAlarmCommentService extends AbstractTbEntityService implem
         alarmComment.setUserId(userId);
         try {
             AlarmComment savedAlarmComment = checkNotNull(alarmCommentService.createOrUpdateAlarmComment(alarm.getTenantId(), alarmComment));
-            notificationEntityService.notifyCreateOrUpdateAlarmComment(alarm, savedAlarmComment, actionType, user);
+            notificationEntityService.notifyAlarmComment(alarm, savedAlarmComment, actionType, user);
             return savedAlarmComment;
         } catch (Exception e) {
             notificationEntityService.logEntityAction(alarm.getTenantId(), emptyId(EntityType.ALARM), alarm, actionType, user, e, alarmComment);
@@ -47,6 +47,6 @@ public class DefaultTbAlarmCommentService extends AbstractTbEntityService implem
     @Override
     public void deleteAlarmComment(Alarm alarm, AlarmComment alarmComment, User user) {
         alarmCommentService.deleteAlarmComment(alarm.getTenantId(), alarmComment.getId());
-        notificationEntityService.notifyDeleteAlarmComment(alarm, alarmComment, user);
+        notificationEntityService.notifyAlarmComment(alarm, alarmComment, ActionType.DELETED_COMMENT, user);
     }
 }

application/src/test/java/org/thingsboard/server/service/entitiy/alarmComment/DefaultTbAlarmCommentServiceTest.java

@@ -80,7 +80,7 @@ public class DefaultTbAlarmCommentServiceTest {
         when(alarmCommentService.createOrUpdateAlarmComment(Mockito.any(), eq(alarmComment))).thenReturn(alarmComment);
         service.saveAlarmComment(alarm, alarmComment, new User());
 
-        verify(notificationEntityService, times(1)).notifyCreateOrUpdateAlarmComment(any(), any(), any(), any());
+        verify(notificationEntityService, times(1)).notifyAlarmComment(any(), any(), any(), any());
     }
 
     @Test
@@ -91,6 +91,6 @@ public class DefaultTbAlarmCommentServiceTest {
         doNothing().when(alarmCommentService).deleteAlarmComment(Mockito.any(), eq(alarmCommentId));
         service.deleteAlarmComment(new Alarm(alarmId), new AlarmComment(alarmCommentId), new User());
 
-        verify(notificationEntityService, times(1)).notifyDeleteAlarmComment(any(), any(), any());
+        verify(notificationEntityService, times(1)).notifyAlarmComment(any(), any(), any(), any());
     }
 }

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

@@ -30,6 +30,7 @@ import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.alarm.AlarmComment;
 import org.thingsboard.server.common.data.audit.ActionStatus;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.audit.AuditLog;
@@ -45,6 +46,7 @@ import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.rule.RuleChainMetaData;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
+import org.thingsboard.server.dao.alarm.AlarmCommentService;
 import org.thingsboard.server.dao.audit.sink.AuditLogSink;
 import org.thingsboard.server.dao.device.provision.ProvisionRequest;
 import org.thingsboard.server.dao.entity.EntityService;
@@ -182,6 +184,11 @@ public class AuditLogServiceImpl implements AuditLogService {
                     }
                 }
                 break;
+            case ADDED_COMMENT:
+            case DELETED_COMMENT:
+                AlarmComment comment = extractParameter(AlarmComment.class, additionalInfo);
+                actionData.set("comment", comment.getComment());
+                break;
             case DELETED:
             case ACTIVATED:
             case SUSPENDED:

rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/TenantIdLoaderTest.java

@@ -195,14 +195,6 @@ public class TenantIdLoaderTest {
                 when(ctx.getAlarmService()).thenReturn(alarmService);
                 doReturn(alarm).when(alarmService).findAlarmById(eq(tenantId), any());
 
-                break;
-            case ALARM_COMMENT:
-                AlarmComment alarmComment = new AlarmComment();
-                alarmComment.setAlarmId(new AlarmId(UUID.randomUUID()));
-
-                when(ctx.getAlarmCommentService()).thenReturn(alarmCommentService);
-                doReturn(alarmComment).when(alarmCommentService).findAlarmCommentById(eq(tenantId), any());
-
                 break;
             case RULE_CHAIN:
                 RuleChain ruleChain = new RuleChain();

ui-ngx/src/app/shared/models/audit-log.models.ts

@@ -47,6 +47,9 @@ export enum ActionType {
   RELATIONS_DELETED = 'RELATIONS_DELETED',
   ALARM_ACK = 'ALARM_ACK',
   ALARM_CLEAR = 'ALARM_CLEAR',
+  ADDED_COMMENT = 'ADDED_COMMENT',
+  UPDATED_COMMENT = 'UPDATED_COMMENT',
+  DELETED_COMMENT = 'DELETED_COMMENT',
   LOGIN = 'LOGIN',
   LOGOUT = 'LOGOUT',
   LOCKOUT = 'LOCKOUT',
@@ -85,6 +88,9 @@ export const actionTypeTranslations = new Map<ActionType, string>(
     [ActionType.RELATIONS_DELETED, 'audit-log.type-relations-delete'],
     [ActionType.ALARM_ACK, 'audit-log.type-alarm-ack'],
     [ActionType.ALARM_CLEAR, 'audit-log.type-alarm-clear'],
+    [ActionType.ADDED_COMMENT, 'audit-log.type-added-comment'],
+    [ActionType.UPDATED_COMMENT, 'audit-log.type-updated-comment'],
+    [ActionType.DELETED_COMMENT, 'audit-log.type-deleted-comment'],
     [ActionType.LOGIN, 'audit-log.type-login'],
     [ActionType.LOGOUT, 'audit-log.type-logout'],
     [ActionType.LOCKOUT, 'audit-log.type-lockout'],

ui-ngx/src/assets/locale/locale.constant-en_US.json

@@ -728,6 +728,9 @@
         "type-relations-delete": "All relation deleted",
         "type-alarm-ack": "Acknowledged",
         "type-alarm-clear": "Cleared",
+        "type-added-comment": "Added comment",
+        "type-updated-comment": "Updated comment",
+        "type-deleted-comment": "Deleted comment",
         "type-login": "Login",
         "type-logout": "Logout",
         "type-lockout": "Lockout",