-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: 메시지와 채팅 타입이 대소문자 구분없이 매핑되도록 수정
- Loading branch information
Showing
4 changed files
with
50 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 7 additions & 12 deletions
19
backend/ddang/src/main/java/com/ddang/ddang/websocket/handler/dto/ChatMessageType.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,18 @@ | ||
package com.ddang.ddang.websocket.handler.dto; | ||
|
||
import com.ddang.ddang.websocket.handler.exception.UnsupportedChattingTypeException; | ||
|
||
import java.util.Arrays; | ||
|
||
public enum ChatMessageType { | ||
|
||
MESSAGE("message"), | ||
PING("ping"), | ||
; | ||
|
||
private final String value; | ||
|
||
ChatMessageType(final String value) { | ||
this.value = value; | ||
} | ||
MESSAGE, | ||
PING; | ||
|
||
public static ChatMessageType findMessageType(final String value) { | ||
return Arrays.stream(ChatMessageType.values()) | ||
.filter(chattingType -> chattingType.value.equals(value)) | ||
.findFirst() | ||
.orElseThrow(() -> new IllegalArgumentException("잘못된 채팅 타입입니다.")); | ||
.filter(chattingType -> chattingType.name().equalsIgnoreCase(value)) | ||
.findFirst() | ||
.orElseThrow(() -> new UnsupportedChattingTypeException("잘못된 채팅 타입입니다.")); | ||
} | ||
} |
15 changes: 14 additions & 1 deletion
15
backend/ddang/src/main/java/com/ddang/ddang/websocket/handler/dto/TextMessageType.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,20 @@ | ||
package com.ddang.ddang.websocket.handler.dto; | ||
|
||
import com.ddang.ddang.websocket.handler.exception.UnsupportedTextMessageTypeException; | ||
import com.fasterxml.jackson.annotation.JsonCreator; | ||
|
||
import java.util.Arrays; | ||
|
||
public enum TextMessageType { | ||
|
||
CHATTINGS, | ||
BIDS | ||
BIDS; | ||
|
||
@JsonCreator | ||
public static TextMessageType fromString(String value) { | ||
return Arrays.stream(TextMessageType.values()) | ||
.filter(messageType -> messageType.name().equalsIgnoreCase(value)) | ||
.findFirst() | ||
.orElseThrow(() -> new UnsupportedTextMessageTypeException("잘못된 메시지 타입입니다.")); | ||
} | ||
} |
7 changes: 7 additions & 0 deletions
7
...in/java/com/ddang/ddang/websocket/handler/exception/UnsupportedChattingTypeException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
package com.ddang.ddang.websocket.handler.exception; | ||
|
||
public class UnsupportedChattingTypeException extends IllegalStateException { | ||
public UnsupportedChattingTypeException(final String message) { | ||
super(message); | ||
} | ||
} |