Feature(hynsoo/chat):채팅방 접속시 최근 대화내역 출력 기능 구현 / chats 요청 경로 수정 modern…

…-agile-team#92
Kimsoo0119 · Nov 7, 2022 · 78234b7 · 78234b7
1 parent 1f2b9d8
commit 78234b7
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 4 deletions.
diff --git a/main-project/src/chats/chats-controller.service.ts b/main-project/src/chats/chats-controller.service.ts
@@ -38,7 +38,6 @@ export class ChatsControllerService {
 
   async getChatLog({ userNo, chatRoomNo, currentChatLogNo }: PreviousChatLog) {
     try {
-      // await this.checkRoom({userNo, chatRoomNo})
       await this.checkChatRoom({ userNo, chatRoomNo });
 
       const chatLog = await this.chatLogRepository.getPreviousChatLog(
@@ -52,6 +51,18 @@ export class ChatsControllerService {
     }
   }
 
+  async getRecentChatLog({ userNo, chatRoomNo }: PreviousChatLog) {
+    try {
+      await this.checkChatRoom({ userNo, chatRoomNo });
+
+      const chatLog = await this.chatLogRepository.getRecentChatLog(chatRoomNo);
+
+      return chatLog;
+    } catch (error) {
+      throw error;
+    }
+  }
+
   private async checkChatRoom(chatUserInfo: ChatUserInfo): Promise<void> {
     try {
       const { chatRoomNo } = chatUserInfo;
@@ -75,7 +86,7 @@ export class ChatsControllerService {
         chatUserInfo,
       );
       if (!chatUser) {
-        throw new BadRequestException(`채팅방에 없는 사용자 입니다.`);
+        throw new BadRequestException(`채팅방에 존재하지 않는 사용자 입니다.`);
       }
     } catch (error) {
       throw error;

diff --git a/main-project/src/chats/chats-gateway.service.ts b/main-project/src/chats/chats-gateway.service.ts
@@ -118,6 +118,7 @@ export class ChatsGatewayService {
 
       socket.join(`${user.chatRoomNo}`);
 
+      //추후 로그 또는 삭제
       socket.broadcast.to(`${user.chatRoomNo}`).emit('join-room', {
         username: user.nickname,
         msg: `${user.nickname}님이 접속하셨습니다.`,

diff --git a/main-project/src/chats/chats.controller.ts b/main-project/src/chats/chats.controller.ts
@@ -7,7 +7,7 @@ import { ChatsControllerService } from './chats-controller.service';
 export class ChatsController {
   constructor(private readonly chatControllerService: ChatsControllerService) {}
 
-  @Get('/chatroom/:userNo')
+  @Get('/:userNo')
   @ApiOperation({
     summary: '채팅 목록 API',
     description: ' 채팅 목록 조회',
@@ -25,7 +25,28 @@ export class ChatsController {
     }
   }
 
-  @Get('/chatRoom/:chatRoomNo/log')
+  @Get('/join/:chatRoomNo')
+  @ApiOperation({
+    summary: '채팅방 입장시 대화내역 API',
+    description: '채팅방 입장 시 가장 최신 대화내역 출력',
+  })
+  async getRecentChatLog(
+    @Param('chatRoomNo', ParseIntPipe) chatRoomNo: number,
+    @Body('userNo', ParseIntPipe) userNo: number,
+  ): Promise<any> {
+    try {
+      const chatLog = await this.chatControllerService.getRecentChatLog({
+        userNo,
+        chatRoomNo,
+      });
+
+      return chatLog;
+    } catch (err) {
+      throw err;
+    }
+  }
+
+  @Get('/:chatRoomNo/log')
   async getChatLog(
     @Param('chatRoomNo', ParseIntPipe) chatRoomNo: number,
     @Body('userNo', ParseIntPipe) userNo: number,

diff --git a/main-project/src/chats/repository/chat-log.repository.ts b/main-project/src/chats/repository/chat-log.repository.ts
@@ -38,4 +38,21 @@ export class ChatLogRepository extends Repository<ChatLog> {
       );
     }
   }
+
+  async getRecentChatLog(chatRoomNo): Promise<ChatLog[]> {
+    try {
+      const recentChatLog = await this.createQueryBuilder('chat_log')
+        .select(['chat_log.*'])
+        .where('chat_log.chat_room_no = :chatRoomNo', { chatRoomNo })
+        .orderBy('no', 'DESC')
+        .limit(30)
+        .getRawMany();
+
+      return recentChatLog;
+    } catch (err) {
+      throw new InternalServerErrorException(
+        `${err}: 채팅로그 불러오기(getRecentChatLog): 알 수 없는 서버 에러입니다.`,
+      );
+    }
+  }
 }