From 89ee862b13e74767313aa1728b67ac4fa208385b Mon Sep 17 00:00:00 2001
From: zbeacon <ibarkov.ua@gmail.com>
Date: Fri, 17 Mar 2023 11:28:59 +0200
Subject: [PATCH] Added sorting for alarm assignee field in query

---
 .../server/dao/sql/query/DefaultAlarmQueryRepository.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java
index ecf9c1c95f..88cc5c23d1 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java
@@ -148,6 +148,10 @@ public class DefaultAlarmQueryRepository implements AlarmQueryRepository {
             }
             EntityDataSortOrder sortOrder = pageLink.getSortOrder();
 
+            if (EntityKeyType.ALARM_FIELD.equals(sortOrder.getKey().getType()) && ASSIGNEE_KEY.equalsIgnoreCase(sortOrder.getKey().getKey())) {
+                sortOrder = new EntityDataSortOrder(new EntityKey(EntityKeyType.ALARM_FIELD, ASSIGNEE_EMAIL_KEY), sortOrder.getDirection());
+            }
+
             List<EntityKey> alarmFields = new ArrayList<>();
             for (EntityKey key : query.getAlarmFields()) {
                 if (EntityKeyType.ALARM_FIELD.equals(key.getType()) && ASSIGNEE_KEY.equalsIgnoreCase(key.getKey())) {