Skip to content

Commit 7bd4453

Browse files
committed
♻️ 리뷰내용 반영
1 parent fd9baf5 commit 7bd4453

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

backend/src/main/java/io/f1/backend/domain/game/app/RoomService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ public void chat(Long roomId, String sessionId, ChatMessage chatMessage) {
271271

272272
public boolean isReconnectTarget(Long roomId, String sessionId) {
273273
Room room = findRoom(roomId);
274-
return room.isReconnectTarget(sessionId);
274+
return !room.isExit(sessionId);
275275
}
276276

277277
public void reconnectSession(Long roomId, String oldSessionId, String newSessionId) {

backend/src/main/java/io/f1/backend/domain/game/model/Room.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,6 @@ public void updatePlayerConnectionState(String sessionId, ConnectionState newSta
126126
playerSessionMap.get(sessionId).updateState(newState);
127127
}
128128

129-
public boolean isReconnectTarget(String sessionId) {
130-
return playerSessionMap.get(sessionId) != null;
131-
}
132-
133129
public boolean isExit(String sessionId) {
134130
return playerSessionMap.get(sessionId) == null;
135131
}

backend/src/main/java/io/f1/backend/domain/game/websocket/Service/SessionService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ public void handleUserReconnect(Long roomId, String newSessionId, Long userId) {
4949
public void handleUserDisconnect(String sessionId, UserPrincipal principal) {
5050

5151
Long roomId = sessionIdRoom.get(sessionId);
52+
Long userId = sessionIdUser.get(sessionId);
5253

5354
/* 정상 동작*/
5455
if (roomService.isExit(sessionId, roomId)) {
55-
removeSession(sessionId, roomId);
56+
removeSession(sessionId, userId);
5657
return;
5758
}
5859

59-
Long userId = principal.getUserId();
6060

6161
roomService.changeConnectedStatus(roomId, sessionId, ConnectionState.DISCONNECTED);
6262

@@ -69,7 +69,7 @@ public void handleUserDisconnect(String sessionId, UserPrincipal principal) {
6969
roomService.notifyIfReconnected(roomId, principal);
7070
}
7171
userIdLatestSession.remove(principal.getUserId());
72-
removeSession(sessionId, roomId);
72+
removeSession(sessionId, userId);
7373
},
7474
5,
7575
TimeUnit.SECONDS);

backend/src/main/java/io/f1/backend/global/util/SecurityUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public static UserPrincipal getCurrentUserPrincipal() {
3333
&& authentication.getPrincipal() instanceof UserPrincipal userPrincipal) {
3434
return userPrincipal;
3535
}
36-
throw new RuntimeException("E401001: 로그인이 필요합니다.");
36+
throw new CustomException(AuthErrorCode.UNAUTHORIZED);
3737
}
3838

3939
public static Long getCurrentUserId() {

0 commit comments

Comments
 (0)