Skip to content

[fix/#512] 초기 채팅방 조회 및 과거 메시지 조회 API에 송신자 탈퇴 여부 필드 추가 #514

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
Dimo-2562 merged 7 commits into from
Mar 3, 2026
+1,559 −12
Merged

[fix/#512] 초기 채팅방 조회 및 과거 메시지 조회 API에 송신자 탈퇴 여부 필드 추가 #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a8a7698
fix: 초기 채팅방 조회 및 과거 메시지 조회 API에 송신자 탈퇴 여부 필드 추가
Dimo-2562 Mar 3, 2026
8ddf5f3
improve: 기존 리스트가 불변일 수 있으므로 ArrayList를 새로 생성하여 reverse 하도록 변경
Dimo-2562 Mar 3, 2026
a5bb8cb
test: 초기 채팅방 조회 API - getChatRoomDetail 단위 테스트 작성
Dimo-2562 Mar 3, 2026
834967f
test: 초기 채팅방 조회 API - generateProfileImageUrl, generateImageUrl, proc…
Dimo-2562 Mar 3, 2026
f11daf1
test: 초기 채팅방 조회 API - 통합 테스트 작성
Dimo-2562 Mar 3, 2026
6a3462e
test: 과거 메시지 조회 API - getChatMessages 단위 테스트 작성
Dimo-2562 Mar 3, 2026
0e543a8
test: 과거 메시지 조회 API - 통합 테스트 작성
Dimo-2562 Mar 3, 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: 3 additions & 1 deletion src/main/java/umc/cockple/demo/domain/chat/converter/ChatConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,15 @@ public ChatCommonDTO.MessageInfo toCommonMessageInfo(
ChatMessage message,
String senderProfileImageUrl,
List<ChatCommonDTO.ImageInfo> processedImages,
boolean isMyMessage) {
boolean isMyMessage,
boolean isSenderWithdrawn) {

return ChatCommonDTO.MessageInfo.builder()
.messageId(message.getId())
.senderId(message.getSender().getId())
.senderName(message.getSender().getMemberName())
.senderProfileImageUrl(senderProfileImageUrl)
.isSenderWithdrawn(isSenderWithdrawn)
.content(message.getContent())
.messageType(message.getType())
.images(processedImages)
Expand Down
1 change: 1 addition & 0 deletions src/main/java/umc/cockple/demo/domain/chat/dto/ChatCommonDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public record MessageInfo(
Long senderId,
String senderName,
String senderProfileImageUrl,
boolean isSenderWithdrawn,
String content,
MessageType messageType,
List<ImageInfo> images,
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/umc/cockple/demo/domain/chat/dto/ChatMessageDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public record MessageInfo(
Long senderId,
String senderName,
String senderProfileImageUrl,
boolean isSenderWithdrawn,
String content,
MessageType messageType,
List<ChatCommonDTO.ImageInfo> images,
Expand All @@ -35,6 +36,7 @@ public static MessageInfo from(ChatCommonDTO.MessageInfo common) {
.senderId(common.senderId())
.senderName(common.senderName())
.senderProfileImageUrl(common.senderProfileImageUrl())
.isSenderWithdrawn(common.isSenderWithdrawn())
.content(common.content())
.messageType(common.messageType())
.images(common.images())
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/umc/cockple/demo/domain/chat/dto/ChatRoomDetailDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public record MessageInfo(
Long senderId,
String senderName,
String senderProfileImageUrl,
boolean isSenderWithdrawn,
String content,
MessageType messageType,
List<ChatCommonDTO.ImageInfo> images,
Expand All @@ -47,6 +48,7 @@ public static MessageInfo from(ChatCommonDTO.MessageInfo common) {
.senderId(common.senderId())
.senderName(common.senderName())
.senderProfileImageUrl(common.senderProfileImageUrl())
.isSenderWithdrawn(common.isSenderWithdrawn())
.content(common.content())
.messageType(common.messageType())
.images(common.images())
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/umc/cockple/demo/domain/chat/service/ChatProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import umc.cockple.demo.domain.image.service.ImageService;
import umc.cockple.demo.domain.member.domain.Member;
import umc.cockple.demo.domain.member.domain.ProfileImg;
import umc.cockple.demo.domain.member.enums.MemberStatus;

import java.util.Comparator;
import java.util.List;
Expand All @@ -33,7 +34,8 @@ private ChatCommonDTO.MessageInfo processAndConvertMessage(ChatMessage message,
String senderProfileImageUrl = generateProfileImageUrl(sender.getProfileImg());
List<ChatCommonDTO.ImageInfo> processedImages = processMessageImages(message);
boolean isMyMessage = isMyMessage(sender.getId(), memberId);
return chatConverter.toCommonMessageInfo(message, senderProfileImageUrl, processedImages, isMyMessage);
boolean isSenderWithdrawn = sender.getIsActive() == MemberStatus.INACTIVE;
return chatConverter.toCommonMessageInfo(message, senderProfileImageUrl, processedImages, isMyMessage, isSenderWithdrawn);
}

public String generateProfileImageUrl(ProfileImg profileImg) {
Expand Down
22 changes: 12 additions & 10 deletions src/main/java/umc/cockple/demo/domain/chat/service/ChatQueryServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import umc.cockple.demo.domain.party.domain.PartyImg;
import umc.cockple.demo.domain.party.repository.PartyRepository;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -102,8 +103,9 @@ public ChatRoomDetailDTO.Response getChatRoomDetail(Long roomId, Long memberId)

Pageable pageable = PageRequest.of(0, 50);
List<ChatMessage> recentMessages = findRecentMessagesWithImages(roomId, pageable);
Collections.reverse(recentMessages);
List<ChatCommonDTO.MessageInfo> commonMessages = chatProcessor.processMessages(memberId, recentMessages);
List<ChatMessage> resultMessages = new ArrayList<>(recentMessages);
Collections.reverse(resultMessages);
Copy link
Contributor

@kanghana1 kanghana1 Mar 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이거는 머하는 메서드예요?

Copy link
Contributor

@kanghana1 kanghana1 Mar 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

궁금해서...안써봐서...

Copy link
Contributor Author

@Dimo-2562 Dimo-2562 Mar 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

그 Collection 중에 순서가 있는 자료형에서 그 순서를 역으로 돌리는? 메서드입니다.

List<ChatCommonDTO.MessageInfo> commonMessages = chatProcessor.processMessages(memberId, resultMessages);
List<ChatRoomDetailDTO.MessageInfo> messageInfos = chatConverter.toChatRoomDetailMessageInfos(commonMessages);

List<ChatRoomMember> participants = findChatRoomMembersWithMemberOrThrow(roomId);
Expand All @@ -126,18 +128,18 @@ public ChatMessageDTO.Response getChatMessages(Long roomId, Long memberId, Long
List<ChatMessage> messages = findMessagesWithCursor(roomId, cursor, pageable);

boolean hasNext = messages.size() > size;
if (hasNext) {
messages = messages.subList(0, size);
}
List<ChatMessage> resultMessages = hasNext
? new ArrayList<>(messages.subList(0, size))
: new ArrayList<>(messages);

Collections.reverse(messages);
List<ChatCommonDTO.MessageInfo> commonMessages = chatProcessor.processMessages(memberId, messages);
Collections.reverse(resultMessages);
List<ChatCommonDTO.MessageInfo> commonMessages = chatProcessor.processMessages(memberId, resultMessages);
List<ChatMessageDTO.MessageInfo> messageInfos = chatConverter.toChatMessageInfos(commonMessages);

Long nextCursor = hasNext && !messages.isEmpty()
? messages.get(0).getId() : null;
Long nextCursor = hasNext && !resultMessages.isEmpty()
? resultMessages.get(0).getId() : null;

log.info("[채팅방 과거 메시지 조회 완료] - 메시지 수: {}, hasNext: {}", messages.size(), hasNext);
log.info("[채팅방 과거 메시지 조회 완료] - 메시지 수: {}, hasNext: {}", resultMessages.size(), hasNext);

return chatConverter.toChatMessageResponse(messageInfos, hasNext, nextCursor);
}
Expand Down
Loading