Merge pull request #16 from oodd-team/OD-36

유저 신고 기능 수정

Author: ji-somnie

src/post-report/post-report.controller.ts

@@ -1,22 +1,25 @@
-import { Body, Controller, Post, Req } from '@nestjs/common';
+import { Body, Controller, Post, Req, UseGuards } from '@nestjs/common';
 import { PostReportService } from './post-report.service';
 import { CreatePostReportSwagger } from './post-report.swagger';
 import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
 import { PostReportDto } from './dtos/post-report.dto';
 import { BaseResponse } from 'src/common/response/dto';
+import { AuthGuard } from 'src/auth/guards/jwt.auth.guard'; 
+import { Request } from 'express';
 
 @ApiBearerAuth('Authorization')
 @Controller('post-report')
+@UseGuards(AuthGuard) 
 @ApiTags('[서비스] 게시글 신고')
 export class PostReportController {
   constructor(private readonly postReportService: PostReportService) {}
   @Post()
   @CreatePostReportSwagger('게시글 신고하기 API')
   async createPostReport(
     @Body() postReportDto: PostReportDto,
-    @Req() req: any 
+    @Req() req: Request 
   ): Promise<BaseResponse<string>> {
-    const requesterId = 1; // 추후 수정
+    const requesterId = req.user['id'];
 
     await this.postReportService.reportPost({
       ...postReportDto,

src/post-report/post-report.service.ts

@@ -3,7 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 import { PostReport } from '../common/entities/post-report.entity';
 import { PostReportDto } from './dtos/post-report.dto';
-import { DataNotFoundException } from 'src/common/exception/service.exception';
+import { DataNotFoundException, InvalidInputValueException } from 'src/common/exception/service.exception';
 import { PostService } from '../post/post.service';
 
 @Injectable()
@@ -29,7 +29,7 @@ export class PostReportService {
     });
 
     if (existingReport) {
-      throw new Error('이미 해당 게시글에 대해 신고하였습니다.');
+      throw InvalidInputValueException('이미 해당 게시글을 신고하였습니다.');
     }
 
     const postReport = this.postReportRepository.create({

src/user-report/user-report.controller.ts

@@ -1,12 +1,16 @@
-import { Body, Controller, Patch, Post, UseGuards } from '@nestjs/common';
+import { Body, Controller, Post, Req, UseGuards } from '@nestjs/common';
 import { UserReportService } from './user-report.service';
 import { PostUserReportSwagger } from './user-report.swagger';
 import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
 import { CreateUserReportDto } from './dto/user-report.dto';
 import { BaseResponse } from 'src/common/response/dto';
+import { AuthGuard } from 'src/auth/guards/jwt.auth.guard'; 
+import { Request } from 'express';
+import { UnauthorizedException } from 'src/common/exception/service.exception';
 
 @ApiBearerAuth('Authorization')
 @Controller('user-report')
+@UseGuards(AuthGuard)
 @ApiTags('[서비스] 유저 신고')
 export class UserReportController {
   constructor(private readonly userReportService: UserReportService) {}
@@ -15,12 +19,25 @@ export class UserReportController {
   @PostUserReportSwagger('유저 신고하기 API')
   async postUserReport(
     @Body() createUserReportDto: CreateUserReportDto,
+    @Req() req: Request
   ): Promise<BaseResponse<null>> {
-    const fromUserId = 1; // 나중에 인증 로직 완성되면 유저 인증하자
+    const fromUserId = req.user['id'];
+
+    // jwt 유저와 신고할 유저가 다른 경우
+    if (fromUserId != createUserReportDto.fromUserId) {
+      throw UnauthorizedException('신고 권한이 없습니다.');
+    }
+
     createUserReportDto.fromUserId = fromUserId; 
 
     await this.userReportService.createReport(createUserReportDto);
 
     return new BaseResponse<null>(true, 'USER_REPORTED_SUCCESS', null);
   }
-}
+}
+
+/* 
+TODO
+- userReport 중복 생성 
+- jwt 인증 받은 사람이 아니더라도 신고가 됨 -> 인가 
+*/

src/user-report/user-report.service.ts

@@ -3,8 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 import { UserReport } from '../common/entities/user-report.entity';
 import { CreateUserReportDto } from '../user-report/dto/user-report.dto';
-import { User } from '../common/entities/user.entity';
-import { DataNotFoundException } from 'src/common/exception/service.exception';
+import { DataNotFoundException, InvalidInputValueException } from 'src/common/exception/service.exception';
 import { UserService } from 'src/user/user.service';
 
 @Injectable()
@@ -29,10 +28,25 @@ export class UserReportService {
         throw DataNotFoundException('유저를 찾을 수 없습니다.');
     }
 
+    // 중복 신고 확인
+    const existingReport = await this.userReportRepository
+      .createQueryBuilder('report')
+      .where('report.fromUser = :fromUserId', { fromUserId })
+      .andWhere('report.toUser = :toUserId', { toUserId })
+      .andWhere('report.reason = :reason', { reason })
+      .getOne();
+
+    if (existingReport) {
+      throw InvalidInputValueException('이미 해당 유저를 신고하였습니다.'); 
+    }
+
     const userReport = this.userReportRepository.create({
       fromUser,
       toUser,
       reason,
+      createdAt: new Date(),
+      updatedAt: new Date(),
+      status: 'activated',
     });
 
     await this.userReportRepository.save(userReport);