Skip to content
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

Jump to bottom

[fix] 채팅 상세 조회 API 응답 닉네임 추가 #207

Merged
merged 1 commit into from
Jan 18, 2024
Merged

[fix] 채팅 상세 조회 API 응답 닉네임 추가 #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/main/kotlin/com/psr/psr/chat/dto/response/GetChatMessagesRes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@ data class GetChatMessagesRes(
@Schema(description = "채팅 시작된 게시글 이름", example = "목도리")
val productName: String? = null,

@Schema(description = "채팅 받는 사람 닉네임", example = "김마리")
val receiver: String? = null,

@Schema(description = "채팅 메시지 리스트")
val chatMessages: List<ChatMessageRes>?
) {
companion object {
fun toDto(name: String, chatMessages: List<ChatMessageRes>?): GetChatMessagesRes {
fun toDto(name: String, receiver: String?, chatMessages: List<ChatMessageRes>?): GetChatMessagesRes {
return GetChatMessagesRes(
name,
receiver,
chatMessages
)
}
Expand Down
4 changes: 3 additions & 1 deletion src/main/kotlin/com/psr/psr/chat/service/ChatService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ class ChatService(
val chatRoom: ChatRoom = chatRoomRepository.findByIdAndStatus(chatRoomId, Constant.UserStatus.ACTIVE_STATUS)
?: throw BaseException(BaseResponseCode.NOT_FOUND_CHATROOM)
val chatMessages :List<ChatMessageRes>? = chatMessageRepository.getChatMessages(user, chatRoom)
return GetChatMessagesRes.toDto(chatRoom.order.product.name, chatMessages)
var receiver: String? = chatRoom.receiverUser?.nickname
if (chatRoom.receiverUser == user) receiver = chatRoom.senderUser?.nickname
return GetChatMessagesRes.toDto(chatRoom.order.product.name, receiver, chatMessages)
}
}
Loading