refactor(summary): refactor code to get messages

src/meetings/meetings.controller.ts

@@ -61,8 +61,8 @@ export class MeetingsController {
   }
 
   @Get('testservice')
-  public testService(@Query('bubbleId') bubbleId: string): Promise<any[]> {
-    return this.meetingsService.getBubbleHistory(bubbleId);
+  public testService(@Query('bubbleId') meetingId: number): Promise<any[]> {
+    return this.meetingsService.getMessages(meetingId);
   }
 
   @Get('attendees')

src/meetings/meetings.service.ts

@@ -9,7 +9,7 @@ import { RainbowService } from 'src/rainbow/rainbow.service';
 import { Observable, Subject } from 'rxjs';
 import { ApplicationEvent } from 'src/types/MeetingEvents';
 import { Bubble } from 'rainbow-node-sdk/lib/common/models/Bubble';
-import { Conversation } from 'rainbow-node-sdk/lib/common/models/Conversation';
+import { Message } from 'src/types/message';
 
 export type MeetingEvent =
   | { type: 'bubbleCreated'; id: number; meeting: MeetingWithAttendees }
@@ -166,9 +166,16 @@ export class MeetingsService {
     return meeting;
   }
 
-  public async getBubbleHistory(bubbleId: string): Promise<Conversation[]> {
-    this.rainbow.getBubbleMessagesHistory(bubbleId);
-    return;
+  public async getMessages(meetingId: number): Promise<Message[]> {
+    // TODO: create function
+    const bubbleId = (
+      await this.database.meeting.findUnique({
+        where: {
+          id: meetingId,
+        },
+      })
+    ).bubbleId;
+    return await this.rainbow.getBubbleMessages(bubbleId);
   }
 
   public async delete(id: number): Promise<Meeting> {

src/rainbow/rainbow.service.ts

@@ -9,7 +9,7 @@ import { EventEmitter2 } from '@nestjs/event-emitter';
 import { ApplicationEvent } from 'src/types/MeetingEvents';
 import { ConversationsService } from 'rainbow-node-sdk/lib/services/ConversationsService';
 import { ImsService } from 'rainbow-node-sdk/lib/services/ImsService';
-import { Message } from 'rainbow-node-sdk/lib/common/models/Message';
+import { Message } from 'src/types/message';
 
 @Injectable()
 export class RainbowService implements OnApplicationShutdown {
@@ -167,19 +167,21 @@ export class RainbowService implements OnApplicationShutdown {
     return url;
   }
 
-  public async getBubbleMessagesHistory(bubbleId: string): Promise<any[]> {
-    const convService = this.rainbowSDK.conversations as ConversationsService;
+  public async getBubbleMessages(bubbleId: string): Promise<Message[]> {
+    const conversationService = this.rainbowSDK
+      .conversations as ConversationsService;
     const imService = this.rainbowSDK.im as ImsService;
-    const conversation = await convService.getConversationByBubbleId(bubbleId);
+    const conversation =
+      await conversationService.getConversationByBubbleId(bubbleId);
     const conversationMessages =
       await imService.getMessagesFromConversation(conversation);
 
-    const messages = conversationMessages.messages as Message[];
-
-    messages.map((message) => {
-      console.log('content', message.content);
-      console.log('from', message.from.displayName);
-    });
-    return;
+    return conversationMessages.messages.map(
+      (message) =>
+        ({
+          content: message.content,
+          senderName: message.from.displayName,
+        }) as Message,
+    );
   }
 }

src/types/message.ts

@@ -0,0 +1,4 @@
+export type Message = {
+  content: string;
+  senderName: string;
+};