From bf8384807648b8d22e06d3ba031c89836c933a2c Mon Sep 17 00:00:00 2001
From: dshvaika <dshvaika@thingsboard.io>
Date: Wed, 13 Aug 2025 13:24:52 +0300
Subject: [PATCH] Removed maxAllowedScheduledUpdateIntervalInSecForCF from
 tenantProfileConfiguration

---
 .../tenant/profile/DefaultTenantProfileConfiguration.java | 2 --
 .../server/dao/cf/BaseCalculatedFieldService.java         | 8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
index f35fca23f9..7c174b005b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
@@ -174,8 +174,6 @@ public class DefaultTenantProfileConfiguration implements TenantProfileConfigura
     private long maxArgumentsPerCF = 10;
     @Schema(example = "3600")
     private int minAllowedScheduledUpdateIntervalInSecForCF = 3600;
-    @Schema(example = "86400")
-    private int maxAllowedScheduledUpdateIntervalInSecForCF = 86400;
     @Builder.Default
     @Min(value = 1, message = "must be at least 1")
     @Schema(example = "1000")
diff --git a/dao/src/main/java/org/thingsboard/server/dao/cf/BaseCalculatedFieldService.java b/dao/src/main/java/org/thingsboard/server/dao/cf/BaseCalculatedFieldService.java
index 40694050be..1dc1e16144 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/cf/BaseCalculatedFieldService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/cf/BaseCalculatedFieldService.java
@@ -97,10 +97,10 @@ public class BaseCalculatedFieldService extends AbstractEntityService implements
         if (!configuration.isScheduledUpdateEnabled()) {
             return;
         }
-        var defaultProfileConfiguration = tbTenantProfileCache.get(calculatedField.getTenantId()).getDefaultProfileConfiguration();
-        int min = defaultProfileConfiguration.getMinAllowedScheduledUpdateIntervalInSecForCF();
-        int max = defaultProfileConfiguration.getMaxAllowedScheduledUpdateIntervalInSecForCF();
-        configuration.setScheduledUpdateIntervalSec(Math.max(min, Math.min(configuration.getScheduledUpdateIntervalSec(), max)));
+        int tenantProfileMinAllowedValue = tbTenantProfileCache.get(calculatedField.getTenantId())
+                .getDefaultProfileConfiguration()
+                .getMinAllowedScheduledUpdateIntervalInSecForCF();
+        configuration.setScheduledUpdateIntervalSec(Math.max(configuration.getScheduledUpdateIntervalSec(), tenantProfileMinAllowedValue));
     }
 
     @Override