Chat Room unread counts

Author: simonredfern

obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala

@@ -16324,7 +16324,7 @@ trait APIMethods600 {
                 val count = if (isOpenRoom) {
                   code.chat.ChatMessageTrait.chatMessageProvider.vend.getUnreadMentionCount(p.chatRoomId, p.userId, p.lastReadAt)
                 } else {
-                  code.chat.ChatMessageTrait.chatMessageProvider.vend.getUnreadCount(p.chatRoomId, p.lastReadAt)
+                  code.chat.ChatMessageTrait.chatMessageProvider.vend.getUnreadCount(p.chatRoomId, p.userId, p.lastReadAt)
                 }
                 count.toList.map(c => UnreadCountJsonV600(chat_room_id = p.chatRoomId, unread_count = c))
               }

obp-api/src/main/scala/code/chat/ChatEventPublisher.scala

@@ -58,6 +58,8 @@ object ChatEventPublisher extends MdcLoggable {
 
   def afterCreate(msg: ChatMessageTrait, senderUsername: String, senderProvider: String, senderConsumerName: String): Unit = {
     publishMessageEvent("new", msg, senderUsername, senderProvider, senderConsumerName)
+    // Sending a message means the sender has "read" the room up to this point
+    ParticipantTrait.participantProvider.vend.updateLastReadAt(msg.chatRoomId, msg.senderUserId)
     Future { broadcastUnreadCounts(msg) }(ExecutionContext.global)
   }
 
@@ -124,7 +126,7 @@ object ChatEventPublisher extends MdcLoggable {
         } else {
           // Private rooms: notify all participants
           val count = ChatMessageTrait.chatMessageProvider.vend
-            .getUnreadCount(msg.chatRoomId, p.lastReadAt).openOr(0L)
+            .getUnreadCount(msg.chatRoomId, p.userId, p.lastReadAt).openOr(0L)
           afterUnreadCountChange(p.userId, msg.chatRoomId, count)
         }
       }

obp-api/src/main/scala/code/chat/ChatMessageTrait.scala

@@ -25,7 +25,7 @@ trait ChatMessageProvider {
   def getMessages(chatRoomId: String, limit: Int, offset: Int, fromDate: Date, toDate: Date): Box[List[ChatMessageTrait]]
   def getThreadReplies(threadId: String): Box[List[ChatMessageTrait]]
   def getMentionsForUser(userId: String, limit: Int, offset: Int): Box[List[ChatMessageTrait]]
-  def getUnreadCount(chatRoomId: String, sinceDate: Date): Box[Long]
+  def getUnreadCount(chatRoomId: String, userId: String, sinceDate: Date): Box[Long]
   def getUnreadMentionCount(chatRoomId: String, userId: String, sinceDate: Date): Box[Long]
 
   def updateMessage(chatMessageId: String, content: String): Box[ChatMessageTrait]

obp-api/src/main/scala/code/chat/MappedChatMessage.scala

@@ -75,11 +75,12 @@ object MappedChatMessageProvider extends ChatMessageProvider {
     if (sinceDate.before(sixtyDaysAgo)) sixtyDaysAgo else sinceDate
   }
 
-  override def getUnreadCount(chatRoomId: String, sinceDate: Date): Box[Long] = {
+  override def getUnreadCount(chatRoomId: String, userId: String, sinceDate: Date): Box[Long] = {
     tryo {
       ChatMessage.count(
         By(ChatMessage.ChatRoomId, chatRoomId),
-        By_>(ChatMessage.createdAt, effectiveSinceDate(sinceDate))
+        By_>(ChatMessage.createdAt, effectiveSinceDate(sinceDate)),
+        NotBy(ChatMessage.SenderUserId, userId)
       )
     }
   }
@@ -89,6 +90,7 @@ object MappedChatMessageProvider extends ChatMessageProvider {
       ChatMessage.count(
         By(ChatMessage.ChatRoomId, chatRoomId),
         By_>(ChatMessage.createdAt, effectiveSinceDate(sinceDate)),
+        NotBy(ChatMessage.SenderUserId, userId),
         Like(ChatMessage.MentionedUserIds, s"%$userId%")
       )
     }