Merge pull request #194 from prgrms-web-devcourse-final-project/refactor/refactor-letter-retrieval(WR9-116)

refactor: 이전편지 조회 로직 수정, 내 편지함 로직 수정 (WR9-116)

Author: Kojinyoung7220

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

@@ -76,14 +76,14 @@ public static LetterResponse fromEntity(Letter letter, String zipCode) {
     }
 
     //이전편지 변환
-    public static LetterResponse fromEntityForPreviousLetters(Letter letter, String zipCode, Long myId, Long matchingId) {
+    public static LetterResponse fromEntityForPreviousLetters(Letter letter, String zipCode, Long matchingId) {
         return LetterResponse.builder()
                 .letterId(letter.getId()) //이전 편지의 정보들
                 .zipCode(zipCode)
                 .title(letter.getTitle())
                 .content(letter.getContent())
                 .category(letter.getCategory())
-                .memberId(myId)         //편지를 쓴 자기 자신의 id -> 이전 편지의 정보가 아님~!
+                .memberId(letter.getWriterId()) //이전 편지를 쓴 사용자
                 .matchingId(matchingId)
                 .build();
     }

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

@@ -43,7 +43,7 @@ public interface LetterMatchingRepository extends JpaRepository<LetterMatching,
             "FROM LetterMatching lm " +
             "LEFT JOIN Letter l ON lm.id = l.matchingId AND l.status = 'DELIVERED' AND l.isActive = true " +
             "JOIN Member m ON (CASE WHEN lm.firstMemberId = :myId THEN lm.secondMemberId ELSE lm.firstMemberId END) = m.id " +
-            "WHERE (lm.firstMemberId = :myId OR lm.secondMemberId = :myId) AND lm.isActive = true " +
+            "WHERE (lm.firstMemberId = :myId OR lm.secondMemberId = :myId) " +
             "GROUP BY lm.id, m.zipCode, lm.isActive " +
             "ORDER BY lm.id DESC")
     List<MailboxResponse> findMailboxDetails(@Param("myId") Long myId);

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

@@ -115,7 +115,7 @@ public List<LetterResponse> getPreviousLetters(Long letterId) {
 
         if(parentLetterId == null){
             String zipCode = memberRepository.findById(letter.getWriterId()).orElseThrow(MemberNotFoundException::new).getZipCode();
-            LetterResponse response = LetterResponse.fromEntityForPreviousLetters(letter,zipCode,myId, null);
+            LetterResponse response = LetterResponse.fromEntityForPreviousLetters(letter, zipCode, null);
             return List.of(response);
 
         }else{
@@ -131,7 +131,7 @@ public List<LetterResponse> getPreviousLetters(Long letterId) {
             for (Letter findLetter : lettersByParentId) {
                 if(findLetter.getStatus().equals(Status.DELIVERED)){
                     String zipCode = memberRepository.findById(findLetter.getWriterId()).orElseThrow(MemberNotFoundException::new).getZipCode();
-                    LetterResponse response = LetterResponse.fromEntityForPreviousLetters(findLetter,zipCode, myId, letterMatching.getId());
+                    LetterResponse response = LetterResponse.fromEntityForPreviousLetters(findLetter, zipCode, letterMatching.getId());
                     responses.add(response);
                 }
             }