Skip to content
Merged
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 @@ -222,17 +222,34 @@ private List<EventResponse.GroupPostsResponse.CommentInfo> convertComments(
Member currentUser
) {
return comments.stream()
.map(c -> EventResponse.GroupPostsResponse.CommentInfo.builder()
.commentId(c.getCommentId())
.content(c.getContent())
.writerNickname(c.getMember().getNickname())
.writerProfileUrl(c.getMember().getProfileImageUrl())
.createdAt(c.getCreatedAt())
.isMine(c.getMember().getId().equals(currentUser.getId()))
.build())
.map(c -> {
Member commenter = c.getMember();

// 댓글 작성자의 이벤트 내 닉네임 조회
MemberEvent me = memberEventRepository
.findByMemberAndEventAndIsDeletedFalse(
commenter,
c.getPost().getGroup().getEvent()
)
.orElse(null);

String writerNickname = (me != null)
? me.getNickname() // 이벤트 닉네임
: commenter.getNickname(); // fallback: 전역 닉네임

return EventResponse.GroupPostsResponse.CommentInfo.builder()
.commentId(c.getCommentId())
.content(c.getContent())
.writerNickname(writerNickname)
.writerProfileUrl(commenter.getProfileImageUrl())
.createdAt(c.getCreatedAt())
.isMine(c.getMember().getId().equals(currentUser.getId()))
.build();
})
.toList();
}


public EventResponse.JoinResponse toJoinResponse(Event event, MemberEvent memberEvent) {

List<EventResponse.JoinResponse.GroupInfo> groupInfos =
Expand Down