매칭 응답 chatRoomId 추가, dto 통합

khmandarrin · khmandarrin · commit 7c38dfb648cd · 2024-11-27T14:31:41.000+09:00
diff --git a/src/chat-room/chat-room.service.ts b/src/chat-room/chat-room.service.ts
@@ -77,4 +77,13 @@ export class ChatRoomService {
 
     await this.chatRoomRepository.save(chatRoom);
   }
+
+  async getChatRoomByMatchingId(matchingId: number): Promise<ChatRoom> {
+    return await this.chatRoomRepository.findOne({
+      where: {
+        matching: { id: matchingId },
+      },
+      relations: ['matching'],
+    });
+  }
 }
diff --git a/src/matching/dto/Patch-matching.request.ts b/src/matching/dto/Patch-matching.request.ts
diff --git a/src/matching/dto/Patch-matching.response.ts b/src/matching/dto/Patch-matching.response.ts
diff --git a/src/matching/dto/get-matching.response.ts b/src/matching/dto/get-matching.response.ts
diff --git a/src/matching/dto/matching.request.ts b/src/matching/dto/matching.request.ts
@@ -1,5 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsInt, IsString, MaxLength, MinLength } from 'class-validator';
+import { IsIn, IsInt, IsString, MaxLength, MinLength } from 'class-validator';
 
 export class CreateMatchingReqeust {
   @ApiProperty({ example: 1, description: '신청하는 유저 아이디' })
@@ -19,3 +19,14 @@ export class CreateMatchingReqeust {
   @MaxLength(100)
   message: string;
 }
+
+export class PatchMatchingRequest {
+  @ApiProperty({
+    example: 'accept',
+    enum: ['accept', 'reject'],
+    description: '수락 또는 거절',
+  })
+  @IsString()
+  @IsIn(['accept', 'reject'])
+  requestStatus: 'accept' | 'reject';
+}
diff --git a/src/matching/dto/matching.response.ts b/src/matching/dto/matching.response.ts
@@ -1,4 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
+import { Type } from 'class-transformer';
 
 export class PostMatchingResponse {
   @ApiProperty({ example: 1, description: '채팅방 아이디' })
@@ -10,3 +11,103 @@ export class PostMatchingResponse {
   @ApiProperty({ example: 2, description: '매칭 상대 유저 아이디' })
   toUserId: number;
 }
+
+export class PatchMatchingResponse {
+  @ApiProperty({ example: 1, description: '매칭 ID' })
+  matchingId: number;
+
+  @ApiProperty({ example: 1, description: '신청한 유저 아이디' })
+  requesterId: number;
+
+  @ApiProperty({ example: 2, description: '매칭 상대 유저 아이디' })
+  targetId: number;
+
+  @ApiProperty({
+    example: 'accept',
+    enum: ['accept', 'reject', 'pending'],
+    description: '수락 또는 거절',
+  })
+  requestStatus: 'accept' | 'reject' | 'pending';
+
+  @ApiProperty({ example: 1, description: '채팅방 아이디' })
+  chatRoomId?: number;
+}
+
+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({ example: 1, description: '매칭 ID' })
+  matchingId: 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;
+
+  @ApiProperty({
+    description: '받은 매칭 수',
+    example: 10,
+  })
+  matchingsCount: number;
+
+  @ApiProperty({
+    description: '매칭 정보',
+    type: [MatchingResponse],
+  })
+  @Type(() => MatchingResponse)
+  matching: MatchingResponse[];
+}
diff --git a/src/matching/matching.controller.ts b/src/matching/matching.controller.ts
@@ -18,7 +18,10 @@ import {
   PatchMatchingRequestStatusSwagger,
 } from './matching.swagger';
 import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
-import { CreateMatchingReqeust } from './dto/matching.request';
+import {
+  CreateMatchingReqeust,
+  PatchMatchingRequest,
+} from './dto/matching.request';
 import { UserService } from 'src/user/user.service';
 import { Request } from 'express';
 import {
@@ -27,12 +30,14 @@ import {
   UnauthorizedException,
 } from 'src/common/exception/service.exception';
 import { BaseResponse } from 'src/common/response/dto';
-import { PostMatchingResponse } from './dto/matching.response';
+import {
+  GetMatchingsResponse,
+  PatchMatchingResponse,
+  PostMatchingResponse,
+} from './dto/matching.response';
 import { AuthGuard } from 'src/auth/guards/jwt.auth.guard';
-import { PatchMatchingRequest } from './dto/Patch-matching.request';
-import { GetMatchingsResponse } from './dto/get-matching.response';
-import { PatchMatchingResponse } from './dto/Patch-matching.response';
 import { PostService } from 'src/post/post.service';
+import { ChatRoomService } from 'src/chat-room/chat-room.service';
 
 @ApiBearerAuth('Authorization')
 @Controller('matching')
@@ -43,6 +48,7 @@ export class MatchingController {
     @Inject(forwardRef(() => UserService))
     private readonly userService: UserService,
     private readonly postService: PostService,
+    private readonly chatRoomService: ChatRoomService,
   ) {}
 
   @Post()
@@ -86,6 +92,9 @@ export class MatchingController {
     @Body() body: PatchMatchingRequest,
   ): Promise<BaseResponse<PatchMatchingResponse>> {
     const matching = await this.matchingService.getMatchingById(matchingId);
+    const chatRoom = await this.chatRoomService.getChatRoomByMatchingId(
+      matching.id,
+    );
     if (req.user.id !== matching.target.id) {
       throw UnauthorizedException('권한이 없습니다.');
     }
@@ -94,6 +103,10 @@ export class MatchingController {
       throw InvalidInputValueException('이미 처리된 요청입니다.');
     }
 
+    if (!chatRoom) {
+      throw DataNotFoundException('채팅방을 찾을 수 없습니다.');
+    }
+
     await this.matchingService.patchMatchingRequestStatus(matching, body);
     return new BaseResponse<PatchMatchingResponse>(
       true,
@@ -103,6 +116,7 @@ export class MatchingController {
         requesterId: matching.requester.id,
         targetId: matching.target.id,
         requestStatus: matching.requestStatus,
+        chatRoomId: chatRoom.id,
       },
     );
   }
diff --git a/src/matching/matching.service.ts b/src/matching/matching.service.ts
@@ -1,5 +1,8 @@
 import { Injectable } from '@nestjs/common';
-import { CreateMatchingReqeust } from './dto/matching.request';
+import {
+  CreateMatchingReqeust,
+  PatchMatchingRequest,
+} from './dto/matching.request';
 import { DataSource, Repository } from 'typeorm';
 import { Matching } from 'src/common/entities/matching.entity';
 import { ChatRoomService } from '../chat-room/chat-room.service';
@@ -10,8 +13,7 @@ import {
 import { ChatMessageService } from 'src/chat-message/chat-message.service';
 import { ChatRoom } from 'src/common/entities/chat-room.entity';
 import { InjectRepository } from '@nestjs/typeorm';
-import { PatchMatchingRequest } from './dto/Patch-matching.request';
-import { GetMatchingsResponse } from './dto/get-matching.response';
+import { GetMatchingsResponse } from './dto/matching.response';
 
 @Injectable()
 export class MatchingService {
@@ -29,7 +31,7 @@ export class MatchingService {
     await queryRunner.connect();
     await queryRunner.startTransaction();
     try {
-      queryRunner.manager.save(Matching, {
+      matching = await queryRunner.manager.save(Matching, {
         requester: { id: body.requesterId },
         target: { id: body.targetId },
       });
diff --git a/src/matching/matching.swagger.ts b/src/matching/matching.swagger.ts
@@ -5,10 +5,12 @@ import {
   ApiOperation,
 } from '@nestjs/swagger';
 import { BaseSwaggerDecorator } from 'nestjs-swagger-decorator';
-import { PostMatchingResponse } from './dto/matching.response';
+import {
+  GetMatchingsResponse,
+  PatchMatchingResponse,
+  PostMatchingResponse,
+} from './dto/matching.response';
 import { BaseResponse } from 'src/common/response/dto';
-import { GetMatchingsResponse } from './dto/get-matching.response';
-import { PatchMatchingResponse } from './dto/Patch-matching.response';
 
 // 매칭 생성 API Swagger
 export function CreateMatchingSwagger(apiSummary: string) {

Original file line number	Diff line number	Diff line change
`@@ -77,4 +77,13 @@ export class ChatRoomService {`
`77`	`77`
`78`	`78`	`await this.chatRoomRepository.save(chatRoom);`
`79`	`79`	`}`
	`80`	`+`
	`81`	`+ async getChatRoomByMatchingId(matchingId: number): Promise<ChatRoom> {`
	`82`	`+ return await this.chatRoomRepository.findOne({`
	`83`	`+ where: {`
	`84`	`+ matching: { id: matchingId },`
	`85`	`+ },`
	`86`	`+ relations: ['matching'],`
	`87`	`+ });`
	`88`	`+ }`
`80`	`89`	`}`