From 7d088bda02aaa9decd845394042e9931b89c66bc Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Mon, 18 Nov 2024 17:18:56 +0200
Subject: [PATCH] added ordering by id

---
 .../DefaultTbEntityDataSubscriptionService.java             | 6 +++---
 .../service/subscription/TbAlarmStatusSubscription.java     | 2 +-
 .../thingsboard/server/dao/sql/alarm/AlarmRepository.java   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbEntityDataSubscriptionService.java b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbEntityDataSubscriptionService.java
index d1057190e2..00f360d2c0 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbEntityDataSubscriptionService.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbEntityDataSubscriptionService.java
@@ -470,7 +470,7 @@ public class DefaultTbEntityDataSubscriptionService implements TbEntityDataSubsc
         List<UUID> alarmIds = alarmService.findActiveOriginatorAlarms(subscription.getTenantId(), originatorAlarmFilter, alarmsPerAlarmStatusSubscriptionCacheSize);
 
         subscription.getAlarmIds().addAll(alarmIds);
-        subscription.setFullCache(alarmIds.size() == alarmsPerAlarmStatusSubscriptionCacheSize);
+        subscription.setCacheFull(alarmIds.size() == alarmsPerAlarmStatusSubscriptionCacheSize);
     }
 
     private void sendUpdate(String sessionId, CmdUpdate update) {
@@ -487,7 +487,7 @@ public class DefaultTbEntityDataSubscriptionService implements TbEntityDataSubsc
                 if (!subscription.matches(alarm) || subscriptionUpdate.isAlarmDeleted()) {
                     alarmsIds.remove(alarm.getId().getId());
                     if (alarmsIds.isEmpty()) {
-                        if (subscription.isFullCache()) {
+                        if (subscription.isCacheFull()) {
                             fetchActiveAlarms(subscription);
                             if (alarmsIds.isEmpty()) {
                                 sendUpdate(subscription.getSessionId(), subscription.createUpdate());
@@ -504,7 +504,7 @@ public class DefaultTbEntityDataSubscriptionService implements TbEntityDataSubsc
                         sendUpdate(subscription.getSessionId(), subscription.createUpdate());
                     }
                 } else {
-                    subscription.setFullCache(true);
+                    subscription.setCacheFull(true);
                 }
             }
         } catch (Exception e) {
diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubscription.java b/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubscription.java
index 6d0512d633..12cb763a8a 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubscription.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubscription.java
@@ -38,7 +38,7 @@ public class TbAlarmStatusSubscription extends TbSubscription<AlarmSubscriptionU
     private final Set<UUID> alarmIds = new HashSet<>();
     @Getter
     @Setter
-    private boolean fullCache;
+    private boolean cacheFull;
     @Getter
     private final List<String> typeList;
     @Getter
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java
index 417a810e25..6083dac6cf 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java
@@ -408,7 +408,7 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
             "WHERE a.originator_id = :originatorId " +
             "AND (COALESCE(:alarmTypes) IS NULL OR a.type IN (:alarmTypes)) " +
             "AND (COALESCE(:alarmSeverities) IS NULL OR a.severity IN (:alarmSeverities)) " +
-            "AND (a.cleared = false) LIMIT :limit", nativeQuery = true)
+            "AND (a.cleared = false) ORDER BY id LIMIT :limit", nativeQuery = true)
     List<UUID> findActiveOriginatorAlarms(@Param("originatorId") UUID originatorId,
                                           @Param("alarmTypes") List<String> alarmTypes,
                                           @Param("alarmSeverities") List<String> alarmSeverities,