user block,report 응답 수정

Author: khmandarrin

src/user-block/dtos/user-block.dto.ts src/user-block/dtos/user-block.request.ts

@@ -1,19 +1,22 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { IsNotEmpty, IsNumber, IsString } from 'class-validator';
 
-export class CreateUserBlockDto {
+export class UserBlockRequest {
   @ApiProperty({ example: 1, description: '차단한 사람' })
   @IsNumber()
   @IsNotEmpty()
-  fromUserId!: number;
+  requesterId!: number;
 
   @ApiProperty({ example: 2, description: '차단 당한 사람' })
   @IsNumber()
   @IsNotEmpty()
-  toUserId!: number;
+  targetId!: number;
 
-  @ApiProperty({ example: 'block', description: '차단하고 싶으면 block, 안 하고 싶으면 unblock' })
+  @ApiProperty({
+    example: 'block',
+    description: '차단하고 싶으면 block, 안 하고 싶으면 unblock',
+  })
   @IsString()
   @IsNotEmpty()
   action!: 'block' | 'unblock';
-}
+}

src/user-block/user-block.controller.ts

@@ -2,7 +2,7 @@ import { Body, Controller, Post, Req, UseGuards } from '@nestjs/common';
 import { UserBlockService } from './user-block.service';
 import { CreateBlockUserSwagger } from './user-block.swagget';
 import { ApiBearerAuth, ApiTags } from '@nestjs/swagger';
-import { CreateUserBlockDto } from './dtos/user-block.dto';
+import { UserBlockRequest } from './dtos/user-block.request';
 import { BaseResponse } from 'src/common/response/dto';
 import { AuthGuard } from 'src/auth/guards/jwt.auth.guard';
 import { Request } from 'express';
@@ -17,13 +17,10 @@ export class UserBlockController {
   @Post()
   @CreateBlockUserSwagger('유저 차단하기 API')
   async createUserBlock(
-    @Body() createUserBlockDto: CreateUserBlockDto,
+    @Body() createUserBlockDto: UserBlockRequest,
     @Req() req: Request,
   ): Promise<BaseResponse<null>> {
-    const fromUserId = req.user['id'];
-
-    createUserBlockDto.fromUserId = fromUserId;
-
+    createUserBlockDto.requesterId = req.user.id;
     const resultCode =
       await this.userBlockService.createBlock(createUserBlockDto);
 

src/user-block/user-block.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { UserBlock } from 'src/common/entities/user-block.entity';
 import { Repository } from 'typeorm';
-import { CreateUserBlockDto } from './dtos/user-block.dto';
+import { UserBlockRequest } from './dtos/user-block.request';
 import { UserService } from 'src/user/user.service';
 import {
   DataNotFoundException,
@@ -29,14 +29,14 @@ export class UserBlockService {
     return blockedUsers.map((block) => block.target.id);
   }
 
-  async createBlock(createUserBlockDto: CreateUserBlockDto): Promise<string> {
-    const { fromUserId, toUserId, action } = createUserBlockDto;
+  async createBlock(createUserBlockDto: UserBlockRequest): Promise<string> {
+    const { requesterId, targetId, action } = createUserBlockDto;
 
     const fromUser = await this.userService.findByFields({
-      where: { id: fromUserId, status: StatusEnum.ACTIVATED },
+      where: { id: requesterId, status: StatusEnum.ACTIVATED },
     });
     const toUser = await this.userService.findByFields({
-      where: { id: toUserId, status: StatusEnum.ACTIVATED },
+      where: { id: targetId, status: StatusEnum.ACTIVATED },
     });
 
     if (!fromUser || !toUser) {

src/user-report/dto/user-report.dto.ts src/user-report/dto/user-report.request.ts

@@ -1,18 +1,18 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { IsNotEmpty, IsNumber, IsString, MinLength } from 'class-validator';
 
-export class CreateUserReportDto {
+export class UserReportRequest {
   @ApiProperty({ example: 1, description: '신고한 사람' })
   @IsNumber()
   @IsNotEmpty()
-  fromUserId!: number;
+  requesterId!: number;
 
   @ApiProperty({ example: 2, description: '신고당한 사람' })
   @IsNumber()
   @IsNotEmpty()
-  toUserId!: number;
+  targetId!: number;
 
   @ApiProperty({ example: '질척거림', description: '신고 사유' })
   @IsString()
   reason!: string;
-}
+}

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

@@ -2,9 +2,9 @@ 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 { UserReportRequest } from './dto/user-report.request';
 import { BaseResponse } from 'src/common/response/dto';
-import { AuthGuard } from 'src/auth/guards/jwt.auth.guard'; 
+import { AuthGuard } from 'src/auth/guards/jwt.auth.guard';
 import { Request } from 'express';
 import { UnauthorizedException } from 'src/common/exception/service.exception';
 
@@ -18,18 +18,13 @@ export class UserReportController {
   @Post()
   @PostUserReportSwagger('유저 신고하기 API')
   async postUserReport(
-    @Body() createUserReportDto: CreateUserReportDto,
-    @Req() req: Request
+    @Body() createUserReportDto: UserReportRequest,
+    @Req() req: Request,
   ): Promise<BaseResponse<null>> {
-    const fromUserId = req.user['id'];
-
     // jwt 유저와 신고할 유저가 다른 경우
-    if (fromUserId != createUserReportDto.fromUserId) {
+    if (req.user.id != createUserReportDto.requesterId) {
       throw UnauthorizedException('신고 권한이 없습니다.');
     }
-
-    createUserReportDto.fromUserId = fromUserId; 
-
     await this.userReportService.createReport(createUserReportDto);
 
     return new BaseResponse<null>(true, 'USER_REPORTED_SUCCESS', null);
@@ -40,4 +35,4 @@ export class UserReportController {
 TODO
 - userReport 중복 생성 
 - jwt 인증 받은 사람이 아니더라도 신고가 됨 -> 인가 
-*/
+*/

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

@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 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 { UserReportRequest } from './dto/user-report.request';
 import {
   DataNotFoundException,
   InvalidInputValueException,
@@ -18,14 +18,14 @@ export class UserReportService {
     private readonly userService: UserService,
   ) {}
 
-  async createReport(createUserReportDto: CreateUserReportDto): Promise<void> {
-    const { fromUserId, toUserId, reason } = createUserReportDto;
+  async createReport(createUserReportDto: UserReportRequest): Promise<void> {
+    const { requesterId, targetId, reason } = createUserReportDto;
 
     const fromUser = await this.userService.findByFields({
-      where: { id: fromUserId, status: StatusEnum.ACTIVATED },
+      where: { id: requesterId, status: StatusEnum.ACTIVATED },
     });
     const toUser = await this.userService.findByFields({
-      where: { id: toUserId, status: StatusEnum.ACTIVATED },
+      where: { id: targetId, status: StatusEnum.ACTIVATED },
     });
 
     if (!fromUser || !toUser) {
@@ -35,8 +35,8 @@ export class UserReportService {
     // 중복 신고 확인
     const existingReport = await this.userReportRepository
       .createQueryBuilder('report')
-      .where('report.fromUser = :fromUserId', { fromUserId })
-      .andWhere('report.toUser = :toUserId', { toUserId })
+      .where('report.fromUser = :requesterId', { requesterId })
+      .andWhere('report.toUser = :targetId', { targetId })
       .andWhere('report.reason = :reason', { reason })
       .getOne();
 
@@ -49,7 +49,6 @@ export class UserReportService {
       toUser,
       reason,
       createdAt: new Date(),
-      updatedAt: new Date(),
       status: StatusEnum.ACTIVATED,
     });