Merge pull request #2755 from simonredfern/develop

Some denormalisations of chat room e.g.: last_message_at,

Author: simonredfern

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

@@ -12830,6 +12830,10 @@ trait APIMethods600 {
         created_by_provider = "https://github.com",
         is_open_room = false,
         is_archived = false,
+        last_message_at = Some(new java.util.Date()),
+        last_message_preview = Some("Hello everyone!"),
+        last_message_sender = Some("robert.x.0.gh"),
+        unread_count = Some(3),
         created_at = new java.util.Date(),
         updated_at = new java.util.Date()
       ),
@@ -12897,6 +12901,10 @@ trait APIMethods600 {
         created_by_provider = "https://github.com",
         is_open_room = false,
         is_archived = false,
+        last_message_at = Some(new java.util.Date()),
+        last_message_preview = Some("Hello everyone!"),
+        last_message_sender = Some("robert.x.0.gh"),
+        unread_count = Some(3),
         created_at = new java.util.Date(),
         updated_at = new java.util.Date()
       ),
@@ -12963,6 +12971,10 @@ trait APIMethods600 {
         created_by_provider = "https://github.com",
         is_open_room = false,
         is_archived = false,
+        last_message_at = Some(new java.util.Date()),
+        last_message_preview = Some("Hello everyone!"),
+        last_message_sender = Some("robert.x.0.gh"),
+        unread_count = Some(3),
         created_at = new java.util.Date(),
         updated_at = new java.util.Date()
       ))),
@@ -12984,8 +12996,11 @@ trait APIMethods600 {
             } map {
               x => unboxFullOrFail(x, callContext, s"$UnknownError Cannot get chat rooms", 400)
             }
+            unreadCounts <- Future {
+              computeUnreadCounts(rooms, u.userId)
+            }
           } yield {
-            (JSONFactory600.createChatRoomsJson(rooms), HttpCode.`200`(callContext))
+            (JSONFactory600.createChatRoomsJson(rooms, unreadCounts), HttpCode.`200`(callContext))
           }
       }
     }
@@ -13015,6 +13030,10 @@ trait APIMethods600 {
         created_by_provider = "https://github.com",
         is_open_room = false,
         is_archived = false,
+        last_message_at = Some(new java.util.Date()),
+        last_message_preview = Some("Hello everyone!"),
+        last_message_sender = Some("robert.x.0.gh"),
+        unread_count = Some(3),
         created_at = new java.util.Date(),
         updated_at = new java.util.Date()
       ))),
@@ -13036,8 +13055,11 @@ trait APIMethods600 {
             } map {
               x => unboxFullOrFail(x, callContext, s"$UnknownError Cannot get chat rooms", 400)
             }
+            unreadCounts <- Future {
+              computeUnreadCounts(rooms, u.userId)
+            }
           } yield {
-            (JSONFactory600.createChatRoomsJson(rooms), HttpCode.`200`(callContext))
+            (JSONFactory600.createChatRoomsJson(rooms, unreadCounts), HttpCode.`200`(callContext))
           }
       }
     }
@@ -13067,6 +13089,10 @@ trait APIMethods600 {
         created_by_provider = "https://github.com",
         is_open_room = false,
         is_archived = false,
+        last_message_at = Some(new java.util.Date()),
+        last_message_preview = Some("Hello everyone!"),
+        last_message_sender = Some("robert.x.0.gh"),
+        unread_count = Some(3),
         created_at = new java.util.Date(),
         updated_at = new java.util.Date()
       ),
@@ -13126,6 +13152,10 @@ trait APIMethods600 {
         created_by_provider = "https://github.com",
         is_open_room = false,
         is_archived = false,
+        last_message_at = Some(new java.util.Date()),
+        last_message_preview = Some("Hello everyone!"),
+        last_message_sender = Some("robert.x.0.gh"),
+        unread_count = Some(3),
         created_at = new java.util.Date(),
         updated_at = new java.util.Date()
       ),
@@ -13185,6 +13215,10 @@ trait APIMethods600 {
         created_by_provider = "https://github.com",
         is_open_room = false,
         is_archived = false,
+        last_message_at = Some(new java.util.Date()),
+        last_message_preview = Some("Hello everyone!"),
+        last_message_sender = Some("robert.x.0.gh"),
+        unread_count = Some(3),
         created_at = new java.util.Date(),
         updated_at = new java.util.Date()
       ),
@@ -13254,6 +13288,10 @@ trait APIMethods600 {
         created_by_provider = "https://github.com",
         is_open_room = false,
         is_archived = false,
+        last_message_at = Some(new java.util.Date()),
+        last_message_preview = Some("Hello everyone!"),
+        last_message_sender = Some("robert.x.0.gh"),
+        unread_count = Some(3),
         created_at = new java.util.Date(),
         updated_at = new java.util.Date()
       ),
@@ -13418,6 +13456,10 @@ trait APIMethods600 {
         created_by_provider = "https://github.com",
         is_open_room = false,
         is_archived = true,
+        last_message_at = Some(new java.util.Date()),
+        last_message_preview = Some("Hello everyone!"),
+        last_message_sender = Some("robert.x.0.gh"),
+        unread_count = Some(3),
         created_at = new java.util.Date(),
         updated_at = new java.util.Date()
       ),
@@ -13479,6 +13521,10 @@ trait APIMethods600 {
         created_by_provider = "https://github.com",
         is_open_room = false,
         is_archived = true,
+        last_message_at = Some(new java.util.Date()),
+        last_message_preview = Some("Hello everyone!"),
+        last_message_sender = Some("robert.x.0.gh"),
+        unread_count = Some(3),
         created_at = new java.util.Date(),
         updated_at = new java.util.Date()
       ),
@@ -13543,6 +13589,10 @@ trait APIMethods600 {
         created_by_provider = "provider",
         is_open_room = true,
         is_archived = false,
+        last_message_at = Some(new java.util.Date()),
+        last_message_preview = Some("Hello everyone!"),
+        last_message_sender = Some("robert.x.0.gh"),
+        unread_count = Some(3),
         created_at = new java.util.Date(),
         updated_at = new java.util.Date()
       ),
@@ -13608,6 +13658,10 @@ trait APIMethods600 {
         created_by_provider = "provider",
         is_open_room = true,
         is_archived = false,
+        last_message_at = Some(new java.util.Date()),
+        last_message_preview = Some("Hello everyone!"),
+        last_message_sender = Some("robert.x.0.gh"),
+        unread_count = Some(3),
         created_at = new java.util.Date(),
         updated_at = new java.util.Date()
       ),
@@ -16252,6 +16306,10 @@ trait APIMethods600 {
         created_by_provider = "https://github.com",
         is_open_room = false,
         is_archived = false,
+        last_message_at = Some(new java.util.Date()),
+        last_message_preview = Some("Hello everyone!"),
+        last_message_sender = Some("robert.x.0.gh"),
+        unread_count = Some(3),
         created_at = new java.util.Date(),
         updated_at = new java.util.Date()
       ))),
@@ -16273,13 +16331,22 @@ trait APIMethods600 {
             } map {
               x => unboxFullOrFail(x, callContext, s"$UnknownError Cannot get participant records", 400)
             }
-            rooms <- Future {
+            roomsAndCounts <- Future {
               participantRecords.flatMap { p =>
-                code.chat.ChatRoomTrait.chatRoomProvider.vend.getChatRoom(p.chatRoomId).toList
+                code.chat.ChatRoomTrait.chatRoomProvider.vend.getChatRoom(p.chatRoomId).toList.map { room =>
+                  val count = if (room.isOpenRoom) {
+                    code.chat.ChatMessageTrait.chatMessageProvider.vend.getUnreadMentionCount(p.chatRoomId, p.userId, p.lastReadAt)
+                  } else {
+                    code.chat.ChatMessageTrait.chatMessageProvider.vend.getUnreadCount(p.chatRoomId, p.userId, p.lastReadAt)
+                  }
+                  (room, count.openOr(0L))
+                }
               }
             }
           } yield {
-            (JSONFactory600.createChatRoomsJson(rooms), HttpCode.`200`(callContext))
+            val rooms = roomsAndCounts.map(_._1)
+            val unreadCounts = roomsAndCounts.map { case (room, count) => room.chatRoomId -> count }.toMap
+            (JSONFactory600.createChatRoomsJson(rooms, unreadCounts), HttpCode.`200`(callContext))
           }
       }
     }
@@ -16463,6 +16530,83 @@ trait APIMethods600 {
       }
     }
 
+    // 29. getBulkReactions
+    staticResourceDocs += ResourceDoc(
+      getBulkReactions,
+      implementedInApiVersion,
+      nameOf(getBulkReactions),
+      "GET",
+      "/chat-rooms/CHAT_ROOM_ID/messages/reactions",
+      "Get Bulk Reactions",
+      s"""Get reactions for multiple messages in a single request.
+         |
+         |Pass message IDs as a comma-separated query parameter: ?message_ids=id1,id2,id3
+         |
+         |Returns reactions grouped by message ID.
+         |
+         |Authentication is Required
+         |
+         |""".stripMargin,
+      EmptyBody,
+      BulkReactionsJsonV600(message_reactions = List(MessageReactionsJsonV600(
+        chat_message_id = "msg-id-123",
+        reactions = List(ReactionSummaryJsonV600(emoji = "thumbsup", count = 2, user_ids = List("user-1", "user-2")))
+      ))),
+      List(
+        $AuthenticatedUserIsRequired,
+        ChatRoomNotFound,
+        NotChatRoomParticipant,
+        UnknownError
+      ),
+      List(apiTagChat),
+      None
+    )
+
+    lazy val getBulkReactions: OBPEndpoint = {
+      case "chat-rooms" :: chatRoomId :: "messages" :: "reactions" :: Nil JsonGet _ => {
+        cc => implicit val ec = EndpointContext(Some(cc))
+          for {
+            (Full(u), callContext) <- authenticatedAccess(cc)
+            room <- Future {
+              code.chat.ChatRoomTrait.chatRoomProvider.vend.getChatRoom(chatRoomId)
+            } map {
+              x => unboxFullOrFail(x, callContext, ChatRoomNotFound, 404)
+            }
+            _ <- Future {
+              code.chat.ChatPermissions.isParticipant(chatRoomId, u.userId)
+            } map {
+              x => unboxFullOrFail(x, callContext, NotChatRoomParticipant, 403)
+            }
+            messageIds = ObpS.param("message_ids").map(_.split(",").map(_.trim).filter(_.nonEmpty).toList).getOrElse(List.empty)
+            allReactions <- Future {
+              code.chat.ReactionTrait.reactionProvider.vend.getReactionsForMessages(messageIds)
+            } map {
+              x => unboxFullOrFail(x, callContext, s"$UnknownError Cannot get reactions", 400)
+            }
+          } yield {
+            (JSONFactory600.createBulkReactionsJson(allReactions, messageIds), HttpCode.`200`(callContext))
+          }
+      }
+    }
+
+    /**
+     * Compute unread counts for a list of rooms for a given user.
+     * For open rooms, counts only mentions. For private rooms, counts all unread messages.
+     */
+    private def computeUnreadCounts(rooms: List[code.chat.ChatRoomTrait], userId: String): Map[String, Long] = {
+      rooms.flatMap { room =>
+        val participant = code.chat.ChatPermissions.isParticipant(room.chatRoomId, userId)
+        participant.toList.map { p =>
+          val count = if (room.isOpenRoom) {
+            code.chat.ChatMessageTrait.chatMessageProvider.vend.getUnreadMentionCount(room.chatRoomId, userId, p.lastReadAt)
+          } else {
+            code.chat.ChatMessageTrait.chatMessageProvider.vend.getUnreadCount(room.chatRoomId, userId, p.lastReadAt)
+          }
+          room.chatRoomId -> count.openOr(0L)
+        }
+      }.toMap
+    }
+
   }
 }
 

obp-api/src/main/scala/code/api/v6_0_0/JSONFactory6.0.0.scala

@@ -1192,6 +1192,10 @@ case class ChatRoomJsonV600(
   created_by_provider: String,
   is_open_room: Boolean,
   is_archived: Boolean,
+  last_message_at: Option[java.util.Date],
+  last_message_preview: Option[String],
+  last_message_sender: Option[String],
+  unread_count: Option[Long],
   created_at: java.util.Date,
   updated_at: java.util.Date
 )
@@ -1251,6 +1255,9 @@ case class TypingUsersJsonV600(users: List[TypingUserJsonV600])
 case class UnreadCountJsonV600(chat_room_id: String, unread_count: Long)
 case class UnreadCountsJsonV600(unread_counts: List[UnreadCountJsonV600])
 
+case class MessageReactionsJsonV600(chat_message_id: String, reactions: List[ReactionSummaryJsonV600])
+case class BulkReactionsJsonV600(message_reactions: List[MessageReactionsJsonV600])
+
 case class JoiningKeyJsonV600(joining_key: String)
 
 object JSONFactory600 extends CustomJsonFormats with MdcLoggable {
@@ -2961,8 +2968,9 @@ object JSONFactory600 extends CustomJsonFormats with MdcLoggable {
   }
 
   // Chat / Messaging factory functions
-  def createChatRoomJson(room: code.chat.ChatRoomTrait): ChatRoomJsonV600 = {
+  def createChatRoomJson(room: code.chat.ChatRoomTrait, unreadCount: Option[Long] = None): ChatRoomJsonV600 = {
     val creator = code.users.Users.users.vend.getUserByUserId(room.createdBy)
+    val hasLastMessage = room.lastMessageAt.isDefined
     ChatRoomJsonV600(
       chat_room_id = room.chatRoomId,
       bank_id = room.bankId,
@@ -2974,12 +2982,16 @@ object JSONFactory600 extends CustomJsonFormats with MdcLoggable {
       created_by_provider = creator.map(_.provider).getOrElse(""),
       is_open_room = room.isOpenRoom,
       is_archived = room.isArchived,
+      last_message_at = room.lastMessageAt,
+      last_message_preview = if (hasLastMessage) Some(room.lastMessagePreview) else None,
+      last_message_sender = if (hasLastMessage) Some(room.lastMessageSender) else None,
+      unread_count = unreadCount,
       created_at = room.createdDate,
       updated_at = room.updatedDate
     )
   }
-  def createChatRoomsJson(rooms: List[code.chat.ChatRoomTrait]): ChatRoomsJsonV600 = {
-    ChatRoomsJsonV600(rooms.map(createChatRoomJson))
+  def createChatRoomsJson(rooms: List[code.chat.ChatRoomTrait], unreadCounts: Map[String, Long] = Map.empty): ChatRoomsJsonV600 = {
+    ChatRoomsJsonV600(rooms.map(r => createChatRoomJson(r, unreadCounts.get(r.chatRoomId))))
   }
 
   def createParticipantJson(p: code.chat.ParticipantTrait): ParticipantJsonV600 = {
@@ -3036,6 +3048,17 @@ object JSONFactory600 extends CustomJsonFormats with MdcLoggable {
   def createChatMessagesJson(messages: List[code.chat.ChatMessageTrait], allReactions: Map[String, List[code.chat.ReactionTrait]]): ChatMessagesJsonV600 = {
     ChatMessagesJsonV600(messages.map(msg => createChatMessageJson(msg, allReactions.getOrElse(msg.chatMessageId, List.empty))))
   }
+  def createBulkReactionsJson(allReactions: Map[String, List[code.chat.ReactionTrait]], messageIds: List[String]): BulkReactionsJsonV600 = {
+    BulkReactionsJsonV600(
+      message_reactions = messageIds.map { msgId =>
+        val reactions = allReactions.getOrElse(msgId, List.empty)
+        val summaries = reactions.groupBy(_.emoji).map { case (emoji, rs) =>
+          ReactionSummaryJsonV600(emoji = emoji, count = rs.size, user_ids = rs.map(_.userId))
+        }.toList
+        MessageReactionsJsonV600(chat_message_id = msgId, reactions = summaries)
+      }
+    )
+  }
 
   def createChatMessagesJsonFromRows(
     messages: List[code.chat.DoobieChatMessageQueries.ChatMessageRow],

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

@@ -63,6 +63,13 @@ object ChatEventPublisher extends MdcLoggable {
     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)
+    // Denormalize last message info onto the ChatRoom for efficient listing
+    ChatRoomTrait.chatRoomProvider.vend.updateLastMessageInfo(
+      msg.chatRoomId,
+      msg.createdDate,
+      if (msg.isDeleted) "" else msg.content,
+      senderUsername
+    )
     broadcastUnreadCounts(msg)
   }
 

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

@@ -30,6 +30,7 @@ trait ChatRoomProvider {
   ): Box[ChatRoomTrait]
 
   def setIsOpenRoom(chatRoomId: String, isOpenRoom: Boolean): Box[ChatRoomTrait]
+  def updateLastMessageInfo(chatRoomId: String, lastMessageAt: Date, preview: String, senderUsername: String): Box[ChatRoomTrait]
   def archiveChatRoom(chatRoomId: String): Box[ChatRoomTrait]
   def deleteChatRoom(chatRoomId: String): Box[Boolean]
   def refreshJoiningKey(chatRoomId: String): Box[ChatRoomTrait]
@@ -46,6 +47,9 @@ trait ChatRoomTrait {
   /** Whether this is an "open room" where all users are implicit participants. */
   def isOpenRoom: Boolean
   def isArchived: Boolean
+  def lastMessageAt: Option[Date]
+  def lastMessagePreview: String
+  def lastMessageSender: String
   def createdDate: Date
   def updatedDate: Date
 }