[BE] Main Merge

BE/.gitignore

@@ -179,5 +179,4 @@ lerna-debug.log*
 
 /envs
 /logs
-firebase.json
-
+village-2ed97-firebase-adminsdk-1axqh-408a2ee88b.json

BE/package.json

@@ -47,7 +47,7 @@
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.1",
     "typeorm": "^0.3.17",
-    "uuidv4": "^6.2.13",
+    "uuid": "^9.0.1",
     "winston": "^3.11.0",
     "winston-daily-rotate-file": "^4.7.1",
     "ws": "^8.14.2"

BE/src/app.module.ts

@@ -16,6 +16,8 @@ import { ChatModule } from './chat/chat.module';
 import { CacheModule } from '@nestjs/cache-manager';
 import { RedisConfigProvider } from './config/redis.config';
 import { ReportModule } from './report/report.module';
+import { ImageModule } from './image/image.module';
+import { NotificationModule } from './notification/notification.module';
 
 @Module({
   imports: [
@@ -40,6 +42,8 @@ import { ReportModule } from './report/report.module';
     LoginModule,
     ChatModule,
     ReportModule,
+    ImageModule,
+    NotificationModule,
   ],
   controllers: [AppController],
   providers: [

BE/src/chat/chat.controller.ts

@@ -4,7 +4,9 @@ import {
   Get,
   HttpException,
   Param,
+  Patch,
   Post,
+  Put,
   UseGuards,
 } from '@nestjs/common';
 import { ChatService } from './chat.service';
@@ -52,6 +54,12 @@ export class ChatController {
     return await this.chatService.unreadChat(userId);
   }
 
+  @Patch('leave/:id')
+  @UseGuards(AuthGuard)
+  async leaveChatRoom(@Param('id') id: number, @UserHash() userId: string) {
+    return await this.chatService.leaveChatRoom(id, userId);
+  }
+
   @Get()
   async testPush(@Body() body) {
     await this.fcmHandler.sendPush(body.user, {

BE/src/chat/chat.service.ts

@@ -40,7 +40,16 @@ export class ChatService {
     chat.chat_room = message.room_id;
     chat.is_read = is_read;
     chat.count = message.count;
-    await this.chatRepository.save(chat);
+    const lastChat = await this.chatRepository.save(chat);
+
+    await this.chatRoomRepository.update(
+      {
+        id: message.room_id,
+      },
+      {
+        last_chat_id: lastChat.id,
+      },
+    );
   }
 
   async createRoom(
@@ -79,24 +88,12 @@ export class ChatService {
   async findRoomList(userId: string) {
     const chatListInfo = { all_read: true, chat_list: [] };
 
-    const subquery = this.chatRepository
-      .createQueryBuilder('chat')
-      .select('chat.id', 'id')
-      .addSelect('chat.chat_room', 'chat_room')
-      .addSelect('chat.message', 'message')
-      .addSelect('chat.create_date', 'create_date')
-      .addSelect('chat.is_read', 'is_read')
-      .addSelect('chat.sender', 'sender')
-      .where(
-        'chat.id IN (SELECT MAX(chat.id) FROM chat GROUP BY chat.chat_room)',
-      );
-
     const rooms = await this.chatRoomRepository
       .createQueryBuilder('chat_room')
       .innerJoin(
-        '(' + subquery.getQuery() + ')',
+        'chat_room.lastChat',
         'chat_info',
-        'chat_room.id = chat_info.chat_room',
+        'chat_room.lastChat = chat_info.id',
       )
       .innerJoin(
         'chat_room.writerUser',
@@ -126,7 +123,9 @@ export class ChatService {
         'chat_info.sender as sender',
       ])
       .where('chat_room.writer = :userId', { userId: userId })
+      .andWhere('chat_room.writer_hide IS false')
       .orWhere('chat_room.user = :userId', { userId: userId })
+      .andWhere('chat_room.user_hide IS false')
       .orderBy('chat_info.create_date', 'DESC')
       .getRawMany();
 
@@ -160,24 +159,12 @@ export class ChatService {
   }
 
   async unreadChat(userId: string) {
-    const subquery = this.chatRepository
-      .createQueryBuilder('chat')
-      .select('chat.id', 'id')
-      .addSelect('chat.chat_room', 'chat_room')
-      .addSelect('chat.message', 'message')
-      .addSelect('chat.create_date', 'create_date')
-      .addSelect('chat.is_read', 'is_read')
-      .addSelect('chat.sender', 'sender')
-      .where(
-        'chat.id IN (SELECT MAX(chat.id) FROM chat GROUP BY chat.chat_room)',
-      );
-
     const rooms = await this.chatRoomRepository
       .createQueryBuilder('chat_room')
       .innerJoin(
-        '(' + subquery.getQuery() + ')',
+        'chat_room.lastChat',
         'chat_info',
-        'chat_room.id = chat_info.chat_room',
+        'chat_room.lastChat = chat_info.id',
       )
       .innerJoin(
         'chat_room.writerUser',
@@ -204,7 +191,9 @@ export class ChatService {
         'chat_info.sender as sender',
       ])
       .where('chat_room.writer = :userId', { userId: userId })
+      .andWhere('chat_room.writer_hide IS false')
       .orWhere('chat_room.user = :userId', { userId: userId })
+      .andWhere('chat_room.user_hide IS false')
       .orderBy('chat_info.create_date', 'DESC')
       .getRawMany();
 
@@ -217,7 +206,7 @@ export class ChatService {
     return { all_read: true };
   }
 
-  async findRoomById(roomId: number, userId: string) {
+  async makeAllRead(roomId: number, userId: string) {
     await this.chatRepository
       .createQueryBuilder('chat')
       .update()
@@ -226,15 +215,57 @@ export class ChatService {
       .andWhere('chat.is_read = :isRead', { isRead: false })
       .andWhere('chat.sender != :userId', { userId: userId })
       .execute();
+  }
 
-    const room = await this.chatRoomRepository.findOne({
+  /*async getRoomAndChatInfoPagination(roomId: number, chatId: number) {
+    return await this.chatRoomRepository
+      .createQueryBuilder('chat_room')
+      .innerJoinAndSelect('chat_room.chats', 'chat_info')
+      .innerJoinAndSelect('chat_room.writerUser', 'writer')
+      .innerJoinAndSelect('chat_room.userUser', 'user')
+      .where('chat_room.id = :roomId', { roomId: roomId })
+      .andWhere('chat_info.id < :chatId', { chatId: chatId })
+      .orderBy('chat_info.id', 'DESC')
+      .limit(30)
+      .getOne();
+  }*/
+
+  async getRoomAndChatInfo(roomId: number, userId: string) {
+    return await this.chatRoomRepository.findOne({
       where: {
         id: roomId,
       },
       relations: ['chats', 'userUser', 'writerUser'],
     });
+  }
+
+  async findRoomById(roomId: number, userId: string) {
+    await this.makeAllRead(roomId, userId);
+
+    const room = await this.getRoomAndChatInfo(roomId, userId);
 
     this.checkAuth(room, userId);
+
+    let chats = room.chats;
+
+    if (
+      room.writer === userId &&
+      room.writer_hide === false &&
+      room.writer_left_time !== null
+    ) {
+      chats = chats.filter((chat) => {
+        return chat.create_date > room.writer_left_time;
+      });
+    } else if (
+      room.user === userId &&
+      room.user_hide === false &&
+      room.user_left_time !== null
+    ) {
+      chats = chats.filter((chat) => {
+        return chat.create_date > room.user_left_time;
+      });
+    }
+
     return {
       writer: room.writer,
       writer_profile_img:
@@ -247,7 +278,7 @@ export class ChatService {
           ? this.configService.get('DEFAULT_PROFILE_IMAGE')
           : room.userUser.profile_img,
       post_id: room.post_id,
-      chat_log: room.chats,
+      chat_log: chats,
     };
   }
 
@@ -256,6 +287,10 @@ export class ChatService {
       throw new HttpException('존재하지 않는 채팅방입니다.', 404);
     } else if (room.writer !== userId && room.user !== userId) {
       throw new HttpException('권한이 없습니다.', 403);
+    } else if (room.writer === userId && room.writer_hide === true) {
+      throw new HttpException('숨긴 채팅방입니다.', 403);
+    } else if (room.user === userId && room.user_hide === true) {
+      throw new HttpException('숨긴 채팅방입니다.', 403);
     }
   }
 
@@ -264,6 +299,7 @@ export class ChatService {
       where: { id: message.room_id },
       relations: ['writerUser', 'userUser'],
     });
+
     const receiver: UserEntity =
       chatRoom.writerUser.user_hash === message.sender
         ? chatRoom.userUser
@@ -280,6 +316,19 @@ export class ChatService {
     await this.fcmHandler.sendPush(receiver.user_hash, pushMessage);
   }
 
+  async checkOpponentLeft(roomId: number, userId: string) {
+    const room = await this.chatRoomRepository.findOne({
+      where: { id: roomId },
+    });
+
+    if (room.writer === userId && room.user_hide !== false) {
+      room.user_hide = false;
+    } else if (room.user === userId && room.writer_hide !== false) {
+      room.writer_hide = false;
+    }
+    await this.chatRoomRepository.save(room);
+  }
+
   validateUser(authorization) {
     try {
       const payload: Payload = jwt.verify(
@@ -292,4 +341,20 @@ export class ChatService {
       return null;
     }
   }
+
+  async leaveChatRoom(roomId: number, userId: string) {
+    const room = await this.chatRoomRepository.findOne({
+      where: { id: roomId },
+    });
+
+    if (room.writer === userId) {
+      room.writer_hide = true;
+      room.writer_left_time = new Date();
+    } else if (room.user === userId) {
+      room.user_hide = true;
+      room.user_left_time = new Date();
+    }
+
+    await this.chatRoomRepository.save(room);
+  }
 }

BE/src/chat/chats.gateway.ts

@@ -84,6 +84,9 @@ export class ChatsGateway implements OnGatewayConnection, OnGatewayDisconnect {
           );
       });
     }
+
+    await this.chatService.checkOpponentLeft(message['room_id'], sender);
+
     client.send(
       JSON.stringify({ event: 'send-message', data: { sent: true } }),
     );