게시글 리스트 조회 기능 수정

Author: khmandarrin

package.json

@@ -25,9 +25,12 @@
     "@nestjs/jwt": "^10.2.0",
     "@nestjs/passport": "^10.0.3",
     "@nestjs/platform-express": "^10.3.2",
+    "@nestjs/platform-socket.io": "^10.4.6",
     "@nestjs/swagger": "^7.4.2",
     "@nestjs/typeorm": "^10.0.2",
+    "@nestjs/websockets": "^10.4.6",
     "@types/passport-kakao": "^1.0.3",
+    "@types/socket.io": "^3.0.2",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "dayjs": "^1.11.13",

src/auth/auth.service.ts

@@ -42,7 +42,7 @@ export class AuthService {
     payload: JwtPayload,
   ): Promise<JwtPayload | undefined> {
     return await this.userSerivce.findByFields({
-      where: { id: payload.id },
+      where: { id: payload.id, status: 'activated' },
     });
   }
 }

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

@@ -12,6 +12,47 @@ export class ChatMessageService {
     private readonly chatMessageRepository: Repository<ChatMessage>,
   ) {}
 
+  async saveMessage(
+    chatRoomId: number,
+    toUserId: number,
+    message: string,
+    fromUserId: number,
+    createdAt: string,
+  ) {
+    return await this.chatMessageRepository.save({
+      chatRoomId,
+      toUserId,
+      message,
+      fromUserId,
+      createdAt,
+    });
+  }
+
+  async getMessagesByChatRoomId(chatRoomId: number) {
+    const messages = await this.chatMessageRepository.find({
+      where: { chatRoom: { id: chatRoomId }, status: 'activated' },
+      order: { createdAt: 'ASC' }, // 오래된 메시지부터 최신 메시지 순으로 정렬
+      relations: ['fromUser', 'toUser'], // 메시지 발신자, 수신자 정보도 함께 로드
+    });
+
+    return messages.map((message) => ({
+      id: message.id,
+      content: message.content,
+      fromUser: {
+        id: message.fromUser.id,
+        nickname: message.fromUser.nickname,
+        profileUrl: message.fromUser.profilePictureUrl,
+      },
+      toUser: {
+        id: message.toUser.id,
+        nickname: message.toUser.nickname,
+        profileUrl: message.toUser.profilePictureUrl,
+      },
+      createdAt: message.createdAt,
+      toUserReadAt: message.toUserReadAt,
+    }));
+  }
+
   async createChatMessage(
     queryRunner: QueryRunner,
     chatRoom: ChatRoom,

src/chat-room/chat-room.controller.ts

@@ -3,7 +3,7 @@ import { ChatRoomService } from './chat-room.service';
 import { GetChatRoomsSwagger, LeaveChatRoomSwagger } from './chat-room.swagger';
 import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
 
-@ApiBearerAuth()
+@ApiBearerAuth('Authorization')
 @Controller('chat-room')
 @ApiTags('[서비스] 채팅방')
 export class ChatRoomController {

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

@@ -12,6 +12,45 @@ export class ChatRoomService {
     private readonly chatRoomRepository: Repository<ChatRoom>,
   ) {}
 
+  async getChatRoomsWithLatestMessage(userId: number) {
+    const chatRooms = await this.chatRoomRepository
+      .createQueryBuilder('chatRoom')
+      .leftJoinAndSelect('chatRoom.fromUser', 'fromUser')
+      .leftJoinAndSelect('chatRoom.toUser', 'toUser')
+      .leftJoinAndSelect('chatRoom.chatMessages', 'chatMessages')
+      .loadRelationIdAndMap('chatRoom.latestMessage', 'chatMessages')
+      .where('chatRoom.fromUserId = :userId OR chatRoom.toUserId = :userId', {
+        userId,
+      })
+      .andWhere('chatRoom.status = :status', { status: 'activated' })
+      .orderBy('chatMessages.createdAt', 'DESC') // 최신 메시지 우선 정렬
+      .getMany();
+
+    return chatRooms.map((chatRoom) => {
+      // 상대방 정보 설정
+      const otherUser =
+        chatRoom.fromUser.id === userId ? chatRoom.toUser : chatRoom.fromUser;
+
+      // 최신 메시지 설정
+      const latestMessage = chatRoom.chatMessages[0];
+
+      return {
+        chatRoomId: chatRoom.id,
+        otherUser: {
+          id: otherUser.id,
+          nickname: otherUser.nickname,
+          profileUrl: otherUser.profilePictureUrl,
+        },
+        latestMessage: latestMessage
+          ? {
+              content: latestMessage.content,
+              createdAt: latestMessage.createdAt,
+            }
+          : null,
+      };
+    });
+  }
+
   async createChatRoom(
     queryRunner: QueryRunner,
     matching: Matching,

src/common/entities/user.entity.ts

@@ -1,4 +1,4 @@
-import { Entity, OneToMany, Column } from 'typeorm';
+import { Entity, OneToMany, Column, OneToOne } from 'typeorm';
 import { BaseEntity } from './base.entity';
 import { Post } from './post.entity';
 import { PostComment } from './post-comment.entity';
@@ -83,5 +83,6 @@ export class User extends BaseEntity {
   postReports!: PostReport[];
 
   // 대표 게시물 필드 추가
+  @OneToOne(() => Post, (post) => post.user)
   representativePost?: Post | null;
 }

src/eventGateway.ts

@@ -0,0 +1,85 @@
+import {
+  SubscribeMessage,
+  WebSocketGateway,
+  WebSocketServer,
+  OnGatewayDisconnect,
+  OnGatewayConnection,
+} from '@nestjs/websockets';
+import { Server, Socket } from 'socket.io';
+import { ChatRoomService } from './chat-room/chat-room.service';
+import { ChatMessageService } from './chat-message/chat-message.service';
+
+//클라이언트의 패킷들이 게이트웨이를 통해서 들어오게 됩니다.
+@WebSocketGateway({ namespace: '/chatting', cors: { origin: '*' } })
+export class EventsGateway implements OnGatewayConnection, OnGatewayDisconnect {
+  // 소켓 서버를 정의합니다.
+  @WebSocketServer()
+  server: Server;
+  // 유저 정보를 레디스에 적재시키기 위해서 레디스 설정이 선행되야합니다.
+  constructor(
+    private readonly chatRoomService: ChatRoomService,
+    private readonly chatMessageService: ChatMessageService,
+  ) {}
+
+  afterInit(server: Server) {
+    console.log('Initialized', server.engine.clientsCount);
+  }
+
+  handleConnection(client: Socket) {
+    console.log(`Client connected: ${client.id}`);
+  }
+
+  handleDisconnect(client: Socket) {
+    console.log(`Client disconnected: ${client.id}`);
+  }
+
+  @SubscribeMessage('getChatRooms')
+  async handleGetChatRooms(client: Socket, userId: number) {
+    const chatRooms =
+      await this.chatRoomService.getChatRoomsWithLatestMessage(userId);
+    client.emit('chatRoomList', chatRooms);
+  }
+
+  @SubscribeMessage('sendMessage')
+  async handleSendMessage(
+    client: Socket,
+    payload: {
+      chatRoomId: number;
+      toUserId: number;
+      message: string;
+      fromUserId: number;
+      createdAt: string;
+    },
+  ) {
+    const { chatRoomId, toUserId, message, fromUserId, createdAt } = payload;
+
+    // 메시지 저장 로직
+    const newMessage = await this.chatMessageService.saveMessage(
+      chatRoomId,
+      toUserId,
+      message,
+      fromUserId,
+      createdAt,
+    );
+
+    // 채팅방 리스트 업데이트
+    const chatRooms =
+      await this.chatRoomService.getChatRoomsWithLatestMessage(fromUserId);
+    client.emit('chatRoomList', chatRooms);
+
+    // 해당 채팅방에 있는 모든 사용자에게 메시지 전송
+    this.server.to(String(chatRoomId)).emit('newMessage', newMessage);
+  }
+
+  @SubscribeMessage('getChatRoomMessages')
+  async handleGetChatRoomMessages(client: Socket, chatRoomId: number) {
+    const messages =
+      await this.chatMessageService.getMessagesByChatRoomId(chatRoomId);
+    client.emit('chatRoomMessages', messages); // 클라이언트에 메시지 리스트 전송
+  }
+
+  @SubscribeMessage('joinChatRoom')
+  handleJoinChatRoom(client: Socket, chatRoomId: number) {
+    client.join(String(chatRoomId));
+  }
+}

src/main.ts

@@ -3,11 +3,13 @@ import { AppModule } from './app.module';
 import { setupSwagger } from './utils/swagger';
 import { ServiceExceptionToHttpExceptionFilter } from './common/exception-filter';
 import { ValidationPipe } from '@nestjs/common';
+import { IoAdapter } from '@nestjs/platform-socket.io';
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);
   app.useGlobalFilters(new ServiceExceptionToHttpExceptionFilter());
   app.useGlobalPipes(new ValidationPipe());
+  app.useWebSocketAdapter(new IoAdapter(app));
   setupSwagger(app);
   await app.listen(process.env.PORT);
   console.log(`Application is running on: ${await app.getUrl()}`);

src/matching/dto/Patch-matching.request.ts

@@ -0,0 +1,25 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsInt, IsString, IsIn } from 'class-validator';
+
+export class PatchMatchingRequestDto {
+  @ApiProperty({ example: 1, description: '매칭 ID' })
+  @IsInt()
+  matchingId: number;
+
+  @ApiProperty({ example: 1, description: '신청한 유저 아이디' })
+  @IsInt()
+  requesterId: number;
+
+  @ApiProperty({ example: 2, description: '매칭 상대 유저 아이디' })
+  @IsInt()
+  targetId: number;
+
+  @ApiProperty({
+    example: 'accept',
+    enum: ['accept', 'reject'],
+    description: '수락 또는 거절',
+  })
+  @IsString()
+  @IsIn(['accept', 'reject'])
+  action: 'accept' | 'reject';
+}

src/matching/dto/get-matching.response.ts

@@ -0,0 +1,78 @@
+import { Type } from 'class-transformer';
+import { ApiProperty } from '@nestjs/swagger';
+
+class RequesterResponse {
+  @ApiProperty({
+    description: '매칭 요청자의 ID',
+    example: '19',
+  })
+  requesterId: number;
+
+  @ApiProperty({
+    description: '매칭 요청자의 닉네임',
+    example: '1d1d1d',
+  })
+  nickname: string;
+
+  @ApiProperty({
+    description: '매칭 요청자의 프로필 이미지 url',
+    example: 'https://example.com/image1.jpg',
+  })
+  profilePictureUrl: string;
+}
+
+class RequesterPostResponse {
+  @ApiProperty({
+    description: '매칭 요청자의 게시물 이미지 목록',
+    type: [String],
+    example: [
+      { url: 'https://example.com/image1.jpg', orderNum: 1 },
+      { url: 'https://example.com/image2.jpg', orderNum: 2 },
+    ],
+  })
+  postImages: { url: string; orderNum: number }[];
+
+  @ApiProperty({
+    description: '매칭 요청자의 게시물 스타일 태그 목록',
+    type: [String],
+    example: ['classic', 'basic'],
+  })
+  styleTags: string[];
+}
+
+class MatchingResponse {
+  @ApiProperty({
+    description: '매칭 요청자 정보',
+    type: RequesterResponse,
+  })
+  @Type(() => RequesterResponse)
+  requester: RequesterResponse;
+
+  @ApiProperty({
+    description: '매칭 요청자의 대표 게시물이 없을 경우, 가장 최근 게시물 정보',
+    type: RequesterPostResponse,
+  })
+  @Type(() => RequesterPostResponse)
+  requesterPost: RequesterPostResponse;
+}
+
+export class GetMatchingsResponse {
+  @ApiProperty({
+    description: '매칭 존재 여부',
+    example: true,
+  })
+  isMatching: boolean;
+
+  @ApiProperty({
+    description: '받은 매칭 수',
+    example: 10,
+  })
+  matchingCount: number;
+
+  @ApiProperty({
+    description: '매칭 정보',
+    type: [MatchingResponse],
+  })
+  @Type(() => MatchingResponse)
+  matching: MatchingResponse[];
+}