Skip to content

Commit fa73b9e

Browse files
refactor: 이전편지 조회 로직 수정, 내 편지함 로직 수정 (WR9-116)
- 이전 편지 조회 시 이전편지의 작성자 응답값으로 수정 - 차단된 편지도 보이도록 수정
1 parent 6e2203d commit fa73b9e

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ public static LetterResponse fromEntity(Letter letter, String zipCode) {
7676
}
7777

7878
//이전편지 변환
79-
public static LetterResponse fromEntityForPreviousLetters(Letter letter, String zipCode, Long myId, Long matchingId) {
79+
public static LetterResponse fromEntityForPreviousLetters(Letter letter, String zipCode, Long matchingId) {
8080
return LetterResponse.builder()
8181
.letterId(letter.getId()) //이전 편지의 정보들
8282
.zipCode(zipCode)
8383
.title(letter.getTitle())
8484
.content(letter.getContent())
8585
.category(letter.getCategory())
86-
.memberId(myId) //편지를 쓴 자기 자신의 id -> 이전 편지의 정보가 아님~!
86+
.memberId(letter.getWriterId()) //이전 편지를 쓴 사용자
8787
.matchingId(matchingId)
8888
.build();
8989
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public interface LetterMatchingRepository extends JpaRepository<LetterMatching,
4343
"FROM LetterMatching lm " +
4444
"LEFT JOIN Letter l ON lm.id = l.matchingId AND l.status = 'DELIVERED' AND l.isActive = true " +
4545
"JOIN Member m ON (CASE WHEN lm.firstMemberId = :myId THEN lm.secondMemberId ELSE lm.firstMemberId END) = m.id " +
46-
"WHERE (lm.firstMemberId = :myId OR lm.secondMemberId = :myId) AND lm.isActive = true " +
46+
"WHERE (lm.firstMemberId = :myId OR lm.secondMemberId = :myId) " +
4747
"GROUP BY lm.id, m.zipCode, lm.isActive " +
4848
"ORDER BY lm.id DESC")
4949
List<MailboxResponse> findMailboxDetails(@Param("myId") Long myId);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public List<LetterResponse> getPreviousLetters(Long letterId) {
115115

116116
if(parentLetterId == null){
117117
String zipCode = memberRepository.findById(letter.getWriterId()).orElseThrow(MemberNotFoundException::new).getZipCode();
118-
LetterResponse response = LetterResponse.fromEntityForPreviousLetters(letter,zipCode,myId, null);
118+
LetterResponse response = LetterResponse.fromEntityForPreviousLetters(letter, zipCode, null);
119119
return List.of(response);
120120

121121
}else{
@@ -131,7 +131,7 @@ public List<LetterResponse> getPreviousLetters(Long letterId) {
131131
for (Letter findLetter : lettersByParentId) {
132132
if(findLetter.getStatus().equals(Status.DELIVERED)){
133133
String zipCode = memberRepository.findById(findLetter.getWriterId()).orElseThrow(MemberNotFoundException::new).getZipCode();
134-
LetterResponse response = LetterResponse.fromEntityForPreviousLetters(findLetter,zipCode, myId, letterMatching.getId());
134+
LetterResponse response = LetterResponse.fromEntityForPreviousLetters(findLetter, zipCode, letterMatching.getId());
135135
responses.add(response);
136136
}
137137
}

0 commit comments

Comments
 (0)