refactor: 임시 편지 조회 시 응답값 변경, 스케줄링 중복키 에러 해결 (WR9-125)

Author: Kojinyoung7220

src/main/java/io/crops/warmletter/domain/letter/dto/response/LetterDraftResponse.java

@@ -3,28 +3,22 @@
 import io.crops.warmletter.domain.letter.enums.Category;
 import io.crops.warmletter.domain.letter.enums.FontType;
 import io.crops.warmletter.domain.letter.enums.PaperType;
-import io.crops.warmletter.domain.letter.enums.Status;
 import lombok.*;
 
-import java.time.LocalDateTime;
 
 @Getter
 @Builder
 @AllArgsConstructor
 public class LetterDraftResponse {
 
     private final Long letterId;
-    private final Long writerId;
+    private final Long matchingId;
     private final Long receiverId;
     private final Long parentLetterId;
     private final String title;
     private final String content;
     private final Category category;
     private final PaperType paperType;
     private final FontType fontType;
-    private final Status status;
-    private final LocalDateTime deliveryStartedAt;
-    private final LocalDateTime deliveryCompletedAt;
-    private final Long matchingId;
 
 }

src/main/java/io/crops/warmletter/domain/letter/dto/response/LetterResponse.java

@@ -115,22 +115,17 @@ public static LetterResponse fromDeliveryLetter(Letter letter) {
     }
 
     // 임시 저장(draft) 변환 메서드 추가
-    public static LetterResponse fromDraftLetter(LetterDraftResponse draft, String zipCode) {
+    public static LetterResponse fromDraftLetter(LetterDraftResponse draft) {
         return builder()
                 .letterId(draft.getLetterId())
-                .writerId(draft.getWriterId())
+                .matchingId(draft.getMatchingId())
                 .receiverId(draft.getReceiverId())
                 .parentLetterId(draft.getParentLetterId())
-                .zipCode(zipCode)
                 .title(draft.getTitle())
                 .content(draft.getContent())
                 .category(draft.getCategory())
                 .paperType(draft.getPaperType())
                 .fontType(draft.getFontType())
-                .status(draft.getStatus())
-                .deliveryStartedAt(draft.getDeliveryStartedAt())
-                .deliveryCompletedAt(draft.getDeliveryCompletedAt())
-                .matchingId(draft.getMatchingId())
                 .build();
     }
 }

src/main/java/io/crops/warmletter/domain/letter/repository/LetterRepository.java

@@ -52,18 +52,14 @@ Page<Letter> findDeliveredOrMyLettersByMatchingId(
 
     @Query("SELECT new io.crops.warmletter.domain.letter.dto.response.LetterDraftResponse(" +
             "l.id, " +
-            "l.writerId, " +
+            "l.matchingId, " +
             "l.receiverId, " +
             "l.parentLetterId, " +
             "l.title, " +
             "l.content, " +
             "l.category, " +
             "l.paperType, " +
-            "l.fontType, " +
-            "l.status, " +
-            "l.deliveryStartedAt, " +
-            "l.deliveryCompletedAt, " +
-            "l.matchingId) " +
+            "l.fontType) " +
             "FROM Letter l LEFT JOIN LetterMatching m ON l.matchingId = m.id " +
             "WHERE l.writerId = :writerId AND l.status = :status")
     List<LetterDraftResponse> findDraftLettersWithMatching(@Param("writerId") Long writerId,

src/main/java/io/crops/warmletter/domain/letter/service/LetterService.java

@@ -73,21 +73,21 @@ public LetterResponse createLetter(CreateLetterRequest request) {
             //부모편지 조회
             Letter parentLetter = letterRepository.findById(request.getParentLetterId()).orElseThrow(ParentLetterNotFoundException::new);
 
-//            Long matchingId = request.getMatchingId() != null ? request.getMatchingId() : parentLetter.getMatchingId(); 만약을 위해..
+            Long matchingId = request.getMatchingId() != null ? request.getMatchingId() : parentLetter.getMatchingId();
 
             //현재 계속 주고 받을 수 있는 상황이면 답장 가능
-            boolean active = letterMatchingRepository.findById(request.getMatchingId()).orElseThrow(MatchingNotFoundException::new).isActive();
+            boolean active = letterMatchingRepository.findById(matchingId).orElseThrow(MatchingNotFoundException::new).isActive();
 
             if (active) {
                 builder.receiverId(request.getReceiverId())
                         .parentLetterId(request.getParentLetterId())
                         .letterType(LetterType.DIRECT)
                         .status(Status.IN_DELIVERY)
-                        .matchingId(request.getMatchingId());
+                        .matchingId(matchingId);
 
                 //첫편지면 matchingId 넣어줌 , 받는사람도 넣어줌.
                 if(parentLetter.getParentLetterId() == null) {
-                    parentLetter.updateMatchingId(request.getMatchingId());
+                    parentLetter.updateMatchingId(matchingId);
                     parentLetter.updateReceiverId(writerId);
                     parentLetter.updateLetterType(LetterType.DIRECT);
                     parentLetter.updateIsRead(true);
@@ -247,7 +247,7 @@ public List<LetterResponse> getLettersByStatus(String status) {
             // 임시 저장 편지이면서 상태가 SAVED인 편지 조회 (작성자 기준)
             return letterRepository.findDraftLettersWithMatching(currentUserId, Status.SAVED)
                     .stream()
-                    .map(draft -> LetterResponse.fromDraftLetter(draft, authFacade.getZipCode()))
+                    .map(LetterResponse::fromDraftLetter)
                     .collect(Collectors.toList());
         } else {
             throw new BusinessException(INVALID_INPUT_VALUE);

src/main/java/io/crops/warmletter/global/schedule/DeliverySchedule.java

@@ -41,7 +41,11 @@ public void processDeliveryCompletion() {
         // lettersToComplete 조건을 만족하는 편지를 보낸 사람의 zipCode 조회
         List<LetterAlarmResponse> zipCodeData = letterRepository.findZipCodeByLettersToComplete(now);
         Map<Long, String> senderZipCodes = zipCodeData.stream()
-                .collect(Collectors.toMap(LetterAlarmResponse::getWriterId, LetterAlarmResponse::getZipCode));
+                .collect(Collectors.toMap(
+                        LetterAlarmResponse::getWriterId,
+                        LetterAlarmResponse::getZipCode,
+                        (existingZipCode, newZipCode) -> existingZipCode  // 중복 키 발생 시 기존 값 사용
+                ));
 
         if (!lettersToComplete.isEmpty()) {
             log.info("배송 완료 처리할 편지 수: {}", lettersToComplete.size());

src/test/java/io/crops/warmletter/domain/letter/service/LetterServiceTest.java

@@ -1232,17 +1232,13 @@ void findDraftLetters() throws Exception {
         Long currentUserId = 1L;
         LetterDraftResponse letterDraftResponse = LetterDraftResponse.builder()
                 .letterId(200L)
-                .writerId(currentUserId)
                 .receiverId(2L)
                 .parentLetterId(50L)
                 .title("제목")
                 .content("내용")
                 .category(Category.CONSULT)
                 .paperType(PaperType.COMFORT)
                 .fontType(FontType.HIMCHAN)
-                .status(Status.SAVED)
-                .deliveryStartedAt(LocalDateTime.now())
-                .deliveryCompletedAt(LocalDateTime.now().plusHours(1))
                 .matchingId(300L)
                 .build();
         List<LetterDraftResponse> letterDraftResponses = Collections.singletonList(letterDraftResponse);