Skip to content

fix: 채팅방 목록 조회 시 닉네임 미설정 상대방 nickname null 응답 수정 #2418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dnjswldnd-3513 merged 2 commits into from
Sep 9, 2026
Merged

fix: 채팅방 목록 조회 시 닉네임 미설정 상대방 nickname null 응답 수정 #2418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1987595
fix: 채팅방 목록 조회 시 닉네임 미설정 상대방 nickname null 응답 수정
dnjswldnd-3513 Sep 9, 2026
fa5fe33
Merge branch 'develop' into fix/2416-chat-room-counterpart-nickname-null
dnjswldnd-3513 Sep 9, 2026
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
4 changes: 2 additions & 2 deletions ...in/koreatech/koin/domain/teamrecruitment/dto/TeamRecruitmentChatRoomListItemResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ public static TeamRecruitmentChatRoomListItemResponse of(
return new TeamRecruitmentChatRoomListItemResponse(
chatRoom.getRecruitment().getId(),
chatRoom.getId(),
direct && counterpart != null ? counterpart.getNickname() : chatRoom.getRecruitment().getTitle(),
direct && counterpart != null ? counterpart.getDisplayNickname() : chatRoom.getRecruitment().getTitle(),
chatRoom.getRoomType().name(),
chatRoom.getStatus().name(),
direct && counterpart != null ? counterpart.getId() : null,
direct && counterpart != null ? counterpart.getNickname() : null,
direct && counterpart != null ? counterpart.getDisplayNickname() : null,
lastMessage == null ? null : lastMessage.getId(),
lastMessage == null ? null : lastMessage.getContent(),
lastMessage == null ? null : lastMessage.getCreatedAt(),
Expand Down
35 changes: 34 additions & 1 deletion ...in/koreatech/koin/unit/domain/teamrecruitment/service/TeamRecruitmentChatServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ void setUpClock() {
TeamRecruitmentChatRoomListItemResponse::lastMessageId,
TeamRecruitmentChatRoomListItemResponse::unreadMessageCount
)
.containsExactly(counterpart.getNickname(), OTHER_USER_ID, counterpart.getNickname(), 101, 0);
.containsExactly(counterpart.getDisplayNickname(), OTHER_USER_ID, counterpart.getDisplayNickname(), 101, 0);
assertThat(responses.get(1))
.extracting(
TeamRecruitmentChatRoomListItemResponse::roomName,
Expand All @@ -228,6 +228,39 @@ void setUpClock() {
verifyNoInteractions(messageRepository);
}

@Test
void 닉네임_미설정_사용자가_상대방인_DIRECT_채팅방_목록_조회시_counterpartNickname이_null이_아니다() {
TeamRecruitment recruitment = mock(TeamRecruitment.class);
TeamRecruitmentChatRoom directRoom = mock(TeamRecruitmentChatRoom.class);
TeamRecruitmentChatMember currentMember = mock(TeamRecruitmentChatMember.class);
TeamRecruitmentChatMember counterpartMember = mock(TeamRecruitmentChatMember.class);
User currentUser = UserFixture.id_설정_코인_유저(USER_ID);
User anonymousCounterpart = UserFixture.닉네임_없는_코인_유저(OTHER_USER_ID);

when(currentMember.getChatRoom()).thenReturn(directRoom);
when(currentMember.getUser()).thenReturn(currentUser);
when(directRoom.getId()).thenReturn(21);
when(directRoom.getRecruitment()).thenReturn(recruitment);
when(directRoom.getRoomType()).thenReturn(TeamRecruitmentChatRoomType.DIRECT);
when(directRoom.getStatus()).thenReturn(TeamRecruitmentChatRoomStatus.ACTIVE);
when(counterpartMember.getChatRoom()).thenReturn(directRoom);
when(counterpartMember.getUser()).thenReturn(anonymousCounterpart);
when(recruitment.getId()).thenReturn(RECRUITMENT_ID);
when(memberRepository.findAllByUserIdWithChatRoomAndRecruitment(USER_ID))
.thenReturn(List.of(currentMember));
when(memberRepository.findAllWithUsersByChatRoomIds(List.of(21)))
.thenReturn(List.of(currentMember, counterpartMember));
when(messageRepository.findLatestByChatRoomIds(List.of(21))).thenReturn(List.of());
when(messageRepository.countUnreadMessagesByUserId(USER_ID)).thenReturn(List.of());

List<TeamRecruitmentChatRoomListItemResponse> responses = chatService.getChatRooms(USER_ID);

assertThat(responses).hasSize(1);
assertThat(responses.get(0).roomName()).isEqualTo(anonymousCounterpart.getDisplayNickname());
assertThat(responses.get(0).counterpartNickname()).isEqualTo(anonymousCounterpart.getDisplayNickname());
assertThat(responses.get(0).counterpartNickname()).isNotNull();
}

@Test
void GENERAL_TEAM_채팅방에_작성자만_있으면_인원은_2명_중_1명이다() {
ChatRoomResponse response = getChatRoom(
Expand Down
Loading