Merge branch 'dev' of https://github.com/oodd-team/oodd-server-nestjs into dev

Author: khmandarrin

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/matching.controller.ts

@@ -21,11 +21,13 @@ import { UserService } from 'src/user/user.service';
 import { Request } from 'express';
 import {
   DataNotFoundException,
+  InternalServerException,
   UnauthorizedException,
 } from 'src/common/exception/service.exception';
 import { BaseResponse } from 'src/common/response/dto';
 import { PostMatchingResponse } from './dto/matching.response';
 import { AuthGuard } from 'src/auth/guards/jwt.auth.guard';
+import { PatchMatchingRequestDto } from './dto/Patch-matching.request';
 
 @ApiBearerAuth('Authorization')
 @Controller('matching')
@@ -58,9 +60,25 @@ export class MatchingController {
   }
 
   @Patch()
+  @UseGuards(AuthGuard)
   @PatchMatchingRequestStatusSwagger('매칭 요청 수락 및 거절 API')
-  patchMatchingRequestStatus() {
-    // return this.userService.getHello();
+  async patchMatchingRequestStatus(
+    @Req() req: Request,
+    @Body() body: PatchMatchingRequestDto,
+  ): Promise<BaseResponse<any>> {
+    if (req.user.id !== body.targetId) {
+      throw UnauthorizedException('권한이 없습니다.');
+    }
+
+    if (
+      (await this.matchingService.getMatchingById(body.matchingId))
+        .requestStatus !== 'pending'
+    ) {
+      throw InternalServerException('이미 처리된 요청입니다.');
+    }
+
+    await this.matchingService.patchMatchingRequestStatus(body);
+    return new BaseResponse(true, '매칭 상태 변경 성공');
   }
 
   @Patch()

src/matching/matching.service.ts

@@ -3,10 +3,14 @@ import { CreateMatchingReqeust } 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';
-import { InternalServerException } from 'src/common/exception/service.exception';
+import {
+  DataNotFoundException,
+  InternalServerException,
+} from 'src/common/exception/service.exception';
 import { ChatMessageService } from 'src/chat-message/chat-message.service';
 import { ChatRoom } from 'src/common/entities/chat-room.entity';
 import { InjectRepository } from '@nestjs/typeorm';
+import { PatchMatchingRequestDto } from './dto/Patch-matching.request';
 
 @Injectable()
 export class MatchingService {
@@ -50,4 +54,44 @@ export class MatchingService {
       await queryRunner.release();
     }
   }
+
+  async patchMatchingRequestStatus(
+    body: PatchMatchingRequestDto,
+  ): Promise<Matching> {
+    const queryRunner = this.dataSource.createQueryRunner();
+    await queryRunner.connect();
+    await queryRunner.startTransaction();
+
+    const matching = await this.getMatchingById(body.matchingId);
+
+    try {
+      if (body.action === 'accept') {
+        matching.requestStatus = 'accepted';
+        matching.acceptedAt = new Date();
+      } else if (body.action === 'reject') {
+        matching.requestStatus = 'rejected';
+        matching.rejectedAt = new Date();
+      }
+
+      await queryRunner.manager.save(matching);
+      await queryRunner.commitTransaction();
+
+      return matching;
+    } catch (error) {
+      await queryRunner.rollbackTransaction();
+      throw InternalServerException(error.message);
+    } finally {
+      await queryRunner.release();
+    }
+  }
+
+  async getMatchingById(matchingId: number): Promise<Matching> {
+    const matching = await this.matchingRepository.findOne({
+      where: { id: matchingId },
+    });
+    if (!matching) {
+      throw DataNotFoundException('해당 매칭 요청을 찾을 수 없습니다.');
+    }
+    return matching;
+  }
 }

src/matching/matching.swagger.ts

@@ -1,4 +1,5 @@
 import {
+  ApiAcceptedResponse,
   ApiBadRequestResponse,
   ApiInternalServerErrorResponse,
   ApiNotFoundResponse,
@@ -35,7 +36,27 @@ export function CreateMatchingSwagger(apiSummary: string) {
 
 // 매칭 생성 상태값 변경 API Swagger
 export function PatchMatchingRequestStatusSwagger(apiSummary: string) {
-  return ApiOperation({ summary: apiSummary });
+  return BaseSwaggerDecorator(
+    { summary: apiSummary },
+    [
+      {
+        statusCode: 200,
+        responseOptions: [
+          {
+            model: BaseResponse,
+            exampleTitle: '성공',
+            exampleDescription: '성공했을 때 값',
+          },
+        ],
+        baseResponseDto: BaseResponse,
+      },
+    ],
+    [
+      ApiBadRequestResponse({ description: 'Bad Request' }),
+      ApiNotFoundResponse({ description: '해당 유저가 존재하지 않습니다.' }),
+      ApiInternalServerErrorResponse({ description: 'Internal Server Error' }),
+    ],
+  );
 }
 
 // 매칭 리스트 조회 API Swagger