Merge pull request #71 from oodd-team/dev

Dev

Author: happbob

src/auth/auth.controller.ts

@@ -12,7 +12,7 @@ import { KakaoAuthGuard } from './guards/kakao.auth.guard';
 import { NaverAuthGuard } from './guards/naver.auth.guard';
 import { AuthGuard } from './guards/jwt.auth.guard';
 import { BaseResponse } from '../common/response/dto';
-import { GetUserInfo } from 'src/user/dto/response/get-user.response';
+import { GetUserInfo } from 'src/user/dto/response/user.response';
 import dayjs from 'dayjs';
 
 @Controller('auth')
@@ -68,7 +68,7 @@ export class AuthController {
   async test(@Req() req: Request): Promise<BaseResponse<GetUserInfo>> {
     const user = await this.userService.getUserById(req.user?.id);
     return new BaseResponse<GetUserInfo>(true, 'SUCCESS', {
-      userId: user.id,
+      id: user.id,
       email: user.email,
       nickname: user.nickname,
       profilePictureUrl: user.profilePictureUrl,

src/auth/auth.swagger.ts

@@ -3,7 +3,7 @@ import { LoginResponse } from './dto/auth.response';
 import { BaseResponse } from 'src/common/response/dto';
 import { ErrorCodeVo } from 'src/common/exception/error';
 import { ApiInternalServerErrorResponse } from '@nestjs/swagger';
-import { GetUserInfo } from 'src/user/dto/response/get-user.response';
+import { GetUserInfo } from 'src/user/dto/response/user.response';
 
 // 카카오 로그인 API Swagger
 export const KakaoLoginSwagger = (text: string) => {

src/auth/strategies/jwt.strategy.ts

@@ -26,7 +26,6 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
     if (!user) {
       throw UnauthorizedException('유효하지 않은 토큰입니다.');
     }
-    console.log(user);
     return { id: payload.id, email: payload.email, nickname: payload.nickname };
   }
 }

src/chat-message/chat-message.controller.spec.ts

@@ -1,6 +1,5 @@
 import { forwardRef, Module } from '@nestjs/common';
 import { ChatMessageService } from './chat-message.service';
-import { ChatMessageController } from './chat-message.controller';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { ChatMessage } from 'src/common/entities/chat-message.entity';
 import { UserModule } from 'src/user/user.module';
@@ -13,7 +12,6 @@ import { ChatRoomModule } from 'src/chat-room/chat-room.module';
     forwardRef(() => ChatRoomModule),
   ],
   providers: [ChatMessageService],
-  controllers: [ChatMessageController],
   exports: [ChatMessageService],
 })
 export class ChatMessageModule {}

src/chat-message/chat-message.controller.ts

@@ -1,5 +1,4 @@
 import { forwardRef, Module } from '@nestjs/common';
-import { ChatRoomController } from './chat-room.controller';
 import { ChatRoomService } from './chat-room.service';
 import { ChatRoom } from 'src/common/entities/chat-room.entity';
 import { TypeOrmModule } from '@nestjs/typeorm';
@@ -10,7 +9,6 @@ import { ChatMessageModule } from 'src/chat-message/chat-message.module';
     TypeOrmModule.forFeature([ChatRoom]),
     forwardRef(() => ChatMessageModule),
   ],
-  controllers: [ChatRoomController],
   providers: [ChatRoomService],
   exports: [ChatRoomService],
 })

src/chat-message/chat-message.module.ts

@@ -3,6 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { ChatRoom } from 'src/common/entities/chat-room.entity';
 import { Matching } from 'src/common/entities/matching.entity';
 import { StatusEnum } from 'src/common/enum/entityStatus';
+import { MatchingRequestStatusEnum } from 'src/common/enum/matchingRequestStatus';
 import { DataNotFoundException } from 'src/common/exception/service.exception';
 import { CreateMatchingReqeust } from 'src/matching/dto/matching.request';
 import { Repository, QueryRunner } from 'typeorm';
@@ -20,30 +21,46 @@ export class ChatRoomService {
       .leftJoinAndSelect('chatRoom.fromUser', 'fromUser')
       .leftJoinAndSelect('chatRoom.toUser', 'toUser')
       .leftJoinAndSelect('chatRoom.chatMessages', 'chatMessages')
-      .where('chatRoom.fromUserId = :userId OR chatRoom.toUserId = :userId', {
-        userId,
-      })
-      .andWhere('chatRoom.status = :status', { status: 'activated' })
-      .andWhere('chatRoom.requestStatus = :requestStatus', {
-        requestStatus: 'accepted',
-      })
+      .addSelect([
+        'fromUser.id',
+        'fromUser.nickname',
+        'fromUser.profilePictureUrl',
+      ])
+      .addSelect(['toUser.id', 'toUser.nickname', 'toUser.profilePictureUrl'])
+      .where(
+        '(chatRoom.fromUserId = :userId OR chatRoom.toUserId = :userId) AND chatRoom.status = :status AND chatRoom.requestStatus = :requestStatus',
+        {
+          userId,
+          status: StatusEnum.ACTIVATED,
+          requestStatus: MatchingRequestStatusEnum.ACCEPTED,
+        },
+      )
       .orderBy('chatMessages.createdAt', 'DESC')
       .getMany();
+    if (!chatRooms || chatRooms.length === 0) {
+      return [];
+    }
 
     // 각 채팅방에서 최신 메시지를 선택
     const chatRoomsWithLatestMessages = chatRooms.map((room) => {
       const otherUser =
-        room.fromUser.id === userId ? room.toUser : room.fromUser;
+        room.fromUser && room.fromUser.id === userId
+          ? room.toUser
+          : room.fromUser;
+      // fromUser나 toUser가 null인 경우, otherUser를 빈 객체로 설정
+      const otherUserInfo = otherUser
+        ? {
+            id: otherUser.id,
+            nickname: otherUser.nickname,
+            profilePictureUrl: otherUser.profilePictureUrl,
+          }
+        : {};
+
       const latestMessage =
         room.chatMessages.length > 0 ? room.chatMessages[0] : null; // 가장 최근 메시지 선택
-
       return {
-        chatRoomId: room.id,
-        otherUser: {
-          id: otherUser.id,
-          nickname: otherUser.nickname,
-          profileUrl: otherUser.profilePictureUrl,
-        },
+        id: room.id,
+        otherUser: otherUserInfo,
         latestMessage: latestMessage,
       };
     });

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

@@ -1,16 +1,22 @@
 import { Entity, Column, ManyToOne, JoinColumn } from 'typeorm';
 import { BaseEntity } from './base.entity';
 import { Post } from './post.entity';
+import { ApiProperty } from '@nestjs/swagger';
 
 @Entity('PostImage')
 export class PostImage extends BaseEntity {
   @ManyToOne(() => Post, (post) => post.postImages)
   @JoinColumn({ name: 'postId' })
   post!: Post;
 
+  @ApiProperty({
+    example: 'http://imageurl.example',
+    description: '게시글 이미지 URL',
+  })
   @Column({ type: 'text' })
   url!: string;
 
+  @ApiProperty({ example: 1, description: '게시글 이미지 순서' })
   @Column({ type: 'bigint' })
   orderNum!: number;
 }

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

@@ -8,7 +8,11 @@ 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.useGlobalPipes(
+    new ValidationPipe({
+      transform: true,
+    }),
+  );
   app.useWebSocketAdapter(new IoAdapter(app));
   setupSwagger(app);
   await app.listen(process.env.PORT);

src/chat-room/chat-room.module.ts

@@ -1,20 +1,23 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { Type } from 'class-transformer';
 
-export class PostMatchingResponse {
+export class CreateMatchingResponse {
+  @ApiProperty({ example: 1, description: '매칭 ID' })
+  id: number;
+
   @ApiProperty({ example: 1, description: '채팅방 아이디' })
   chatRoomId: number;
 
   @ApiProperty({ example: 1, description: '신청한 유저 아이디' })
-  fromUserId: number;
+  requesterId: number;
 
   @ApiProperty({ example: 2, description: '매칭 상대 유저 아이디' })
-  toUserId: number;
+  targetId: number;
 }
 
 export class PatchMatchingResponse {
   @ApiProperty({ example: 1, description: '매칭 ID' })
-  matchingId: number;
+  id: number;
 
   @ApiProperty({ example: 1, description: '신청한 유저 아이디' })
   requesterId: number;
@@ -33,16 +36,34 @@ export class PatchMatchingResponse {
   chatRoomId?: number;
 }
 
+class RepresentativePost {
+  @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 RequesterResponse {
   @ApiProperty({
     description: '매칭 요청자의 ID',
     example: 19,
   })
-  requesterId: number;
+  id: number;
 
   @ApiProperty({
     description: '매칭 요청자의 닉네임',
-    example: '1d1d1d',
+    example: '러러',
   })
   nickname: string;
 
@@ -51,52 +72,33 @@ class RequesterResponse {
     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'],
+    description: '매칭 요청자의 대표 게시물이 없을 경우, 가장 최근 게시물 정보',
+    type: RepresentativePost,
   })
-  styleTags: string[];
+  @Type(() => RepresentativePost)
+  representativePost: RepresentativePost;
 }
 
-class MatchingResponse {
+class Matching {
   @ApiProperty({ example: 1, description: '매칭 ID' })
-  matchingId: number;
+  id: number;
 
   @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;
+  hasMatching: boolean;
 
   @ApiProperty({
     description: '받은 매칭 수',
@@ -106,8 +108,8 @@ export class GetMatchingsResponse {
 
   @ApiProperty({
     description: '매칭 정보',
-    type: [MatchingResponse],
+    type: [Matching],
   })
-  @Type(() => MatchingResponse)
-  matching: MatchingResponse[];
+  @Type(() => Matching)
+  matching: Matching[];
 }