Merge pull request #10612 from thingsboard/fix/notification-request-stats

Limit notification request errors stats

application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java

@@ -523,18 +523,17 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
 
     @Test
     public void testNotificationRequestStats() throws Exception {
-        wsClient.subscribeForUnreadNotifications(10);
-        wsClient.waitForReply(true);
-
-        wsClient.registerWaitForUpdate();
         NotificationTarget notificationTarget = createNotificationTarget(customerUserId);
-        NotificationRequest notificationRequest = submitNotificationRequest(notificationTarget.getId(), "Test :)", NotificationDeliveryMethod.WEB);
-        wsClient.waitForUpdate();
 
-        await().atMost(2, TimeUnit.SECONDS)
+        NotificationRequest notificationRequest = submitNotificationRequest(notificationTarget.getId(), "Test :)", NotificationDeliveryMethod.WEB);
-                .until(() -> findNotificationRequest(notificationRequest.getId()).isSent());
+        NotificationRequestStats stats = awaitNotificationRequest(notificationRequest.getId());
-        NotificationRequestStats stats = getStats(notificationRequest.getId());
         assertThat(stats.getSent().get(NotificationDeliveryMethod.WEB)).hasValue(1);
+
+        doDelete("/api/user/mobile/session").andExpect(status().isOk());
+        notificationRequest = submitNotificationRequest(notificationTarget.getId(), "Test", NotificationDeliveryMethod.MOBILE_APP);
+        stats = awaitNotificationRequest(notificationRequest.getId());
+        assertThat(stats.getErrors().get(NotificationDeliveryMethod.MOBILE_APP)).hasSize(1);
+        assertThat(stats.getTotalErrors()).hasValue(1);
     }
 
     @Test

application/src/test/java/org/thingsboard/server/service/notification/NotificationApiWsClient.java

@@ -106,9 +106,12 @@ public class NotificationApiWsClient extends TbTestWebSocketClient {
                 }
             }
         } else if (updateType == CmdUpdateType.NOTIFICATIONS_COUNT) {
-            lastCountUpdate = JacksonUtil.treeToValue(update, UnreadNotificationsCountUpdate.class);
+            UnreadNotificationsCountUpdate countUpdate = JacksonUtil.treeToValue(update, UnreadNotificationsCountUpdate.class);
+            if (lastCountUpdate == null || countUpdate.getSequenceNumber() > lastCountUpdate.getSequenceNumber()) {
+                lastCountUpdate = countUpdate;
                 unreadCount = lastCountUpdate.getTotalUnreadCount();
             }
+        }
         super.onMessage(s);
     }
 

common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationRequestStats.java

@@ -34,7 +34,6 @@ public class NotificationRequestStats {
     @JsonIgnore
     private final AtomicInteger totalSent;
     private final Map<NotificationDeliveryMethod, Map<String, String>> errors;
-    @JsonIgnore
     private final AtomicInteger totalErrors;
     private String error;
     @JsonIgnore
@@ -51,11 +50,19 @@ public class NotificationRequestStats {
     @JsonCreator
     public NotificationRequestStats(@JsonProperty("sent") Map<NotificationDeliveryMethod, AtomicInteger> sent,
                                     @JsonProperty("errors") Map<NotificationDeliveryMethod, Map<String, String>> errors,
+                                    @JsonProperty("totalErrors") Integer totalErrors,
                                     @JsonProperty("error") String error) {
         this.sent = sent;
         this.totalSent = null;
         this.errors = errors;
-        this.totalErrors = null;
+        if (totalErrors == null) {
+            if (errors != null) {
+                totalErrors = errors.values().stream().mapToInt(Map::size).sum();
+            } else {
+                totalErrors = 0;
+            }
+        }
+        this.totalErrors = new AtomicInteger(totalErrors);
         this.error = error;
         this.processedRecipients = Collections.emptyMap();
     }
@@ -73,7 +80,10 @@ public class NotificationRequestStats {
         if (errorMessage == null) {
             errorMessage = error.getClass().getSimpleName();
         }
-        errors.computeIfAbsent(deliveryMethod, k -> new ConcurrentHashMap<>()).put(recipient.getTitle(), errorMessage);
+        Map<String, String> errors = this.errors.computeIfAbsent(deliveryMethod, k -> new ConcurrentHashMap<>());
+        if (errors.size() < 100) {
+            errors.put(recipient.getTitle(), errorMessage);
+        }
         totalErrors.incrementAndGet();
     }
 

ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-config.resolver.ts

@@ -165,8 +165,7 @@ export class SentTableConfigResolver implements Resolve<EntityTableConfig<Notifi
     if (!stats?.errors) {
       return '';
     }
-    let countError = 0;
+    const countError = stats.totalErrors;
-    Object.keys(stats.errors).forEach(method => countError += Object.keys(stats.errors[method]).length);
     if (countError === 0) {
       return '';
     }

ui-ngx/src/app/shared/models/notification.models.ts

@@ -81,7 +81,7 @@ export interface NotificationRequestPreview {
 export interface NotificationRequestStats {
   sent: Map<NotificationDeliveryMethod, any>;
   errors: { [key in NotificationDeliveryMethod]: {[errorKey in string]: string}};
-  processedRecipients: Map<NotificationDeliveryMethod, Set<UserId>>;
+  totalErrors: number;
 }
 
 export interface NotificationRequestConfig {