diff --git a/src/main/java/com/uspray/uspray/domain/history/repository/HistoryRepository.java b/src/main/java/com/uspray/uspray/domain/history/repository/HistoryRepository.java index cf758868..20b8d3ef 100644 --- a/src/main/java/com/uspray/uspray/domain/history/repository/HistoryRepository.java +++ b/src/main/java/com/uspray/uspray/domain/history/repository/HistoryRepository.java @@ -18,18 +18,7 @@ public interface HistoryRepository extends JpaRepository, History Page findByMemberAndOriginPrayIdIsNotNull(Member member, Pageable pageable); - Optional findByIdAndMember(Long historyId, Member member); - default History getHistoryByIdAndMember(Long historyId, Member member) { - return findByIdAndMember(historyId, member) - .orElseThrow(() -> new NotFoundException(ErrorStatus.HISTORY_NOT_FOUND_EXCEPTION)); - } - - default History getHistoryById(Long historyId) { - return findById(historyId) - .orElseThrow(() -> new NotFoundException( - ErrorStatus.HISTORY_NOT_FOUND_EXCEPTION - )); - } + Optional findById(Long historyId); } diff --git a/src/main/java/com/uspray/uspray/domain/history/service/HistoryService.java b/src/main/java/com/uspray/uspray/domain/history/service/HistoryService.java index f3116141..100e36fe 100644 --- a/src/main/java/com/uspray/uspray/domain/history/service/HistoryService.java +++ b/src/main/java/com/uspray/uspray/domain/history/service/HistoryService.java @@ -66,7 +66,7 @@ public HistoryListResponseDto searchHistoryList(String username, @Transactional(readOnly = true) public HistoryDetailResponseDto getHistoryDetail(String username, Long historyId) { Member member = memberRepository.getMemberByUserId(username); - History history = historyRepository.getHistoryById(historyId); + History history = getHistoryById(historyId); if (history.getPrayType().equals(PrayType.SHARED)) { Pray originPray = prayRepository.getPrayById(history.getOriginPrayId()); return HistoryDetailResponseDto.shared(history, originPray); @@ -84,8 +84,19 @@ public void deleteHistory(History history) { historyRepository.delete(history); } - @Transactional + @Transactional(readOnly = true) public History getHistoryByIdAndMember(Long historyId, Member member) { - return historyRepository.getHistoryByIdAndMember(historyId, member); + return historyRepository.findByIdAndMember(historyId, member) + .orElseThrow(() -> new NotFoundException( + ErrorStatus.HISTORY_NOT_FOUND_EXCEPTION + )); + } + + @Transactional(readOnly = true) + public History getHistoryById(Long historyId) { + return historyRepository.findById(historyId) + .orElseThrow(() -> new NotFoundException( + ErrorStatus.HISTORY_NOT_FOUND_EXCEPTION + )); } }