SK-297 added conversation field to get_participants_by_cids reque…

…st (#157)

APIs/JSON/controllers/conversations.js

@@ -120,10 +120,10 @@ class ConversationsController extends BaseJSONController {
     const { id: requestId, get_participants_by_cids: options } = data
 
     const conversationListParticipantsOperation = ServiceLocatorContainer.use("ConversationListParticipantsOperation")
-    const users = await conversationListParticipantsOperation.perform(ws, options)
+    const { users, conversations } = await conversationListParticipantsOperation.perform(ws, options)
 
     return new Response().addBackMessage({
-      response: { id: requestId, users: users },
+      response: { id: requestId, users, conversations },
     })
   }
 

app/providers/operations/conversation/list_participants/index.js

@@ -11,10 +11,13 @@ class ConversationListParticipantsOperation {
     const currentUserId = this.sessionService.getSessionUserId(ws)
     const currentUser = await this.userService.userRepo.findById(currentUserId)
 
-    const participantIds = await this.conversationService.findConversationsParticipantIds(cids, currentUser)
+    const { participantIds, participantsIdsByCids } = await this.conversationService.findConversationsParticipantIds(
+      cids,
+      currentUser
+    )
 
     if (!participantIds.length) {
-      return []
+      return { users: [], conversations: {} }
     }
 
     const users = await this.userService.userRepo.findAllByIds(participantIds)
@@ -23,7 +26,7 @@ class ConversationListParticipantsOperation {
 
     const userFields = usersWithAvatars.map((user) => user.visibleParams())
 
-    return userFields
+    return { users: userFields, conversations: participantsIdsByCids }
   }
 }
 

app/providers/repositories/conversation_participants/index.js

@@ -21,9 +21,24 @@ class ConversationParticipantRepository extends BaseRepository {
     })
     const availableConversationIds = availableConversationParticipants.map((participant) => participant.conversation_id)
 
-    const conversationsParticipants = await this.findAll({ conversation_id: { $in: availableConversationIds } })
-
-    return conversationsParticipants
+    const conversationsParticipants = await this.aggregate([
+      { $match: { conversation_id: { $in: availableConversationIds } } },
+      { $group: { _id: "$conversation_id", users: { $push: "$user_id" } } },
+      {
+        $project: {
+          _id: 0,
+          conversation_id: { $toString: "$_id" },
+          users: { $map: { input: "$users", as: "u", in: { $toString: "$$u" } } },
+        },
+      },
+    ])
+
+    const conversationsParticipantsByIds = conversationsParticipants.reduce((arr, { conversation_id, users }) => {
+      arr[conversation_id] = users
+      return arr
+    }, {})
+
+    return conversationsParticipantsByIds
   }
 
   async findUserConversationIds(conversationIds, user_id) {

app/providers/services/conversation/index.js

@@ -81,7 +81,9 @@ class ConversationService {
       user.native_id
     )
 
-    return conversationsParticipants.map((participant) => participant.user_id)
+    const participantIds = [...new Set(Object.values(conversationsParticipants).flat())]
+
+    return { participantIds, participantsIdsByCids: conversationsParticipants }
   }
 
   async validateConvIdsWhichUserHasAccess(conversationIds, userId) {

docs/API.md

@@ -778,8 +778,14 @@ When a user leaves the group chat, the next message will also be sent to all use
       {
         _id: "63480e68f4794709f802a2fa",
         login: "breadpit"
-      }
-    ]
+      },
+      ...
+    ],
+    conversations: {
+       635a3b4cb15254ebe43e76ff: [634ec51c0b65918393dca5bf, 63480e68f4794709f802a2fa],
+       63563a2ad745dc1c6ad01b5f: [63480e68f4794709f802a2fa, 507f191e810c19729de860ea, 507f191e810c19729de880ee],
+       ...
+    }
   }
 }
 ```