Skip to content

Commit 03375a2

Browse files
authored
Merge pull request #179 from ASSU-org/fix/chatting_api_hotfix
refactor/#38
2 parents 0e279c5 + e5065fd commit 03375a2

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

src/main/java/com/assu/server/domain/chat/converter/ChatConverter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public static ChatRoomListResultDTO toChatRoomResultDTO(ChatRoomListResultDTO re
2626
.opponentId(request.getOpponentId())
2727
.opponentName(request.getOpponentName())
2828
.opponentProfileImage(request.getOpponentProfileImage())
29+
.phoneNumber(request.getPhoneNumber())
2930
.build();
3031
}
3132

src/main/java/com/assu/server/domain/chat/dto/ChatRoomListResultDTO.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ public class ChatRoomListResultDTO {
1919
private Long opponentId;
2020
private String opponentName;
2121
private String opponentProfileImage;
22+
private String phoneNumber;
2223
}

src/main/java/com/assu/server/domain/chat/repository/ChatRepository.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,13 @@ SELECT MAX(m2.createdAt)
4646
WHEN am.id IS NULL AND pm.id = :memberId THEN -1
4747
WHEN pm.id = :memberId THEN am.profileUrl
4848
ELSE pm.profileUrl
49-
END
49+
END,
50+
CASE
51+
WHEN pm.id IS NULL AND am.id = :memberId THEN '-1'
52+
WHEN am.id IS NULL AND pm.id = :memberId THEN '-1'
53+
WHEN pm.id = :memberId THEN am.phoneNum
54+
ELSE pm.phoneNum
55+
END
5056
)
5157
FROM ChattingRoom r
5258
LEFT JOIN r.partner p

0 commit comments

Comments
 (0)