From 0427425f8398768141ab716dffc9a7506795b8aa Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Mon, 9 Jan 2023 13:06:55 +0200
Subject: [PATCH] Added email for AlarmCommentInfo

---
 .../server/common/data/alarm/AlarmCommentInfo.java         | 6 +++++-
 .../server/dao/model/sql/AlarmCommentInfoEntity.java       | 7 +++++--
 .../server/dao/sql/alarm/AlarmCommentRepository.java       | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCommentInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCommentInfo.java
index dbf603fdbc..66300e4cdb 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCommentInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCommentInfo.java
@@ -32,6 +32,9 @@ public class AlarmCommentInfo extends AlarmComment {
     @ApiModelProperty(position = 19, value = "User last name", example = "Brown")
     private String lastName;
 
+    @ApiModelProperty(position = 19, value = "User email address", example = "johnBrown@gmail.com")
+    private String email;
+
     public AlarmCommentInfo() {
         super();
     }
@@ -40,9 +43,10 @@ public class AlarmCommentInfo extends AlarmComment {
         super(alarmComment);
     }
 
-    public AlarmCommentInfo(AlarmComment alarmComment, String firstName, String lastName) {
+    public AlarmCommentInfo(AlarmComment alarmComment, String firstName, String lastName, String email) {
         super(alarmComment);
         this.firstName = firstName;
         this.lastName = lastName;
+        this.email = email;
     }
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmCommentInfoEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmCommentInfoEntity.java
index 3bcb49f260..bc9c5841c5 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmCommentInfoEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmCommentInfoEntity.java
@@ -29,6 +29,8 @@ public class AlarmCommentInfoEntity extends AbstractAlarmCommentEntity<AlarmComm
     private String firstName;
     private String lastName;
 
+    private String email;
+
     public AlarmCommentInfoEntity() {
         super();
     }
@@ -37,14 +39,15 @@ public class AlarmCommentInfoEntity extends AbstractAlarmCommentEntity<AlarmComm
         super(alarmCommentEntity);
     }
 
-    public AlarmCommentInfoEntity(AlarmCommentEntity alarmCommentEntity, String firstName, String lastName) {
+    public AlarmCommentInfoEntity(AlarmCommentEntity alarmCommentEntity, String firstName, String lastName, String email) {
         super(alarmCommentEntity);
         this.firstName = firstName;
         this.lastName = lastName;
+        this.email = email;
     }
 
     @Override
     public AlarmCommentInfo toData() {
-        return new AlarmCommentInfo(super.toAlarmComment(), this.firstName, this.lastName);
+        return new AlarmCommentInfo(super.toAlarmComment(), this.firstName, this.lastName, this.email);
     }
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmCommentRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmCommentRepository.java
index 489928e1f7..19dfd6ec2e 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmCommentRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmCommentRepository.java
@@ -27,7 +27,7 @@ import java.util.UUID;
 
 public interface AlarmCommentRepository extends JpaRepository<AlarmCommentEntity, UUID> {
 
-    @Query(value = "SELECT new org.thingsboard.server.dao.model.sql.AlarmCommentInfoEntity(a, u.firstName, u.lastName) FROM AlarmCommentEntity a " +
+    @Query(value = "SELECT new org.thingsboard.server.dao.model.sql.AlarmCommentInfoEntity(a, u.firstName, u.lastName, u.email) FROM AlarmCommentEntity a " +
             "LEFT JOIN UserEntity u on u.id = a.userId " +
             "WHERE a.alarmId = :alarmId ",
             countQuery = "" +