Merge pull request #72 from Dugout-Developers/fix/#68

jjeongdong · web-flow · commit 222f74880c3b · 2025-01-12T01:49:35.000+09:00
[FIX] 게시글 상세 조회시 찜 여부 컬럼 추가
diff --git a/src/main/java/com/back/catchmate/domain/board/controller/BoardController.java b/src/main/java/com/back/catchmate/domain/board/controller/BoardController.java
@@ -6,6 +6,7 @@
 import com.back.catchmate.domain.board.dto.BoardResponse.BoardInfo;
 import com.back.catchmate.domain.board.dto.BoardResponse.LiftUpStatusInfo;
 import com.back.catchmate.domain.board.dto.BoardResponse.PagedBoardInfo;
+import com.back.catchmate.domain.board.dto.BoardResponse.TempBoardInfo;
 import com.back.catchmate.domain.board.service.BoardService;
 import com.back.catchmate.domain.board.service.BookMarkService;
 import com.back.catchmate.global.dto.StateResponse;
@@ -74,7 +75,7 @@ public PagedBoardInfo getBoardListByUserId(@JwtValidation Long loginUserId,
 
     @GetMapping("/temp")
     @Operation(summary = "임시저장된 게시글 단일 조회 API", description = "임시저장된 게시글 단일 조회하는 API 구현.")
-    public BoardInfo getBoardListByUserId(@JwtValidation Long userId) {
+    public TempBoardInfo getBoardListByUserId(@JwtValidation Long userId) {
         return boardService.getTempBoard(userId);
     }
 
diff --git a/src/main/java/com/back/catchmate/domain/board/converter/BoardConverter.java b/src/main/java/com/back/catchmate/domain/board/converter/BoardConverter.java
@@ -60,6 +60,43 @@ public BoardInfo toBoardInfo(Board board, Game game) {
         UserInfo userInfo = userConverter.toUserInfo(board.getUser());
 
         return BoardInfo.builder()
+                .boardId(board.getId())
+                .title(board.getTitle())
+                .content(board.getContent())
+                .maxPerson(board.getMaxPerson())
+                .cheerClubId(board.getClub().getId())
+                .preferredGender(board.getPreferredGender())
+                .preferredAgeRange(board.getPreferredAgeRange())
+                .liftUpDate(board.getLiftUpDate())
+                .gameInfo(gameInfo)
+                .userInfo(userInfo)
+                .build();
+    }
+
+    public BoardInfo toBoardInfo(Board board, Game game, boolean isBookMarked) {
+        GameInfo gameInfo = gameConverter.toGameInfo(game);
+        UserInfo userInfo = userConverter.toUserInfo(board.getUser());
+
+        return BoardInfo.builder()
+                .boardId(board.getId())
+                .title(board.getTitle())
+                .content(board.getContent())
+                .maxPerson(board.getMaxPerson())
+                .cheerClubId(board.getClub().getId())
+                .preferredGender(board.getPreferredGender())
+                .preferredAgeRange(board.getPreferredAgeRange())
+                .liftUpDate(board.getLiftUpDate())
+                .isBookMarked(isBookMarked)
+                .gameInfo(gameInfo)
+                .userInfo(userInfo)
+                .build();
+    }
+
+    public TempBoardInfo toTempBoardInfo(Board board, Game game) {
+        GameInfo gameInfo = gameConverter.toGameInfo(game);
+        UserInfo userInfo = userConverter.toUserInfo(board.getUser());
+
+        return TempBoardInfo.builder()
                 .boardId(board.getId())
                 .title(board.getTitle())
                 .content(board.getContent())
diff --git a/src/main/java/com/back/catchmate/domain/board/dto/BoardResponse.java b/src/main/java/com/back/catchmate/domain/board/dto/BoardResponse.java
@@ -27,6 +27,25 @@ public static class BoardInfo {
         private LocalDateTime liftUpDate;
         private GameInfo gameInfo;
         private UserInfo userInfo;
+        private boolean isBookMarked;
+    }
+
+    @Getter
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class TempBoardInfo {
+        private Long boardId;
+        private String title;
+        private String content;
+        private Long cheerClubId;
+        private int currentPerson;
+        private int maxPerson;
+        private String preferredGender;
+        private String preferredAgeRange;
+        private LocalDateTime liftUpDate;
+        private GameInfo gameInfo;
+        private UserInfo userInfo;
     }
 
     @Getter
diff --git a/src/main/java/com/back/catchmate/domain/board/repository/BookMarkRepository.java b/src/main/java/com/back/catchmate/domain/board/repository/BookMarkRepository.java
@@ -15,4 +15,6 @@ public interface BookMarkRepository extends JpaRepository<BookMark, Long> {
     Optional<BookMark> findByUserIdAndBoardIdAndDeletedAtIsNull(Long userId, Long boardId);
 
     Page<BookMark> findAllByUserIdAndDeletedAtIsNull(Long userId, Pageable pageable);
+
+    boolean existsByUserIdAndBoardId(Long userId, Long boardId);
 }
diff --git a/src/main/java/com/back/catchmate/domain/board/service/BoardService.java b/src/main/java/com/back/catchmate/domain/board/service/BoardService.java
@@ -5,6 +5,7 @@
 import com.back.catchmate.domain.board.dto.BoardResponse.BoardInfo;
 import com.back.catchmate.domain.board.dto.BoardResponse.LiftUpStatusInfo;
 import com.back.catchmate.domain.board.dto.BoardResponse.PagedBoardInfo;
+import com.back.catchmate.domain.board.dto.BoardResponse.TempBoardInfo;
 import org.springframework.data.domain.Pageable;
 
 import java.time.LocalDate;
@@ -21,7 +22,7 @@ public interface BoardService {
 
     PagedBoardInfo getBoardListByUserId(Long loginUserId, Long userId, Pageable pageable);
 
-    BoardInfo getTempBoard(Long userId);
+    TempBoardInfo getTempBoard(Long userId);
 
     BoardDeleteInfo deleteBoard(Long userId, Long boardId);
 
diff --git a/src/main/java/com/back/catchmate/domain/board/service/BoardServiceImpl.java b/src/main/java/com/back/catchmate/domain/board/service/BoardServiceImpl.java
@@ -7,8 +7,10 @@
 import com.back.catchmate.domain.board.dto.BoardResponse.BoardInfo;
 import com.back.catchmate.domain.board.dto.BoardResponse.LiftUpStatusInfo;
 import com.back.catchmate.domain.board.dto.BoardResponse.PagedBoardInfo;
+import com.back.catchmate.domain.board.dto.BoardResponse.TempBoardInfo;
 import com.back.catchmate.domain.board.entity.Board;
 import com.back.catchmate.domain.board.repository.BoardRepository;
+import com.back.catchmate.domain.board.repository.BookMarkRepository;
 import com.back.catchmate.domain.club.entity.Club;
 import com.back.catchmate.domain.club.repository.ClubRepository;
 import com.back.catchmate.domain.game.converter.GameConverter;
@@ -42,6 +44,7 @@ public class BoardServiceImpl implements BoardService {
     private final UserRepository userRepository;
     private final BoardConverter boardConverter;
     private final GameConverter gameConverter;
+    private final BookMarkRepository bookMarkRepository;
 
     @Override
     @Transactional
@@ -133,7 +136,8 @@ public BoardInfo getBoard(Long userId, Long boardId) {
         Board board = boardRepository.findByIdAndDeletedAtIsNullAndIsCompleted(boardId)
                 .orElseThrow(() -> new BaseException(ErrorCode.BOARD_NOT_FOUND));
 
-        return boardConverter.toBoardInfo(board, board.getGame());
+        boolean isBookMarked = bookMarkRepository.existsByUserIdAndBoardId(user.getId(), board.getId());
+        return boardConverter.toBoardInfo(board, board.getGame(), isBookMarked);
     }
 
     @Override
@@ -161,7 +165,7 @@ public PagedBoardInfo getBoardListByUserId(Long loginUserId, Long userId, Pageab
 
     @Override
     @Transactional
-    public BoardInfo getTempBoard(Long userId) {
+    public TempBoardInfo getTempBoard(Long userId) {
         User user = userRepository.findById(userId)
                 .orElseThrow(() -> new BaseException(ErrorCode.USER_NOT_FOUND));
 
@@ -172,7 +176,7 @@ public BoardInfo getTempBoard(Long userId) {
             throw new BaseException(ErrorCode.TEMP_BOARD_BAD_REQUEST);
         }
 
-        return boardConverter.toBoardInfo(tempBoard, tempBoard.getGame());
+        return boardConverter.toTempBoardInfo(tempBoard, tempBoard.getGame());
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,6 @@ public interface BookMarkRepository extends JpaRepository<BookMark, Long> {`
`15`	`15`	`Optional<BookMark> findByUserIdAndBoardIdAndDeletedAtIsNull(Long userId, Long boardId);`
`16`	`16`
`17`	`17`	`Page<BookMark> findAllByUserIdAndDeletedAtIsNull(Long userId, Pageable pageable);`
	`18`	`+`
	`19`	`+ boolean existsByUserIdAndBoardId(Long userId, Long boardId);`
`18`	`20`	`}`