fix: getChatRoom with deleted user

DevKor-github · Nov 18, 2023 · 130cc56 · 130cc56
1 parent 3ecb8f7
commit 130cc56
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/src/chat/chat.service.ts b/src/chat/chat.service.ts
@@ -147,19 +147,17 @@ export class ChatService {
     const otherUserInfo = await this.socketUserModel.findOne({
       userId: otherUser.userId,
     });
-    if (otherUserInfo) {
-      const latestChat = await this.chattingModel
-        .find({ roomId: room.id })
-        .sort({ createdAt: -1 })
-        .limit(1);
-
-      return RoomInfoDto.ToDto(
-        room.id,
-        user.hasRead,
-        otherUserInfo,
-        latestChat[0],
-      );
-    }
+    const latestChat = await this.chattingModel
+      .find({ roomId: room.id })
+      .sort({ createdAt: -1 })
+      .limit(1);
+
+    return RoomInfoDto.ToDto(
+      room.id,
+      user.hasRead,
+      otherUserInfo,
+      latestChat[0],
+    );
   }
 
   async getChats(roomId: string, userId: number) {

diff --git a/src/dtos/chat.dto.ts b/src/dtos/chat.dto.ts
@@ -87,8 +87,10 @@ export class RoomInfoDto {
     return {
       roomId: roomId,
       hasRead: hasRead,
-      nickname: otherUserSchema.userNickname,
-      sex: otherUserSchema.userSex,
+      nickname: otherUserSchema
+        ? otherUserSchema.userNickname
+        : '탈퇴한 사용자',
+      sex: otherUserSchema ? otherUserSchema.userSex : null,
       latest_chat: chattingSchema ? chattingSchema.chat : null,
       latest_time: chattingSchema ? chattingSchema.createdAt : null,
     };