diff --git a/src/main/java/com/assu/server/domain/chat/converter/ChatConverter.java b/src/main/java/com/assu/server/domain/chat/converter/ChatConverter.java index b0b7877..3144f7e 100644 --- a/src/main/java/com/assu/server/domain/chat/converter/ChatConverter.java +++ b/src/main/java/com/assu/server/domain/chat/converter/ChatConverter.java @@ -26,6 +26,7 @@ public static ChatRoomListResultDTO toChatRoomResultDTO(ChatRoomListResultDTO re .opponentId(request.getOpponentId()) .opponentName(request.getOpponentName()) .opponentProfileImage(request.getOpponentProfileImage()) + .phoneNumber(request.getPhoneNumber()) .build(); } diff --git a/src/main/java/com/assu/server/domain/chat/dto/ChatRoomListResultDTO.java b/src/main/java/com/assu/server/domain/chat/dto/ChatRoomListResultDTO.java index bfeb0b8..4e57cb8 100644 --- a/src/main/java/com/assu/server/domain/chat/dto/ChatRoomListResultDTO.java +++ b/src/main/java/com/assu/server/domain/chat/dto/ChatRoomListResultDTO.java @@ -19,4 +19,5 @@ public class ChatRoomListResultDTO { private Long opponentId; private String opponentName; private String opponentProfileImage; + private String phoneNumber; } diff --git a/src/main/java/com/assu/server/domain/chat/repository/ChatRepository.java b/src/main/java/com/assu/server/domain/chat/repository/ChatRepository.java index 8cdeb46..6579a90 100644 --- a/src/main/java/com/assu/server/domain/chat/repository/ChatRepository.java +++ b/src/main/java/com/assu/server/domain/chat/repository/ChatRepository.java @@ -46,7 +46,13 @@ SELECT MAX(m2.createdAt) WHEN am.id IS NULL AND pm.id = :memberId THEN -1 WHEN pm.id = :memberId THEN am.profileUrl ELSE pm.profileUrl - END + END, + CASE + WHEN pm.id IS NULL AND am.id = :memberId THEN '-1' + WHEN am.id IS NULL AND pm.id = :memberId THEN '-1' + WHEN pm.id = :memberId THEN am.phoneNum + ELSE pm.phoneNum + END ) FROM ChattingRoom r LEFT JOIN r.partner p