From a23cd25e5d2c9babe82cf6cc7e56eaf754e2cec8 Mon Sep 17 00:00:00 2001 From: imscow11253 Date: Sun, 19 Jan 2025 04:43:31 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat=20:=20=EA=B3=B5=EA=B0=9C=EB=90=9C=20?= =?UTF-8?q?=ED=8E=B8=EC=A7=80=EA=B0=80=20=EC=95=84=EB=8B=88=EB=8D=94?= =?UTF-8?q?=EB=9D=BC=EB=8F=84=20=EB=82=B4=EA=B0=80=20=EC=9E=91=EC=84=B1?= =?UTF-8?q?=ED=95=9C=20=ED=8E=B8=EC=A7=80=EC=97=90=20=ED=95=9C=ED=95=B4?= =?UTF-8?q?=EC=84=9C=20=EC=83=81=EC=84=B8=EB=B3=B4=EA=B8=B0=20=EA=B0=80?= =?UTF-8?q?=EB=8A=A5=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tohero/domain/domain/mainPage/service/GetLetter.java | 2 +- .../infrastructure/repository/LetterEntityRepository.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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") From 4a53add25704f49b241d64551e09ce55d6862964 Mon Sep 17 00:00:00 2001 From: imscow11253 Date: Sun, 19 Jan 2025 04:46:17 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat=20:=20=ED=8E=B8=EC=A7=80=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=EB=B3=B4=EA=B8=B0=20=EC=97=B4=EB=9E=8C=20=EC=97=AC?= =?UTF-8?q?=EB=B6=80,=20=EA=B3=B5=EA=B0=9C=20=EC=97=AC=EB=B6=80=20DTO=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/letter/dto/GetLetterDetailResponse.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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())); } }