Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ public InboxNextResponse toResponse(PlazaLetter letter) {
public PlazaReceivedReplyResDto toReceivedReplyDto(
PlazaLetter letter,
PlazaLetterReply reply,
boolean reported
boolean reported,
String fromLabel
) {
return PlazaReceivedReplyResDto.builder()
.letterId(letter.getLetterId())
Expand All @@ -71,7 +72,7 @@ public PlazaReceivedReplyResDto toReceivedReplyDto(
.reported(reported)

.mode(letter.getMode())
.fromLabel(letter.getFromLabel())
.fromLabel(fromLabel)
.backgroundColor(letter.getBackgroundColor().name())

.build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.example.egobook_be.domain.letters.dto.response.*;
import com.example.egobook_be.domain.letters.entity.PlazaLetter;
import com.example.egobook_be.domain.letters.entity.PlazaLetterMode;
import com.example.egobook_be.domain.letters.entity.PlazaLetterReply;
import com.example.egobook_be.domain.letters.enums.LettersErrorCode;
import com.example.egobook_be.domain.letters.mapper.PlazaLetterMapper;
Expand All @@ -16,6 +17,8 @@
import org.springframework.data.domain.*;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Map;
import java.util.stream.Collectors;

import java.util.List;

Expand All @@ -30,6 +33,7 @@ public class PlazaLetterQueryService {
private final PlazaLetterReplyRepository plazaLetterReplyRepository;
private final PlazaLetterReplyReportRepository replyReportRepository;
private final PlazaLetterMapper plazaLetterMapper;
private final UserRepository userRepository;


@Transactional(readOnly = true)
Expand Down Expand Up @@ -83,15 +87,38 @@ public SliceResponse<PlazaReceivedReplyResDto> getRepliesToMyLetters(
? java.util.Collections.emptySet()
: new java.util.HashSet<>(replyReportRepository.findReportedReplyIds(userId, replyIds));

// 3. DTO 변환
// 3) N+1 방지: 답장 작성자(replierId)들 한 번에 조회
List<Long> replierIds = slice.getContent().stream()
.map(PlazaLetterReply::getReplierId)
.distinct()
.toList();

java.util.Map<Long, String> replierNicknameMap = replierIds.isEmpty()
? java.util.Collections.emptyMap()
: userRepository.findAllById(replierIds).stream()
.collect(java.util.stream.Collectors.toMap(
User::getId,
user -> {
String nickname = user.getNickname();
return (nickname == null || nickname.isBlank()) ? "친구" : nickname;
}
));

// 4) DTO 변환
return SliceResponse.of(slice, reply -> {
PlazaLetter letter = reply.getLetter();
if (letter == null) {
throw new CustomException(LettersErrorCode.LETTER_NOT_FOUND);
}

boolean reported = reportedSet.contains(reply.getReplyId());
return plazaLetterMapper.toReceivedReplyDto(letter, reply, reported);

String fromLabel = "익명";
if (letter.getMode() == PlazaLetterMode.FRIEND) {
fromLabel = replierNicknameMap.getOrDefault(reply.getReplierId(), "친구");
}

return plazaLetterMapper.toReceivedReplyDto(letter, reply, reported, fromLabel);
});
}

Expand Down
Loading