Merge pull request #82 from modern-agile-team/feature/board-like

Refactor(hobiJeong/board-like) : 좋아요 조회 시, 해당 유저가 좋아요를 눌렀는지 판별하는 코드 추가
modern-agile-team · Oct 30, 2023 · 1492654 · 1492654
2 parents 1d2041f + fcbaea3
commit 1492654
Show file tree

Hide file tree

Showing 4 changed files with 94 additions and 12 deletions.
diff --git a/src/boards/controllers/boards-like.controller.ts b/src/boards/controllers/boards-like.controller.ts
@@ -11,8 +11,6 @@ import {
   Headers,
 } from '@nestjs/common';
 import { BoardsLikeService } from '../services/boards-like.service';
-import { Users } from 'src/common/decorators/user.decorator';
-import { User } from 'src/users/entities/user.entity';
 import { ApiTags } from '@nestjs/swagger';
 import { ApiAddBoardLike } from '../swagger-decorators/add-board-like.decorator';
 import { ApiGetBoardLikeCount } from '../swagger-decorators/get-board-like-count.decorator';
@@ -39,9 +37,30 @@ export class BoardsLikeController {
   }
 
   @ApiGetBoardLikeCount()
-  @Get('/like')
-  async getBoardsLike(@Query('boardId') boardId: number) {
-    return this.boardsLikeService.getBoardLikes(boardId);
+  @Get('like')
+  async getBoardsLike(
+    @Headers('access_token') accessToken: string,
+    @Query('boardId', ParseIntPipe) boardId: number,
+  ) {
+    try {
+      const userId = await this.tokenService.decodeToken(accessToken);
+
+      return this.boardsLikeService.getBoardLikesAndIsLike(boardId, userId);
+    } catch (error) {
+      if (
+        (error.status === 401 &&
+          error.message === '유효하지 않은 토큰입니다.') ||
+        (error.status === 403 && error.message === '만료된 토큰입니다.') ||
+        (error.status === 404 &&
+          error.message === '사용자를 찾을 수 없습니다.') ||
+        (error.status === 411 &&
+          error.message === '토큰이 제공되지 않았습니다.')
+      ) {
+        return this.boardsLikeService.getBoardLikes(boardId);
+      }
+      console.error(error);
+      throw error;
+    }
   }
 
   @ApiDeleteBoardLike()

diff --git a/src/boards/repository/boards-like.repository.ts b/src/boards/repository/boards-like.repository.ts
@@ -1,10 +1,11 @@
 import { Injectable } from '@nestjs/common';
-import { EntityManager } from 'typeorm';
+import { EntityManager, Equal } from 'typeorm';
 import { BoardLike } from '../entities/board-like.entity';
 
 @Injectable()
 export class BoardsLikeRepository {
   constructor(private entityManager: EntityManager) {}
+
   async addBoardLike(boardId: number, userId: number) {
     const boardLike = new BoardLike();
     boardLike.boardId = boardId;
@@ -19,9 +20,16 @@ export class BoardsLikeRepository {
     const likesCount: number = await this.entityManager.count(BoardLike, {
       where: { boardId: boardId },
     });
+
     return likesCount;
   }
 
+  async isBoardLike(boardId: number, userId: number) {
+    return this.entityManager.findOne(BoardLike, {
+      where: { boardId: Equal(boardId), userId: Equal(userId) },
+    });
+  }
+
   async deleteBoardLike(boardId: number, userId: number) {
     this.entityManager.delete(BoardLike, {
       boardId: boardId,
@@ -30,4 +38,4 @@ export class BoardsLikeRepository {
 
     return { success: true, msg: '좋아요 삭제 성공', isLike: false };
   }
-}
+}
diff --git a/src/boards/services/boards-like.service.ts b/src/boards/services/boards-like.service.ts
@@ -61,14 +61,43 @@ export class BoardsLikeService {
     return returnedLike;
   }
 
+  async getBoardLikesAndIsLike(boardId: number, userId: number) {
+    const board = await this.entityManager.findOne(Board, {
+      where: { id: boardId },
+    });
+
+    if (!board) {
+      throw new NotFoundException('해당 게시글이 없습니다.');
+    }
+
+    const boardLikesCount =
+      await this.boardsLikeRepositry.getBoardLikesCount(boardId);
+
+    const isBoardLike = await this.boardsLikeRepositry.isBoardLike(
+      boardId,
+      userId,
+    );
+
+    if (!isBoardLike) {
+      return { isLike: false, boardLikesCount };
+    }
+
+    return { isLike: true, boardLikesCount };
+  }
+
   async getBoardLikes(boardId: number) {
     const board = await this.entityManager.findOne(Board, {
       where: { id: boardId },
     });
+
     if (!board) {
-      throw new Error('해당 게시글이 없습니다. ');
+      throw new NotFoundException('해당 게시글이 없습니다.');
     }
-    return this.boardsLikeRepositry.getBoardLikesCount(boardId);
+
+    const boardLikesCount =
+      await this.boardsLikeRepositry.getBoardLikesCount(boardId);
+
+    return { isLike: false, boardLikesCount };
   }
 
   async deleteBoardLike(boardId: number, userId: number) {

diff --git a/src/boards/swagger-decorators/get-board-like-count.decorator.ts b/src/boards/swagger-decorators/get-board-like-count.decorator.ts
@@ -5,16 +5,42 @@ export function ApiGetBoardLikeCount() {
   return applyDecorators(
     ApiOperation({
       summary: '해당 게시글 좋아요 개수 조회',
-      description: 'Param - board-id',
+      description: 'Headers - access_token, Param - board-id',
     }),
     ApiResponse({
       status: 200,
       description:
-        '좋아요 조회 성공. 실제 response 값은 count 없이 숫자만 들어옴.',
+        '좋아요 조회 성공. 토큰이 담겨서 왔고, 해당 유저가 좋아요를 누른 경우',
       content: {
         JSON: {
           example: {
-            count: 1,
+            isLike: true,
+            boardLikesCount: 2,
+          },
+        },
+      },
+    }),
+    ApiResponse({
+      status: 200,
+      description:
+        '좋아요 조회 성공. 토큰이 없거나, 해당 유저가 좋아요를 누르지 않은 경우',
+      content: {
+        JSON: {
+          example: {
+            isLike: true,
+            boardLikesCount: 2,
+          },
+        },
+      },
+    }),
+    ApiResponse({
+      status: 404,
+      description: '해당 보드 id가 존재하지 않는 경우',
+      content: {
+        JSON: {
+          example: {
+            isLike: true,
+            boardLikesCount: 2,
           },
         },
       },