Skip to content

Commit de74f4f

Browse files
authored
Merge pull request #56 from Gachigage/fix/chat
[fix] 채팅 오류 수정을 위한 response 변수 수정
2 parents 4e5aa21 + ae18ec5 commit de74f4f

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

src/main/java/com/gachigage/chat/dto/ChatMessageResponseDto.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ public class ChatMessageResponseDto {
2929

3030
private final boolean isRead;
3131

32+
private final Long senderId;
33+
3234
public static ChatMessageResponseDto from(ChatMessage chatMessage, Long userOauthId) {
3335
Member sender = chatMessage.getSender();
3436
return ChatMessageResponseDto.builder()
@@ -38,6 +40,7 @@ public static ChatMessageResponseDto from(ChatMessage chatMessage, Long userOaut
3840
.isMe(sender.getOauthId().equals(userOauthId))
3941
.senderIsBuyer(sender.equals(chatMessage.getChatRoom().getBuyer()))
4042
.messageType(chatMessage.getMessageType())
43+
.senderId(sender.getId())
4144
.build();
4245
}
4346
}

src/main/java/com/gachigage/chat/dto/ChatRoomResponseDto.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,6 @@ public class ChatRoomResponseDto {
3030
private final int unreadCount;
3131

3232
private final boolean amIBuyer;
33+
34+
private final Long memberId;
3335
}

src/main/java/com/gachigage/chat/service/ChatService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ public ChatRoomResponseDto getChatRoom(Long memberOauthId, Long chatRoomId) {
143143
.unreadCount(unreadCount)
144144
.productStatus(chatRoom.getProduct().getStatus())
145145
.amIBuyer(memberOauthId.equals(chatRoom.getBuyer().getOauthId()))
146+
.memberId(isMyRoleSeller ? chatRoom.getSeller().getId() : chatRoom.getBuyer().getId())
146147
.build();
147148
}
148149

0 commit comments

Comments
 (0)