Merge pull request #362 from modern-agile-team/feat/#360/modify_chat_…

…logic

src/auth/auth.module.ts

@@ -15,6 +15,7 @@ import { TokenService } from '@src/auth/services/token.service';
 import { BannedUserModule } from '@src/admins/banned-user/banned-users.module';
 import { JwtModuleOptionsFactory } from '@src/auth/jwt/factories/jwt-module-options.factory';
 import { S3Module } from '@src/common/s3/s3.module';
+import { ChatModule } from '@src/chat/chat.module';
 
 @Module({
   imports: [
@@ -27,6 +28,7 @@ import { S3Module } from '@src/common/s3/s3.module';
     }),
     BannedUserModule,
     S3Module,
+    ChatModule,
   ],
   exports: [TokenService, TokenRepository],
   controllers: [AuthController],

src/auth/services/auth.service.ts

@@ -20,6 +20,7 @@ import { BannedUserErrorResponseDto } from '@src/admins/banned-user/dtos/banned-
 import { UserIntroService } from '@src/users/services/user-intro-service';
 import { AppConfigService } from '@src/core/app-config/services/app-config.service';
 import { ENV_KEY } from '@src/core/app-config/constants/app-config.constant';
+import { ChatService } from '@src/chat/services/chat.service';
 
 @Injectable()
 export class AuthService implements AuthServiceInterface {
@@ -31,6 +32,7 @@ export class AuthService implements AuthServiceInterface {
     private readonly dataSource: DataSource,
     private readonly userIntroService: UserIntroService,
     private readonly appConfigService: AppConfigService,
+    private readonly chatService: ChatService,
   ) {}
 
   async login(authorizeCode: string, provider: UserProvider) {
@@ -446,6 +448,9 @@ export class AuthService implements AuthServiceInterface {
         HttpStatus.NOT_FOUND,
       );
     }
+
+    await this.chatService.leaveChatRooms(userId);
+
     return { message: '사용자 계정 삭제가 완료되었습니다.' };
   }
 }

src/chat/chat.module.ts

@@ -1,7 +1,6 @@
-import { Module } from '@nestjs/common';
+import { Module, forwardRef } from '@nestjs/common';
 import { MongooseModule } from '@nestjs/mongoose';
 import { S3Module } from '@src/common/s3/s3.module';
-import { AuthModule } from '@src/auth/auth.module';
 import { UserModule } from '@src/users/user.module';
 import { ChatController } from '@src/chat/controllers/chat.controller';
 import { EventsGateway } from '@src/chat/events/events.gateway';
@@ -24,10 +23,10 @@ import { NotificationService } from '@src/chat/services/notification.service';
       { name: ChatImages.name, schema: ChatImagesSchema },
     ]),
     S3Module,
-    AuthModule,
-    UserModule,
+    forwardRef(() => UserModule),
   ],
   controllers: [ChatController],
   providers: [ChatService, ChatRepository, NotificationService, EventsGateway],
+  exports: [ChatService],
 })
 export class ChatModule {}

src/chat/controllers/chat.controller.ts

@@ -52,7 +52,7 @@ import { ApiLeaveChatRoom } from '@src/chat/swagger-decorators/leave-chat-room.d
 @UseInterceptors(SuccessResponseInterceptor, ClassSerializerInterceptor)
 @Controller('chat-room')
 export class ChatController {
-  constructor(private chatService: ChatService) {}
+  constructor(private readonly chatService: ChatService) {}
 
   /**
    *

src/chat/services/chat.service.ts

@@ -137,18 +137,23 @@ export class ChatService {
       throw new ForbiddenException('본인과 채팅방을 생성할 수 없습니다.');
     }
 
+    const existReceiver = await this.userService.findOneByOrNotFound({
+      select: ['id'],
+      where: { id: receiverId },
+    });
+
     const existChatRoom = await this.chatRepository.findOneChatRoom({
       $and: [
-        { originalMembers: { $all: [myId, receiverId] } },
+        { originalMembers: { $all: [myId, existReceiver.id] } },
         { deletedAt: null },
         { chatRoomType: chatRoomType },
       ],
     });
 
     if (!existChatRoom) {
       const returnedChatRoom = await this.chatRepository.createChatRoom({
-        originalMembers: [myId, receiverId],
-        chatMembers: [myId, receiverId],
+        originalMembers: [myId, existReceiver.id],
+        chatMembers: [myId, existReceiver.id],
         chatRoomType: chatRoomType,
       });
 
@@ -157,14 +162,14 @@ export class ChatService {
 
     const { chatMembers, _id } = existChatRoom;
 
-    const pushUserId = chatMembers.includes(myId) ? receiverId : myId;
+    const pushUserId = chatMembers.includes(myId) ? existReceiver.id : myId;
 
     if (chatMembers.length === 2) {
       return new ChatRoomDto(existChatRoom);
     }
 
     const updateWriteOpResult = await this.chatRepository.updateOneChatRoom(
-      { _id: _id },
+      { _id },
       {
         $push: { chatMembers: pushUserId },
       },
@@ -205,6 +210,15 @@ export class ChatService {
     );
   }
 
+  leaveChatRooms(userId: number) {
+    return this.chatRepository.updateManyChatRoom(
+      {
+        chatMembers: { $in: userId },
+      },
+      { $pull: { chatMembers: userId } },
+    );
+  }
+
   /**
    *
    * @param myId