#11451 Send total number of notifications in getNotifications end poi…

…nt (#11523)
dotCMS · May 8, 2017 · 957bdc0 · 957bdc0
1 parent 6b3ae06
commit 957bdc0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/dotCMS/src/main/java/com/dotcms/notifications/business/NewNotificationCacheImpl.java b/dotCMS/src/main/java/com/dotcms/notifications/business/NewNotificationCacheImpl.java
@@ -224,7 +224,7 @@ protected Long getUserCount(final String userId) {
 
         Long count = null;
         final String primaryKey   =
-            this.getUserCountPrimaryKey(userId);
+                this.getAllNotificationsPrimaryKey(userId);
 
         try {
 

diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/notification/NotificationResource.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/notification/NotificationResource.java
@@ -117,8 +117,12 @@ public Response getNotifications (@Context final HttpServletRequest request,
             //notificationAPI.markNotificationsAsRead(user.getUserId());
 
             // Let's get the total count
-            final Long total = allUsers ?
-                    this.notificationAPI.getNotificationsCount():
+            Long notificationsCount = allUsers ?
+                    this.notificationAPI.getNotificationsCount() :
+                    this.notificationAPI.getNotificationsCount(user.getUserId());
+
+            final Long totalUnreadNotifications = allUsers ?
+                    this.notificationAPI.getNotificationsCount() :
                     this.notificationAPI.getNewNotificationsCount(user.getUserId());
 
             final List<Notification> notifications = allUsers ?
@@ -139,8 +143,9 @@ public Response getNotifications (@Context final HttpServletRequest request,
                 });
             }
 
-            return Response.ok(new ResponseEntityView(map("count", total, "notifications", notificationsResult)))
-                    .header("Content-Range", "items " + offset + "-" + limit + "/" + total)
+            return Response.ok(new ResponseEntityView(map("totalUnreadNotifications", totalUnreadNotifications,
+                    "notifications", notificationsResult, "total", notificationsCount)))
+                    .header("Content-Range", "items " + offset + "-" + limit + "/" + totalUnreadNotifications)
                     .build(); // 200
         } catch (Exception e) { // this is an unknown error, so we report as a 500.