From bd5ecc2e9b2ee4fcf9d4cfbe4a855b88f4fc1a0a Mon Sep 17 00:00:00 2001
From: IrynaMatveieva <irina.m2004@icloud.com>
Date: Thu, 13 Feb 2025 11:50:50 +0200
Subject: [PATCH] added new debug filter property

---
 .../data/event/CalculatedFieldDebugEventFilter.java   | 11 ++++++++++-
 .../event/CalculatedFieldDebugEventRepository.java    | 10 ++++++++++
 .../server/dao/sql/event/JpaBaseEventDao.java         |  4 ++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/event/CalculatedFieldDebugEventFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/event/CalculatedFieldDebugEventFilter.java
index b458d3dd03..3e56666834 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/event/CalculatedFieldDebugEventFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/event/CalculatedFieldDebugEventFilter.java
@@ -33,6 +33,13 @@ public class CalculatedFieldDebugEventFilter extends DebugEventFilter {
     protected String msgId;
     @Schema(description = "String value representing the message type", example = "POST_TELEMETRY_REQUEST")
     protected String msgType;
+    @Schema(description = "String value representing the arguments that were used in the calculation performed",
+            example = "{\"x\":{\"ts\":1739432016629,\"value\":20},\"y\":{\"ts\":1739429717656,\"value\":12}}")
+    protected String arguments;
+    @Schema(description = "String value representing the result of a calculation",
+            example = "{\"x + y\":54}")
+    protected String result;
+
 
     @Override
     public EventType getEventType() {
@@ -41,7 +48,9 @@ public class CalculatedFieldDebugEventFilter extends DebugEventFilter {
 
     @Override
     public boolean isNotEmpty() {
-        return super.isNotEmpty() || !StringUtils.isEmpty(entityId) || !StringUtils.isEmpty(entityType) || !StringUtils.isEmpty(msgId) || !StringUtils.isEmpty(msgType);
+        return super.isNotEmpty() || !StringUtils.isEmpty(entityId) || !StringUtils.isEmpty(entityType)
+                || !StringUtils.isEmpty(msgId) || !StringUtils.isEmpty(msgType)
+                || !StringUtils.isEmpty(arguments) || !StringUtils.isEmpty(result);
     }
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/CalculatedFieldDebugEventRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/CalculatedFieldDebugEventRepository.java
index dc6f6d7d58..56a39c41f2 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/CalculatedFieldDebugEventRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/CalculatedFieldDebugEventRepository.java
@@ -59,6 +59,8 @@ public interface CalculatedFieldDebugEventRepository extends EventRepository<Cal
                     "AND (:eventEntityType IS NULL OR e.e_entity_type ILIKE concat('%', :eventEntityType, '%')) " +
                     "AND (:msgId IS NULL OR e.e_msg_id = uuid(:msgId)) " +
                     "AND (:msgType IS NULL OR e.e_msg_type ILIKE concat('%', :msgType, '%')) " +
+                    "AND (:eventArguments IS NULL OR e.e_args ILIKE concat('%', :eventArguments, '%')) " +
+                    "AND (:eventResult IS NULL OR e.e_result ILIKE concat('%', :eventResult, '%')) " +
                     "AND ((:isError = FALSE) OR e.e_error IS NOT NULL) " +
                     "AND (:error IS NULL OR e.e_error ILIKE concat('%', :error, '%'))"
             ,
@@ -73,6 +75,8 @@ public interface CalculatedFieldDebugEventRepository extends EventRepository<Cal
                     "AND (:eventEntityType IS NULL OR e.e_entity_type ILIKE concat('%', :eventEntityType, '%')) " +
                     "AND (:msgId IS NULL OR e.e_msg_id = uuid(:msgId)) " +
                     "AND (:msgType IS NULL OR e.e_msg_type ILIKE concat('%', :msgType, '%')) " +
+                    "AND (:eventArguments IS NULL OR e.e_args ILIKE concat('%', :eventArguments, '%')) " +
+                    "AND (:eventResult IS NULL OR e.e_result ILIKE concat('%', :eventResult, '%')) " +
                     "AND ((:isError = FALSE) OR e.e_error IS NOT NULL) " +
                     "AND (:error IS NULL OR e.e_error ILIKE concat('%', :error, '%'))"
     )
@@ -86,6 +90,8 @@ public interface CalculatedFieldDebugEventRepository extends EventRepository<Cal
                                                      @Param("eventEntityType") String eventEntityType,
                                                      @Param("msgId") String eventMsgId,
                                                      @Param("msgType") String eventMsgType,
+                                                     @Param("eventArguments") String eventArguments,
+                                                     @Param("eventResult") String eventResult,
                                                      @Param("isError") boolean isError,
                                                      @Param("error") String error,
                                                      Pageable pageable);
@@ -117,6 +123,8 @@ public interface CalculatedFieldDebugEventRepository extends EventRepository<Cal
                     "AND (:eventEntityType IS NULL OR e.e_entity_type ILIKE concat('%', :eventEntityType, '%')) " +
                     "AND (:msgId IS NULL OR e.e_msg_id = uuid(:msgId)) " +
                     "AND (:msgType IS NULL OR e.e_msg_type ILIKE concat('%', :msgType, '%')) " +
+                    "AND (:eventArguments IS NULL OR e.e_args ILIKE concat('%', :eventArguments, '%')) " +
+                    "AND (:eventResult IS NULL OR e.e_result ILIKE concat('%', :eventResult, '%')) " +
                     "AND ((:isError = FALSE) OR e.e_error IS NOT NULL) " +
                     "AND (:error IS NULL OR e.e_error ILIKE concat('%', :error, '%'))")
     void removeEvents(@Param("tenantId") UUID tenantId,
@@ -129,6 +137,8 @@ public interface CalculatedFieldDebugEventRepository extends EventRepository<Cal
                       @Param("eventEntityType") String eventEntityType,
                       @Param("msgId") String eventMsgId,
                       @Param("msgType") String eventMsgType,
+                      @Param("eventArguments") String eventArguments,
+                      @Param("eventResult") String eventResult,
                       @Param("isError") boolean isError,
                       @Param("error") String error);
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java
index e48210871a..ada91b8096 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java
@@ -308,6 +308,8 @@ public class JpaBaseEventDao implements EventDao {
                         eventFilter.getEntityType(),
                         eventFilter.getMsgId(),
                         eventFilter.getMsgType(),
+                        eventFilter.getArguments(),
+                        eventFilter.getResult(),
                         eventFilter.isError(),
                         eventFilter.getErrorStr(),
                         DaoUtil.toPageable(pageLink, EventEntity.eventColumnMap)));
@@ -401,6 +403,8 @@ public class JpaBaseEventDao implements EventDao {
                 eventFilter.getEntityType(),
                 eventFilter.getMsgId(),
                 eventFilter.getMsgType(),
+                eventFilter.getArguments(),
+                eventFilter.getResult(),
                 eventFilter.isError(),
                 eventFilter.getErrorStr());
     }