From 0577d66dcad395f3c82a1e8a547e54df1f5a5b9b Mon Sep 17 00:00:00 2001
From: IrynaMatveieva <irina.m2004@icloud.com>
Date: Mon, 8 Dec 2025 12:37:20 +0200
Subject: [PATCH] return the most recent ts of default args if all are default

---
 .../service/cf/ctx/state/ArgumentEntry.java   |  2 --
 .../ctx/state/BaseCalculatedFieldState.java   | 32 +++++++++++++------
 .../ctx/state/SingleValueArgumentEntry.java   |  5 ---
 .../cf/ctx/state/TsRollingArgumentEntry.java  |  1 -
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/ArgumentEntry.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/ArgumentEntry.java
index 3df43d8c2b..83e10b8194 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/ArgumentEntry.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/ArgumentEntry.java
@@ -40,8 +40,6 @@ public interface ArgumentEntry {
 
     Object getValue();
 
-    long getLatestTs();
-
     boolean updateEntry(ArgumentEntry entry);
 
     boolean isEmpty();
diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/BaseCalculatedFieldState.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/BaseCalculatedFieldState.java
index b6d4ad0fac..14370aa68c 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/BaseCalculatedFieldState.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/BaseCalculatedFieldState.java
@@ -37,15 +37,13 @@ public abstract class BaseCalculatedFieldState implements CalculatedFieldState {
     protected Map<String, ArgumentEntry> arguments;
     protected boolean sizeExceedsLimit;
 
-    protected long latestTimestamp = DEFAULT_LAST_UPDATE_TS;
-
     public BaseCalculatedFieldState(List<String> requiredArguments) {
         this.requiredArguments = requiredArguments;
         this.arguments = new HashMap<>();
     }
 
     public BaseCalculatedFieldState() {
-        this(new ArrayList<>(), new HashMap<>(), false, DEFAULT_LAST_UPDATE_TS);
+        this(new ArrayList<>(), new HashMap<>(), false);
     }
 
     @Override
@@ -111,12 +109,28 @@ public abstract class BaseCalculatedFieldState implements CalculatedFieldState {
     protected abstract void validateNewEntry(ArgumentEntry newEntry);
 
     public long getLatestTimestamp() {
-        long currentLatestTs = arguments.values().stream()
-                .mapToLong(ArgumentEntry::getLatestTs)
-                .max()
-                .orElse(DEFAULT_LAST_UPDATE_TS);
-        latestTimestamp = Math.max(currentLatestTs, latestTimestamp);
-        return latestTimestamp;
+        long latestTs = DEFAULT_LAST_UPDATE_TS;
+
+        boolean allDefault = arguments.values().stream().allMatch(entry -> {
+            if (entry instanceof SingleValueArgumentEntry single) {
+                return single.isDefaultValue();
+            }
+            return false;
+        });
+
+        for (ArgumentEntry entry : arguments.values()) {
+            if (entry instanceof SingleValueArgumentEntry single) {
+                if (allDefault) {
+                    latestTs = Math.max(latestTs, single.getTs());
+                } else if (!single.isDefaultValue()) {
+                    latestTs = Math.max(latestTs, single.getTs());
+                }
+            } else if (entry instanceof TsRollingArgumentEntry rolling) {
+                latestTs = Math.max(latestTs, rolling.getLatestTs());
+            }
+        }
+
+        return latestTs;
     }
 
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SingleValueArgumentEntry.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SingleValueArgumentEntry.java
index 186af92f38..2f9a7de940 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SingleValueArgumentEntry.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SingleValueArgumentEntry.java
@@ -98,11 +98,6 @@ public class SingleValueArgumentEntry implements ArgumentEntry {
         return isEmpty() ? null : kvEntryValue.getValue();
     }
 
-    @Override
-    public long getLatestTs() {
-        return !isDefaultValue() ? ts : DEFAULT_LAST_UPDATE_TS;
-    }
-
     @Override
     public TbelCfArg toTbelCfArg() {
         Object value = kvEntryValue.getValue();
diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/TsRollingArgumentEntry.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/TsRollingArgumentEntry.java
index ada46a841e..e01d8b7369 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/TsRollingArgumentEntry.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/TsRollingArgumentEntry.java
@@ -85,7 +85,6 @@ public class TsRollingArgumentEntry implements ArgumentEntry {
         return tsRecords;
     }
 
-    @Override
     public long getLatestTs() {
         var lastEntry = tsRecords.lastEntry();
         return (lastEntry != null) ? lastEntry.getKey() : DEFAULT_LAST_UPDATE_TS;