Skip to content

Commit 941c29e

Browse files
committed
MessageType 추가
1 parent 7f5e3c3 commit 941c29e

File tree

3 files changed

+20
-5
lines changed

3 files changed

+20
-5
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package com.mbtips.common.enums;
2+
3+
public enum WebSocketMessageType {
4+
SUCCESS,
5+
DUPLICATE_NICKNAME
6+
7+
}

api/src/main/java/com/mbtips/common/handler/WebSocketChatHandler.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.fasterxml.jackson.databind.ObjectMapper;
44
import com.mbtips.common.constant.Constant;
5+
import com.mbtips.common.enums.WebSocketMessageType;
56
import com.mbtips.common.exception.CustomException;
67
import com.mbtips.domain.openChat.exception.OpenChatException;
78
import com.mbtips.openChat.application.dto.OpenChatDto;
@@ -52,9 +53,12 @@ public void afterConnectionEstablished(WebSocketSession session) throws IOExcept
5253
Map<String, String> queryParamMap = this.parseQueryParam(query);
5354
log.info("queryParamMap : {}", queryParamMap);
5455
long openChatId = Long.parseLong(queryParamMap.get(OPEN_CHAT_ID));
55-
log.info("openChatId : {}", openChatId);
5656
if (this.checkNickname(openChatId, queryParamMap.get(NICKNAME))) {
57-
OpenChatMessageDto openChatMessageDto = new OpenChatMessageDto(2, null, OpenChatException.DUPLICATED_NICKNAME.getMessage(), openChatId);
57+
OpenChatMessageDto openChatMessageDto = OpenChatMessageDto.builder()
58+
.type(WebSocketMessageType.DUPLICATE_NICKNAME)
59+
.message(OpenChatException.DUPLICATED_NICKNAME.getMessage())
60+
.openChatId(openChatId)
61+
.build();
5862
session.sendMessage(new TextMessage(objectMapper.writeValueAsString(openChatMessageDto)));
5963
throw new CustomException(OpenChatException.DUPLICATED_NICKNAME);
6064
}
@@ -71,7 +75,6 @@ public void afterConnectionEstablished(WebSocketSession session) throws IOExcept
7175
@Override
7276
public void handleMessage(WebSocketSession session, WebSocketMessage<?> message) throws Exception {
7377
String payload = (String) message.getPayload();
74-
log.info("message.payload : {}", payload);
7578
OpenChatMessageDto openChatMessageDto = objectMapper.readValue(payload, OpenChatMessageDto.class);
7679
log.info("openChatMessageDto.toString() : {}", openChatMessageDto.toString());
7780
Set<WebSocketSession> webSocketSessions = webSocketSessionMap.get(openChatMessageDto.openChatId());
@@ -117,7 +120,6 @@ public void afterConnectionClosed(WebSocketSession session, CloseStatus status)
117120
private Map<String, String> parseQueryParam(String query) {
118121
HashMap<String, String> queryParamMap = new HashMap<>();
119122
String[] pairs = query.split("&");
120-
log.info("parseQueryParam.pairs: {}", Arrays.toString(pairs));
121123
Arrays.stream(pairs).forEach(pair -> {
122124
String[] kv = pair.split("=", 2);
123125
if (kv.length == 2) {

api/src/main/java/com/mbtips/openChat/application/dto/OpenChatMessageDto.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
package com.mbtips.openChat.application.dto;
22

3+
import com.mbtips.common.enums.WebSocketMessageType;
4+
import com.mbtips.common.mbtiinfo.MbtiType;
5+
import lombok.Builder;
6+
7+
@Builder
38
public record OpenChatMessageDto (
4-
int type,
9+
WebSocketMessageType type,
10+
MbtiType mbti,
511
String nickname,
612
String message,
713
long openChatId

0 commit comments

Comments
 (0)