fix: 충돌 해결 - #77

충돌 해결
aaahyunseo · Aug 18, 2024 · a639d45 · a639d45
2 parents a47ced5 + c0a6866
commit a639d45
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/main/java/com/example/swcompetitionproject/service/BoardService.java b/src/main/java/com/example/swcompetitionproject/service/BoardService.java
@@ -45,10 +45,6 @@ public BoardData getBoardById(User user, String dormitory, UUID boardId) {
         Board board = boardRepository.findBoardByDormitoryAndId(dormitoryType, boardId)
                 .orElseThrow(() -> new NotFoundException(ErrorCode.BOARD_NOT_FOUND));
 
-        boolean isLike = interestRepository.existsByUserAndBoard(user, board);
-        return BoardData.of(isLike, board);
-
-
         // 기존의 BoardCategories를 가져와서 처리
         List<BoardCategory> existingCategories = board.getBoardCategories();
 
@@ -65,7 +61,8 @@ public BoardData getBoardById(User user, String dormitory, UUID boardId) {
         // 기존 리스트에 새로 생성한 카테고리 추가
         existingCategories.addAll(boardCategories);
 
-        return BoardData.from(board);
+        boolean isLike = interestRepository.existsByUserAndBoard(user, board);
+        return BoardData.of(isLike, board);
 
     }