Skip to content

Commit 807e552

Browse files
committed
Feat: web socket username ๋ณ€๊ฒฝ
1 parent 157182c commit 807e552

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

โ€Žsrc/main/java/cmf/commitField/domain/chat/chatMessage/service/ChatMessageServiceImpl.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public ChatMsgResponse sendMessage(ChatMsgRequest message, Long userId, Long roo
4343

4444
ChatRoom chatRoom = chatRoomRepository.findChatRoomById(roomId)
4545
.orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_ROOM));
46-
// ์ฑ„ํŒ… ๋ฉ”์‹œ์ง€ ์ƒ์„ฑ
46+
4747
ChatMsg chatMsg = ChatMsg.builder()
4848
.message(message.getMessage())
4949
.createdAt(LocalDateTime.now())
@@ -52,21 +52,17 @@ public ChatMsgResponse sendMessage(ChatMsgRequest message, Long userId, Long roo
5252
.build();
5353

5454
// Response message
55-
// ์‘๋‹ต ๊ฐ’์œผ๋กœ ๋ณ€ํ™˜
56-
5755
ChatMsgResponse response = ChatMsgResponse.builder()
58-
5956
.roomId(roomId)
60-
.from(findUser.getNickname())
57+
.from(findUser.getUsername()) // nickname ๋Œ€์‹  username ์‚ฌ์šฉ
6158
.message(message.getMessage())
6259
.sendAt(chatMsg.getCreatedAt())
6360
.build();
61+
6462
chatMessageRepository.save(chatMsg);
6563
return response;
66-
6764
}
6865

69-
7066
@Transactional(readOnly = true)
7167
@Override
7268
public List<ChatMsgDto> getRoomChatMsgList(Long roomId, Long userId, Long lastId) {
@@ -83,7 +79,7 @@ public List<ChatMsgDto> getRoomChatMsgList(Long roomId, Long userId, Long lastId
8379
for (ChatMsg chatMsg : chatMsgsList) {
8480
ChatMsgDto build = ChatMsgDto.builder()
8581
.chatMsgId(chatMsg.getId())
86-
.nickname(chatMsg.getUser().getNickname())
82+
.nickname(chatMsg.getUser().getUsername()) // nickname ๋Œ€์‹  username ์‚ฌ์šฉ
8783
.sendAt(chatMsg.getCreatedAt())
8884
.message(chatMsg.getMessage())
8985
.userId(chatMsg.getUser().getId())

โ€Žsrc/main/java/cmf/commitField/global/websocket/ChatWebSocketHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ private void handleChatMessage(WebSocketSession session, JsonNode jsonNode) {
200200
wsMessage.put("type", "CHAT");
201201
wsMessage.put("roomId", roomId);
202202
wsMessage.put("userId", userId);
203-
wsMessage.put("from", response.getFrom());
204-
wsMessage.put("nickname", response.getFrom()); // ํด๋ผ์ด์–ธํŠธ ํ˜ธํ™˜์„ฑ์„ ์œ„ํ•ด ๋‘ ํ•„๋“œ ๋ชจ๋‘ ์„ค์ •
203+
wsMessage.put("from", user.getUsername()); // nickname ๋Œ€์‹  username ์‚ฌ์šฉ
204+
wsMessage.put("nickname", user.getUsername()); // nickname ๋Œ€์‹  username ์‚ฌ์šฉ
205205
wsMessage.put("message", message);
206206
wsMessage.put("sendAt", response.getSendAt().toString());
207207

0 commit comments

Comments
ย (0)