From dd51aba417837db39e381feeea0aefa551e97978 Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Tue, 23 Apr 2024 12:41:41 +0300
Subject: [PATCH] Fix notifications count update race condition in tests

---
 .../service/notification/NotificationApiWsClient.java      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiWsClient.java b/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiWsClient.java
index 96e3e4732e..1ecae638a6 100644
--- a/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiWsClient.java
+++ b/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiWsClient.java
@@ -106,8 +106,11 @@ public class NotificationApiWsClient extends TbTestWebSocketClient {
                 }
             }
         } else if (updateType == CmdUpdateType.NOTIFICATIONS_COUNT) {
-            lastCountUpdate = JacksonUtil.treeToValue(update, UnreadNotificationsCountUpdate.class);
-            unreadCount = lastCountUpdate.getTotalUnreadCount();
+            UnreadNotificationsCountUpdate countUpdate = JacksonUtil.treeToValue(update, UnreadNotificationsCountUpdate.class);
+            if (lastCountUpdate == null || countUpdate.getSequenceNumber() > lastCountUpdate.getSequenceNumber()) {
+                lastCountUpdate = countUpdate;
+                unreadCount = lastCountUpdate.getTotalUnreadCount();
+            }
         }
         super.onMessage(s);
     }