Skip to content

Commit 3c0094f

Browse files
authored
Merge pull request #41 from FlipNoteTeam/fix/get-invitations
Fix: 보낸 초대 목록 조회 오류 수정
2 parents 90f3480 + 39cb389 commit 3c0094f

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

‎src/main/java/flipnote/group/application/service/FindInviteService.java‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,15 @@ public PagingResponseDto<InviteInfo> findOutgoingInvites(FindOutgoingInviteComma
6767
}
6868

6969
Map<Long, String> finalIdAndNicknames = idAndNicknames;
70-
Page<InviteInfo> res = invitePage.map(invite -> InviteInfo.of(
71-
invite,
72-
finalIdAndNicknames.getOrDefault(invite.getInviteeUserId(), "")
73-
));
70+
Page<InviteInfo> res = invitePage.map(invite -> {
71+
String nickname;
72+
if (invite.getInviteeUserId() == null) {
73+
nickname = invite.getInviteeEmail();
74+
} else {
75+
nickname = finalIdAndNicknames.getOrDefault(invite.getInviteeUserId(), "");
76+
}
77+
return InviteInfo.of(invite, nickname);
78+
});
7479

7580
return PagingResponseDto.from(res);
7681
}

0 commit comments

Comments
 (0)