Refactor(#117) Board controller 커스텀데코레이터 적용

modern-agile-team · Nov 13, 2023 · 7b68003 · 7b68003
1 parent 1abe895
commit 7b68003
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/src/boards/controllers/Boards.controller.ts b/src/boards/controllers/Boards.controller.ts
@@ -7,8 +7,8 @@ import {
   Delete,
   UseInterceptors,
   Query,
-  Headers,
   UploadedFiles,
+  UseGuards,
 } from '@nestjs/common';
 import { BoardsService } from '../services/Boards.service';
 import { Board } from '../entities/board.entity';
@@ -26,6 +26,8 @@ import { ApiUpdateBoard } from '../swagger-decorators/patch-board-decorators';
 import { ApiTags } from '@nestjs/swagger';
 import { ApiDeleteBoard } from '../swagger-decorators/delete-board-decorators';
 import { ApiUpdateBoardImage } from '../swagger-decorators/patch-board-images-decorators';
+import { JwtAccessTokenGuard } from 'src/config/guards/jwt-access-token.guard';
+import { GetUserId } from 'src/common/decorators/get-userId.decorator';
 
 @Controller('boards')
 @ApiTags('board API')
@@ -37,26 +39,24 @@ export class BoardsController {
   ) {}
 
   @Post('')
+  @UseGuards(JwtAccessTokenGuard)
   @ApiAddBoard()
   async create(
-    @Headers('access_token') accessToken: string,
+    @GetUserId() userId: number,
     @Body() createBoardDto: CreateBoardDto,
   ): Promise<Board> {
-    const userId = await this.tokenService.decodeToken(accessToken);
     return await this.boardsService.create(createBoardDto, userId);
   }
 
   @Post('/images')
+  @UseGuards(JwtAccessTokenGuard)
   @UseInterceptors(FilesInterceptor('files', 3))
   @ApiUploadBoardImages()
   async uploadImage(
-    @Headers('access_token') accesstoken: string,
+    @GetUserId() userId: number,
     @Query('boardId') boardId: number,
     @UploadedFiles() files: Express.Multer.File[],
   ): Promise<CreateBoardImageDto[]> {
-    const userId = await this.tokenService.decodeToken(accesstoken);
-    console.log(files);
-
     return await this.boardImagesService.createBoardImages(
       boardId,
       files,
@@ -74,13 +74,13 @@ export class BoardsController {
   }
 
   @Get('/unit')
+  @UseGuards(JwtAccessTokenGuard)
   @ApiGetOneBoard()
   async findOne(
     @Query('boardId') boardId: number,
-    @Headers('access_token') accesstoken: string,
+    @GetUserId() userId: number,
   ): Promise<BoardResponseDTO> {
     ``;
-    const userId = await this.tokenService.decodeToken(accesstoken);
     return await this.boardsService.findOneBoard(boardId, userId);
   }
 
@@ -94,15 +94,15 @@ export class BoardsController {
   }
 
   @Patch('/images')
+  @UseGuards(JwtAccessTokenGuard)
   @ApiUpdateBoardImage()
   @UseInterceptors(FilesInterceptor('files', 3))
   async editBoardImages(
-    @Headers('access_token') accessToken: string,
+    @GetUserId() userId: number,
     @Query('boardId') boardId: number,
     @Query('deleteImageUrl') deleteImageUrl: string[],
     @UploadedFiles() files: Express.Multer.File[],
   ) {
-    const userId = await this.tokenService.decodeToken(accessToken);
     return await this.boardImagesService.updateBoardImages(
       boardId,
       files,
@@ -112,12 +112,12 @@ export class BoardsController {
   }
 
   @Delete('')
+  @UseGuards(JwtAccessTokenGuard)
   @ApiDeleteBoard()
   async deleteBoard(
     @Query('boardId') boardId: number,
-    @Headers('access_token') accessToken: string,
+    @GetUserId() userId: number,
   ) {
-    const userId = await this.tokenService.decodeToken(accessToken);
     await this.boardsService.deleteBoard(boardId, userId);
   }
 }
diff --git a/src/friends/entities/friends.entity.ts b/src/friends/entities/friends.entity.ts
@@ -40,6 +40,10 @@ export class Friend {
   @Column({ type: 'enum', enum: Status, default: Status.PENDING })
   status!: Status;
 
-  @Column({ name: 'created_at', type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
+  @Column({
+    name: 'created_at',
+    type: 'timestamp',
+    default: () => 'CURRENT_TIMESTAMP',
+  })
   createdAt: Date;
 }