Merge pull request #210 from prgrms-web-devcourse-final-project/develop

CI-CD
prgrms-web-devcourse-final-project · Dec 9, 2024 · ce0377c · ce0377c
2 parents ed89acd + 6137603
commit ce0377c
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 4 deletions.
diff --git a/src/main/java/postman/bottler/letter/controller/ReplyLetterController.java b/src/main/java/postman/bottler/letter/controller/ReplyLetterController.java
@@ -21,6 +21,7 @@
 import postman.bottler.letter.dto.request.ReplyLetterDeleteRequestDTO;
 import postman.bottler.letter.dto.request.ReplyLetterRequestDTO;
 import postman.bottler.letter.dto.response.PageResponseDTO;
+import postman.bottler.letter.dto.response.ReplyLetterDetailResponseDTO;
 import postman.bottler.letter.dto.response.ReplyLetterHeadersResponseDTO;
 import postman.bottler.letter.dto.response.ReplyLetterResponseDTO;
 import postman.bottler.letter.exception.InvalidPageRequestException;
@@ -84,12 +85,13 @@ public ApiResponse<PageResponseDTO<ReplyLetterHeadersResponseDTO>> getReplyForLe
             description = "지정된 답장 편지의 ID에 대한 상세 정보를 반환합니다."
     )
     @GetMapping("/detail/{replyLetterId}")
-    public ApiResponse<ReplyLetterResponseDTO> getReplyLetter(
+    public ApiResponse<ReplyLetterDetailResponseDTO> getReplyLetter(
             @PathVariable Long replyLetterId,
             @AuthenticationPrincipal CustomUserDetails userDetails
     ) {
         letterBoxService.validateLetterInUserBox(replyLetterId, userDetails.getUserId());
-        ReplyLetterResponseDTO result = letterReplyService.getReplyLetterDetail(replyLetterId);
+        ReplyLetterDetailResponseDTO result = letterReplyService.getReplyLetterDetail(replyLetterId,
+                userDetails.getUserId());
         return ApiResponse.onSuccess(result);
     }
 

diff --git a/src/main/java/postman/bottler/letter/dto/response/ReplyLetterDetailResponseDTO.java b/src/main/java/postman/bottler/letter/dto/response/ReplyLetterDetailResponseDTO.java
@@ -0,0 +1,26 @@
+package postman.bottler.letter.dto.response;
+
+import java.time.LocalDateTime;
+import postman.bottler.letter.domain.ReplyLetter;
+
+public record ReplyLetterDetailResponseDTO(
+        Long replyLetterId,
+        String content,
+        String font,
+        String paper,
+        String label,
+        boolean isReplied,
+        LocalDateTime createdAt
+) {
+    public static ReplyLetterDetailResponseDTO from(ReplyLetter replyLetter, boolean isReplied) {
+        return new ReplyLetterDetailResponseDTO(
+                replyLetter.getId(),
+                replyLetter.getContent(),
+                replyLetter.getFont(),
+                replyLetter.getPaper(),
+                replyLetter.getLabel(),
+                isReplied,
+                replyLetter.getCreatedAt()
+        );
+    }
+}
diff --git a/src/main/java/postman/bottler/letter/infra/ReplyLetterJpaRepository.java b/src/main/java/postman/bottler/letter/infra/ReplyLetterJpaRepository.java
@@ -26,4 +26,6 @@ public interface ReplyLetterJpaRepository extends JpaRepository<ReplyLetterEntit
     void blockById(Long id);
 
     boolean existsByLetterIdAndSenderId(Long letterId, Long senderId);
+
+    boolean existsByIdAndSenderId(Long id, Long senderId);
 }
diff --git a/src/main/java/postman/bottler/letter/infra/ReplyLetterRepositoryImpl.java b/src/main/java/postman/bottler/letter/infra/ReplyLetterRepositoryImpl.java
@@ -50,4 +50,9 @@ public void blockReplyLetterById(Long replyLetterId) {
     public boolean existsByLetterIdAndSenderId(Long letterId, Long senderId) {
         return replyLetterJpaRepository.existsByLetterIdAndSenderId(letterId, senderId);
     }
+
+    @Override
+    public boolean existsByIdAndSenderId(Long replyLetterId, Long userId) {
+        return replyLetterJpaRepository.existsByIdAndSenderId(replyLetterId, userId);
+    }
 }
diff --git a/src/main/java/postman/bottler/letter/service/ReplyLetterRepository.java b/src/main/java/postman/bottler/letter/service/ReplyLetterRepository.java
@@ -18,4 +18,6 @@ public interface ReplyLetterRepository {
     void blockReplyLetterById(Long replyLetterId);
 
     boolean existsByLetterIdAndSenderId(Long letterId, Long senderId);
+
+    boolean existsByIdAndSenderId(Long replyLetterId, Long userId);
 }
diff --git a/src/main/java/postman/bottler/letter/service/ReplyLetterService.java b/src/main/java/postman/bottler/letter/service/ReplyLetterService.java
@@ -16,6 +16,7 @@
 import postman.bottler.letter.dto.ReceiverDTO;
 import postman.bottler.letter.dto.request.PageRequestDTO;
 import postman.bottler.letter.dto.request.ReplyLetterRequestDTO;
+import postman.bottler.letter.dto.response.ReplyLetterDetailResponseDTO;
 import postman.bottler.letter.dto.response.ReplyLetterHeadersResponseDTO;
 import postman.bottler.letter.dto.response.ReplyLetterResponseDTO;
 import postman.bottler.letter.exception.DuplicateReplyLetterException;
@@ -81,9 +82,10 @@ public Page<ReplyLetterHeadersResponseDTO> getReplyLetterHeadersById(
     }
 
     @Transactional(readOnly = true)
-    public ReplyLetterResponseDTO getReplyLetterDetail(Long replyLetterId) {
+    public ReplyLetterDetailResponseDTO getReplyLetterDetail(Long replyLetterId, Long userId) {
+        boolean isReplied = replyLetterRepository.existsByIdAndSenderId(replyLetterId, userId);
         ReplyLetter replyLetter = findReplyLetter(replyLetterId);
-        return ReplyLetterResponseDTO.from(replyLetter);
+        return ReplyLetterDetailResponseDTO.from(replyLetter, isReplied);
     }
 
     @Transactional