From e84a1f066201b83579bba6732b43126e7585569a Mon Sep 17 00:00:00 2001
From: Andrii Landiak <andriylandiak@gmail.com>
Date: Wed, 10 Jan 2024 15:00:15 +0200
Subject: [PATCH] Add comment types to convertEntityEventToDownlink

---
 .../thingsboard/server/service/edge/rpc/EdgeGrpcSession.java  | 3 +++
 .../service/edge/rpc/processor/alarm/BaseAlarmProcessor.java  | 4 ++++
 2 files changed, 7 insertions(+)

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
index 14572bc871..5e6f7a263e 100644
--- 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
@@ -531,6 +531,9 @@ public final class EdgeGrpcSession implements Closeable {
                     case RPC_CALL:
                     case ASSIGNED_TO_CUSTOMER:
                     case UNASSIGNED_FROM_CUSTOMER:
+                    case ADDED_COMMENT:
+                    case UPDATED_COMMENT:
+                    case DELETED_COMMENT:
                         downlinkMsg = convertEntityEventToDownlink(edgeEvent);
                         log.trace("[{}][{}] entity message processed [{}]", this.tenantId, this.sessionId, downlinkMsg);
                         break;
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/BaseAlarmProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/BaseAlarmProcessor.java
index e82c2aa2d0..11cd2ab56c 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/BaseAlarmProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/BaseAlarmProcessor.java
@@ -107,6 +107,10 @@ public abstract class BaseAlarmProcessor extends BaseEdgeProcessor {
             throw new RuntimeException("[{" + tenantId + "}] alarmCommentUpdateMsg {" + alarmCommentUpdateMsg + "} cannot be converted to alarm comment");
         }
         try {
+            Alarm alarm = alarmService.findAlarmById(tenantId, new AlarmId(alarmComment.getAlarmId().getId()));
+            if (alarm == null) {
+                return Futures.immediateFuture(null);
+            }
             switch (alarmCommentUpdateMsg.getMsgType()) {
                 case ENTITY_CREATED_RPC_MESSAGE:
                     alarmCommentDao.createAlarmComment(tenantId, alarmComment);