Merge pull request #73 from oodd-team/OD-175

채팅, 유저 예외 처리 OD - 175

Author: happbob

src/chat-message/chat-message.service.ts

@@ -32,7 +32,6 @@ export class ChatMessageService {
       where: { id: newMessage.id },
       relations: ['fromUser', 'toUser'],
     });
-
     return {
       id: newMessageWithUser.id,
       chatRoomId: chatRoomId,
@@ -90,4 +89,21 @@ export class ChatMessageService {
       content: body.message,
     });
   }
+
+  async deleteMessages(chatRoomId: number): Promise<void> {
+    const messages = await this.chatMessageRepository.find({
+      where: { chatRoom: { id: chatRoomId }, status: StatusEnum.ACTIVATED },
+    });
+
+    if (messages.length === 0) {
+      return;
+    }
+
+    for (const message of messages) {
+      message.status = StatusEnum.DEACTIVATED;
+      message.softDelete();
+    }
+
+    await this.chatMessageRepository.save(messages);
+  }
 }

src/chat-room/chat-room.service.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
+import { ChatMessageService } from 'src/chat-message/chat-message.service';
 import { ChatRoom } from 'src/common/entities/chat-room.entity';
 import { Matching } from 'src/common/entities/matching.entity';
 import { StatusEnum } from 'src/common/enum/entityStatus';
@@ -13,6 +14,7 @@ export class ChatRoomService {
   constructor(
     @InjectRepository(ChatRoom)
     private readonly chatRoomRepository: Repository<ChatRoom>,
+    private readonly chatMessageService: ChatMessageService,
   ) {}
 
   async getChatRoomsWithLatestMessage(userId: number) {
@@ -84,8 +86,8 @@ export class ChatRoomService {
   async deleteChatRoom(chatRoomId: number, userId: number): Promise<void> {
     const chatRoom = await this.chatRoomRepository.findOne({
       where: { id: chatRoomId },
+      relations: ['fromUser', 'toUser'],
     });
-
     if (!chatRoom) {
       throw DataNotFoundException('채팅방을 찾을 수 없습니다.');
     }
@@ -102,6 +104,7 @@ export class ChatRoomService {
     if (chatRoom.fromUserLeavedAt && chatRoom.toUserLeavedAt) {
       chatRoom.status = StatusEnum.DEACTIVATED;
       chatRoom.softDelete();
+      await this.chatMessageService.deleteMessages(chatRoomId);
     }
 
     await this.chatRoomRepository.save(chatRoom);

src/eventGateway.ts

@@ -8,6 +8,8 @@ import {
 import { Server, Socket } from 'socket.io';
 import { ChatRoomService } from './chat-room/chat-room.service';
 import { ChatMessageService } from './chat-message/chat-message.service';
+import { UserService } from './user/user.service';
+import { UserBlockService } from './user-block/user-block.service';
 
 //클라이언트의 패킷들이 게이트웨이를 통해서 들어오게 됩니다.
 @WebSocketGateway({ namespace: '/socket/chatting' })
@@ -19,6 +21,8 @@ export class EventsGateway implements OnGatewayConnection, OnGatewayDisconnect {
   constructor(
     private readonly chatRoomService: ChatRoomService,
     private readonly chatMessageService: ChatMessageService,
+    private readonly userService: UserService,
+    private readonly userBlockService: UserBlockService,
   ) {}
   /*
      유저정보는 같지만 소켓이 여러개가 연결되어 있을 경우
@@ -74,6 +78,16 @@ export class EventsGateway implements OnGatewayConnection, OnGatewayDisconnect {
     },
   ) {
     const { chatRoomId, toUserId, content, fromUserId, createdAt } = payload;
+    const toUser = await this.userService.getUserById(toUserId);
+    const blockedUserIds =
+      await this.userBlockService.getBlockedUserIds(toUserId);
+    if (!toUser || blockedUserIds.includes(fromUserId)) {
+      const errorMessage = !toUser
+        ? '존재하지 않는 사용자입니다.'
+        : '차단된 사용자에게 메시지를 보낼 수 없습니다.';
+      client.emit('error', errorMessage);
+      return;
+    }
 
     // 메시지 저장 로직
     const newMessage = await this.chatMessageService.saveMessage(

src/matching/matching.service.ts

@@ -106,7 +106,7 @@ export class MatchingService {
 
   async getMatchings(currentUserId: number): Promise<GetMatchingsResponse> {
     const blockedUserIds =
-      await this.userBlockService.getBlockedUserIdsByRequesterId(currentUserId);
+      await this.userBlockService.getBlockedUserIds(currentUserId);
     const matchings = await this.matchingRepository
       .createQueryBuilder('matching')
       .leftJoinAndSelect('matching.requester', 'requester')

src/post/post.service.ts

@@ -48,7 +48,7 @@ export class PostService {
     currentUserId: number,
   ): Promise<{ posts: GetAllPostsResponse; total: number }> {
     const blockedUserIds =
-      await this.userBlockService.getBlockedUserIdsByRequesterId(currentUserId);
+      await this.userBlockService.getBlockedUserIds(currentUserId);
 
     const queryBuilder = this.dataSource
       .getRepository(Post)
@@ -388,7 +388,7 @@ export class PostService {
   // 게시글 상세 조회
   async getPost(postId: number, currentUserId: number): Promise<Post | null> {
     const blockedUserIds =
-      await this.userBlockService.getBlockedUserIdsByRequesterId(currentUserId);
+      await this.userBlockService.getBlockedUserIds(currentUserId);
     return await this.postRepository
       .createQueryBuilder('post')
       .leftJoinAndSelect(

src/user-block/user-block.service.ts

@@ -18,17 +18,6 @@ export class UserBlockService {
     private readonly userService: UserService,
   ) {}
 
-  async getBlockedUserIdsByRequesterId(
-    currentUserId: number,
-  ): Promise<number[]> {
-    const blockedUsers = await this.userBlockRepository.find({
-      where: { requester: { id: currentUserId }, status: StatusEnum.ACTIVATED },
-      relations: ['target'],
-    });
-
-    return blockedUsers.map((block) => block.target.id);
-  }
-
   async createBlock(createUserBlockDto: UserBlockRequest): Promise<string> {
     const { requesterId, targetId, action } = createUserBlockDto;
 

src/user/user.controller.ts

@@ -47,6 +47,7 @@ export class UserController {
     @Param('userId') userId: number,
   ): Promise<BaseResponse<GetOtherUserInfo>> {
     const user = await this.userService.getUserById(userId);
+    if (!user) throw DataNotFoundException('존재하지 않는 사용자입니다.');
     // MatchingService를 통해 해당 사용자가 친구인지 확인
     const isMatching = await this.matchingService.isMatching(
       req.user.id,