Merge pull request #50 from UMC-Blism/refactor-37-nuchan

[fix] #37 편지 조회 API 간 LetterResponseDTO 값 추가 (door, color, decoration)
UMC-Blism · Dec 22, 2024 · 2ebb8e1 · 2ebb8e1
2 parents 1691c37 + 5beeb30
commit 2ebb8e1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/src/main/java/com/example/blism/controller/LetterController.java b/src/main/java/com/example/blism/controller/LetterController.java
@@ -163,6 +163,9 @@ public ResponseEntity<ApiResponse> getLetters(@PathVariable Long letterId) {
                 .content(letter.getContent())
                 .photoUrl(letter.getPhotoUrl())
                 .font(letter.getFont())
+                .doorDesign(letter.getDoorNum())
+                .colorDesign(letter.getColorNum())
+                .decorationDesign(letter.getDecorationNum())
                 .senderId(letter.getSender().getId())
                 .senderNickname(letter.getSender().getNickname())
                 .receiverId(letter.getReceiver().getId())

diff --git a/src/main/java/com/example/blism/dto/response/LetterResponseDTO.java b/src/main/java/com/example/blism/dto/response/LetterResponseDTO.java
@@ -17,6 +17,9 @@ public class LetterResponseDTO {
     private String content;
     private String photoUrl;
     private Integer font;
+    private Integer doorDesign;
+    private Integer colorDesign;
+    private Integer decorationDesign;
     private Integer visibility;
     private LocalDateTime createdAt;
 }
diff --git a/src/main/java/com/example/blism/service/LetterService.java b/src/main/java/com/example/blism/service/LetterService.java
@@ -47,17 +47,17 @@ public String createLetter(MultipartFile image, CreateLetterRequestDTO dto) {
 
         String photoUrl = s3Service.upload(image);
 
-        Letter letter = Letter.builder()
-                .sender(sender.get())
-                .receiver(receiver.get())
-                .mailbox(mailbox.get())
-                .doorNum(dto.getDoorDesign())
-                .colorNum(dto.getColorDesign())
-                .decorationNum(dto.getDecorationDesign())
-                .photoUrl(photoUrl)
-                .content(dto.getContent())
-                .font(dto.getFont())
-                .visibility(dto.getVisibility())
+                        Letter letter = Letter.builder()
+                                .sender(sender.get())
+                                .receiver(receiver.get())
+                                .mailbox(mailbox.get())
+                                .doorNum(dto.getDoorDesign())
+                                .colorNum(dto.getColorDesign())
+                                .decorationNum(dto.getDecorationDesign())
+                                .photoUrl(photoUrl)
+                                .content(dto.getContent())
+                                .font(dto.getFont())
+                                .visibility(dto.getVisibility())
                 .build();
 
         letterRepository.save(letter);
@@ -78,6 +78,9 @@ public List<LetterResponseDTO> getSentLetters(Long userId) {
                         .content(letter.getContent())
                         .photoUrl(letter.getPhotoUrl())
                         .font(letter.getFont())
+                        .doorDesign(letter.getDoorNum())
+                        .colorDesign(letter.getColorNum())
+                        .decorationDesign(letter.getDecorationNum())
                         .senderId(letter.getSender().getId())
                         .senderNickname(letter.getSender().getNickname())
                         .receiverId(letter.getReceiver().getId())
@@ -97,6 +100,9 @@ public List<LetterResponseDTO> getReceivedLetters(Long userId) {
                         .content(letter.getContent())
                         .photoUrl(letter.getPhotoUrl())
                         .font(letter.getFont())
+                        .doorDesign(letter.getDoorNum())
+                        .colorDesign(letter.getColorNum())
+                        .decorationDesign(letter.getDecorationNum())
                         .senderId(letter.getSender().getId())
                         .senderNickname(letter.getSender().getNickname())
                         .receiverId(letter.getReceiver().getId())