diff --git a/src/main/java/com/neighbors/tohero/application/letter/dto/GetLetterDetailResponse.java b/src/main/java/com/neighbors/tohero/application/letter/dto/GetLetterDetailResponse.java index cfe3197..581ba9a 100644 --- a/src/main/java/com/neighbors/tohero/application/letter/dto/GetLetterDetailResponse.java +++ b/src/main/java/com/neighbors/tohero/application/letter/dto/GetLetterDetailResponse.java @@ -9,10 +9,12 @@ public record LetterInfo( long letterId, String content, String from, - String to + String to, + boolean isOpened, + boolean isPublic ){} public static GetLetterDetailResponse from(Letter letter) { - return new GetLetterDetailResponse(new LetterInfo(letter.getLetterId(), letter.getLetterContent(), letter.getWriter(), letter.getTargetName())); + return new GetLetterDetailResponse(new LetterInfo(letter.getLetterId(), letter.getLetterContent(), letter.getWriter(), letter.getTargetName(), letter.isOpened(), letter.isPublic())); } } diff --git a/src/main/java/com/neighbors/tohero/domain/domain/mainPage/service/GetLetter.java b/src/main/java/com/neighbors/tohero/domain/domain/mainPage/service/GetLetter.java index 9f6b6a6..9d4cf32 100644 --- a/src/main/java/com/neighbors/tohero/domain/domain/mainPage/service/GetLetter.java +++ b/src/main/java/com/neighbors/tohero/domain/domain/mainPage/service/GetLetter.java @@ -23,7 +23,7 @@ public List getPageableLetter(Pageable pageable){ } public Letter getLetterById(long letterId){ - return letterRepository.getLetter(repo -> repo.findByIdAndPublic(letterId)); + return letterRepository.getLetter(repo -> repo.findById(letterId)); } public List getMyLetters(long userId){ diff --git a/src/main/java/com/neighbors/tohero/infrastructure/repository/LetterEntityRepository.java b/src/main/java/com/neighbors/tohero/infrastructure/repository/LetterEntityRepository.java index b77d3b5..d8b66d4 100644 --- a/src/main/java/com/neighbors/tohero/infrastructure/repository/LetterEntityRepository.java +++ b/src/main/java/com/neighbors/tohero/infrastructure/repository/LetterEntityRepository.java @@ -24,8 +24,8 @@ public interface LetterEntityRepository extends JpaRepository> findAllByUserId(@Param("userId") Long userId); - @Query("SELECT le FROM LetterEntity le WHERE le.letterId = :letterId AND le.isPublic = true") - Optional findByIdAndPublic(@Param("letterId") long letterId); + @Query("SELECT le FROM LetterEntity le WHERE le.letterId = :letterId") + Optional findById(@Param("letterId") long letterId); @Modifying @Query("UPDATE LetterEntity le SET le.isPublic = :isPublic WHERE le.user.userId = :userId AND le.letterId = :letterId")