From caa831e7fa79c722a0fe65e0e10551db7244ddec Mon Sep 17 00:00:00 2001
From: Andrii Landiak <andriylandiak@gmail.com>
Date: Thu, 24 Jul 2025 16:32:38 +0300
Subject: [PATCH] Refactoring clean up of entity alarm records after review

---
 .../housekeeper/processor/AlarmsDeletionTaskProcessor.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AlarmsDeletionTaskProcessor.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AlarmsDeletionTaskProcessor.java
index d19b26de2d..1c7d312e8b 100644
--- a/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AlarmsDeletionTaskProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AlarmsDeletionTaskProcessor.java
@@ -59,15 +59,14 @@ public class AlarmsDeletionTaskProcessor extends HousekeeperTaskProcessor<Alarms
                 lastCreatedTime = last.getSecond();
                 log.debug("[{}][{}][{}] Submitted task for deleting {} alarms", tenantId, entityType, entityId, alarms.size());
             }
+            int count = alarmService.deleteEntityAlarmRecords(tenantId, entityId);
+            log.debug("[{}][{}][{}] Deleted {} entity alarms", tenantId, entityType, entityId, count);
         } else {
             for (UUID alarmId : task.getAlarms()) {
                 alarmService.delAlarm(tenantId, new AlarmId(alarmId));
             }
             log.debug("[{}][{}][{}] Deleted {} alarms", tenantId, entityType, entityId, task.getAlarms().size());
         }
-
-        int count = alarmService.deleteEntityAlarmRecords(tenantId, entityId);
-        log.debug("[{}][{}][{}] Deleted {} entity alarms", tenantId, entityType, entityId, count);
     }
 
     @Override