From faf842f9986541d270529281b022a43011795038 Mon Sep 17 00:00:00 2001
From: dshvaika <dshvaika@thingsboard.io>
Date: Wed, 13 Aug 2025 19:03:14 +0300
Subject: [PATCH] Updated toTbelCfArg implementation for
 GeofencingArgumentEntry

---
 .../service/cf/ctx/state/GeofencingArgumentEntry.java |  2 +-
 application/src/main/resources/logback.xml            |  1 +
 .../RelationQueryDynamicSourceConfiguration.java      |  2 ++
 .../script/api/tbel/TbelCfTsGeofencingArg.java        | 11 +++++++++--
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/GeofencingArgumentEntry.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/GeofencingArgumentEntry.java
index 4b88419fbb..509bb46c60 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/GeofencingArgumentEntry.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/GeofencingArgumentEntry.java
@@ -72,7 +72,7 @@ public class GeofencingArgumentEntry implements ArgumentEntry {
 
     @Override
     public TbelCfArg toTbelCfArg() {
-        return new TbelCfTsGeofencingArg();
+        return new TbelCfTsGeofencingArg(zoneStates);
     }
 
     private Map<EntityId, GeofencingZoneState> toZones(Map<EntityId, KvEntry> entityIdKvEntryMap) {
diff --git a/application/src/main/resources/logback.xml b/application/src/main/resources/logback.xml
index f5a8d47df1..8e1a49faef 100644
--- a/application/src/main/resources/logback.xml
+++ b/application/src/main/resources/logback.xml
@@ -58,6 +58,7 @@
 
     <!-- CF actors message processors trace -->
     <!--    <logger name="org.thingsboard.server.actors.calculatedField" level="TRACE" />-->
+
     <logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" />
 
     <root level="INFO">
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/RelationQueryDynamicSourceConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/RelationQueryDynamicSourceConfiguration.java
index e2a33228c6..c34199a9d7 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/RelationQueryDynamicSourceConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/RelationQueryDynamicSourceConfiguration.java
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.common.data.cf.configuration;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.StringUtils;
@@ -59,6 +60,7 @@ public class RelationQueryDynamicSourceConfiguration implements CfArgumentDynami
         }
     }
 
+    @JsonIgnore
     public boolean isSimpleRelation() {
         return maxLevel == 1 && CollectionsUtil.isEmpty(entityTypes);
     }
diff --git a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbelCfTsGeofencingArg.java b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbelCfTsGeofencingArg.java
index 46ac553a76..f1e8ec16db 100644
--- a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbelCfTsGeofencingArg.java
+++ b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbelCfTsGeofencingArg.java
@@ -15,11 +15,18 @@
  */
 package org.thingsboard.script.api.tbel;
 
-// TODO: should I add any specific logic for this?
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
 public class TbelCfTsGeofencingArg implements TbelCfArg {
 
-    public TbelCfTsGeofencingArg() {
+    private final Object value;
 
+    @JsonCreator
+    public TbelCfTsGeofencingArg(@JsonProperty("value") Object value) {
+        this.value = value;
     }
 
     @Override