Skip to content

Commit e3dcb00

Browse files
sehee123sehee123
committed
Merge remote-tracking branch 'origin/feat/34' into feat/34
2 parents 7bd4453 + fd9aff1 commit e3dcb00

File tree

6 files changed

+76
-79
lines changed

6 files changed

+76
-79
lines changed

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

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public void enterRoom(RoomValidationRequest request) {
118118
}
119119

120120
if (room.getRoomSetting().locked()
121-
&& !room.getRoomSetting().password().equals(request.password())) {
121+
&& !room.getRoomSetting().password().equals(request.password())) {
122122
throw new CustomException(RoomErrorCode.WRONG_PASSWORD);
123123
}
124124

@@ -140,12 +140,12 @@ public void initializeRoomSocket(Long roomId, String sessionId, UserPrincipal pr
140140
Quiz quiz = quizService.getQuizWithQuestionsById(quizId);
141141

142142
GameSettingResponse gameSettingResponse =
143-
toGameSettingResponse(room.getGameSetting(), quiz);
143+
toGameSettingResponse(room.getGameSetting(), quiz);
144144

145145
PlayerListResponse playerListResponse = toPlayerListResponse(room);
146146

147147
SystemNoticeResponse systemNoticeResponse =
148-
ofPlayerEvent(player.getNickname(), RoomEventType.ENTER);
148+
ofPlayerEvent(player.getNickname(), RoomEventType.ENTER);
149149

150150
String destination = getDestination(roomId);
151151

@@ -181,7 +181,7 @@ public void exitRoom(Long roomId, String sessionId, UserPrincipal principal) {
181181
removePlayer(room, sessionId, removePlayer);
182182

183183
SystemNoticeResponse systemNoticeResponse =
184-
ofPlayerEvent(removePlayer.nickname, RoomEventType.EXIT);
184+
ofPlayerEvent(removePlayer.nickname, RoomEventType.EXIT);
185185

186186
PlayerListResponse playerListResponse = toPlayerListResponse(room);
187187

@@ -192,9 +192,9 @@ public void exitRoom(Long roomId, String sessionId, UserPrincipal principal) {
192192

193193
public void handlePlayerReady(Long roomId, String sessionId) {
194194
Player player =
195-
roomRepository
196-
.findPlayerInRoomBySessionId(roomId, sessionId)
197-
.orElseThrow(() -> new CustomException(RoomErrorCode.PLAYER_NOT_FOUND));
195+
roomRepository
196+
.findPlayerInRoomBySessionId(roomId, sessionId)
197+
.orElseThrow(() -> new CustomException(RoomErrorCode.PLAYER_NOT_FOUND));
198198

199199
player.toggleReady();
200200

@@ -208,15 +208,15 @@ public void handlePlayerReady(Long roomId, String sessionId) {
208208
public RoomListResponse getAllRooms() {
209209
List<Room> rooms = roomRepository.findAll();
210210
List<RoomResponse> roomResponses =
211-
rooms.stream()
212-
.map(
213-
room -> {
214-
Long quizId = room.getGameSetting().getQuizId();
215-
Quiz quiz = quizService.getQuizWithQuestionsById(quizId);
216-
217-
return toRoomResponse(room, quiz);
218-
})
219-
.toList();
211+
rooms.stream()
212+
.map(
213+
room -> {
214+
Long quizId = room.getGameSetting().getQuizId();
215+
Quiz quiz = quizService.getQuizWithQuestionsById(quizId);
216+
217+
return toRoomResponse(room, quiz);
218+
})
219+
.toList();
220220
return new RoomListResponse(roomResponses);
221221
}
222222

@@ -241,14 +241,14 @@ public void chat(Long roomId, String sessionId, ChatMessage chatMessage) {
241241
room.increasePlayerCorrectCount(sessionId);
242242

243243
messageSender.send(
244-
destination,
245-
MessageType.QUESTION_RESULT,
246-
toQuestionResultResponse(chatMessage.nickname(), answer));
244+
destination,
245+
MessageType.QUESTION_RESULT,
246+
toQuestionResultResponse(chatMessage.nickname(), answer));
247247
messageSender.send(destination, MessageType.RANK_UPDATE, toRankUpdateResponse(room));
248248
messageSender.send(
249-
destination,
250-
MessageType.SYSTEM_NOTICE,
251-
ofPlayerEvent(chatMessage.nickname(), RoomEventType.CORRECT_ANSWER));
249+
destination,
250+
MessageType.SYSTEM_NOTICE,
251+
ofPlayerEvent(chatMessage.nickname(), RoomEventType.CORRECT_ANSWER));
252252

253253
timerService.cancelTimer(room);
254254

@@ -263,9 +263,9 @@ public void chat(Long roomId, String sessionId, ChatMessage chatMessage) {
263263
// 타이머 추가하기
264264
timerService.startTimer(room, CONTINUE_DELAY);
265265
messageSender.send(
266-
destination,
267-
MessageType.QUESTION_START,
268-
toQuestionStartResponse(room, CONTINUE_DELAY));
266+
destination,
267+
MessageType.QUESTION_START,
268+
toQuestionStartResponse(room, CONTINUE_DELAY));
269269
}
270270
}
271271

@@ -309,7 +309,7 @@ public void notifyIfReconnected(Long roomId, UserPrincipal principal) {
309309
Quiz quiz = quizService.getQuizWithQuestionsById(quizId);
310310

311311
GameSettingResponse gameSettingResponse =
312-
toGameSettingResponse(room.getGameSetting(), quiz);
312+
toGameSettingResponse(room.getGameSetting(), quiz);
313313

314314
PlayerListResponse playerListResponse = toPlayerListResponse(room);
315315

@@ -318,9 +318,9 @@ public void notifyIfReconnected(Long roomId, UserPrincipal principal) {
318318
messageSender.send(destination, MessageType.PLAYER_LIST, playerListResponse);
319319

320320
messageSender.send(
321-
destination,
322-
MessageType.SYSTEM_NOTICE,
323-
ofPlayerEvent(principal.getUserNickname(), RoomEventType.RECONNECT));
321+
destination,
322+
MessageType.SYSTEM_NOTICE,
323+
ofPlayerEvent(principal.getUserNickname(), RoomEventType.RECONNECT));
324324
}
325325

326326
private Player getRemovePlayer(Room room, String sessionId, UserPrincipal principal) {
@@ -342,8 +342,8 @@ private Player createPlayer() {
342342

343343
private Room findRoom(Long roomId) {
344344
return roomRepository
345-
.findRoom(roomId)
346-
.orElseThrow(() -> new CustomException(RoomErrorCode.ROOM_NOT_FOUND));
345+
.findRoom(roomId)
346+
.orElseThrow(() -> new CustomException(RoomErrorCode.ROOM_NOT_FOUND));
347347
}
348348

349349
private boolean isLastPlayer(Room room, String sessionId) {
@@ -362,14 +362,14 @@ private void changeHost(Room room, String hostSessionId) {
362362
Map<String, Player> playerSessionMap = room.getPlayerSessionMap();
363363

364364
Optional<String> nextHostSessionId =
365-
playerSessionMap.keySet().stream()
366-
.filter(key -> !key.equals(hostSessionId))
367-
.findFirst();
365+
playerSessionMap.keySet().stream()
366+
.filter(key -> !key.equals(hostSessionId))
367+
.findFirst();
368368

369369
Player nextHost =
370-
playerSessionMap.get(
371-
nextHostSessionId.orElseThrow(
372-
() -> new CustomException(RoomErrorCode.SOCKET_SESSION_NOT_FOUND)));
370+
playerSessionMap.get(
371+
nextHostSessionId.orElseThrow(
372+
() -> new CustomException(RoomErrorCode.SOCKET_SESSION_NOT_FOUND)));
373373

374374
room.updateHost(nextHost);
375375
log.info("user_id:{} 방장 변경 완료 ", nextHost.getId());

‎backend/src/main/java/io/f1/backend/domain/game/dto/SystemNoticeMessage.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ public enum SystemNoticeMessage {
77
TIMEOUT("땡 ~ ⏰ 제한 시간 초과!"),
88
RECONNECT(" 님이 재연결 되었습니다.");
99

10-
1110
private final String message;
1211

1312
SystemNoticeMessage(String message) {

‎backend/src/main/java/io/f1/backend/domain/game/mapper/RoomMapper.java‎

Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.f1.backend.domain.game.mapper;
22

3-
import io.f1.backend.domain.game.dto.ChatMessage;
43
import io.f1.backend.domain.game.dto.Rank;
54
import io.f1.backend.domain.game.dto.RoomEventType;
65
import io.f1.backend.domain.game.dto.request.RoomCreateRequest;
@@ -31,83 +30,82 @@ public class RoomMapper {
3130

3231
public static RoomSetting toRoomSetting(RoomCreateRequest request) {
3332
return new RoomSetting(
34-
request.roomName(), request.maxUserCount(), request.locked(), request.password());
33+
request.roomName(), request.maxUserCount(), request.locked(), request.password());
3534
}
3635

3736
public static GameSetting toGameSetting(QuizMinData quizMinData) {
3837
return new GameSetting(
39-
quizMinData.quizMinId(),
40-
quizMinData.questionCount().intValue(),
41-
DEFAULT_TIME_LIMIT);
38+
quizMinData.quizMinId(),
39+
quizMinData.questionCount().intValue(),
40+
DEFAULT_TIME_LIMIT);
4241
}
4342

4443
public static RoomSettingResponse toRoomSettingResponse(Room room) {
4544
return new RoomSettingResponse(
46-
room.getRoomSetting().roomName(),
47-
room.getRoomSetting().maxUserCount(),
48-
room.getPlayerSessionMap().size(),
49-
room.getRoomSetting().locked());
45+
room.getRoomSetting().roomName(),
46+
room.getRoomSetting().maxUserCount(),
47+
room.getPlayerSessionMap().size(),
48+
room.getRoomSetting().locked());
5049
}
5150

5251
public static GameSettingResponse toGameSettingResponse(GameSetting gameSetting, Quiz quiz) {
5352
return new GameSettingResponse(
54-
gameSetting.getRound(), gameSetting.getTimeLimit(), toQuizResponse(quiz));
53+
gameSetting.getRound(), gameSetting.getTimeLimit(), toQuizResponse(quiz));
5554
}
5655

5756
public static PlayerListResponse toPlayerListResponse(Room room) {
5857
List<PlayerResponse> playerResponseList =
59-
room.getPlayerSessionMap().values().stream()
60-
.map(player -> new PlayerResponse(player.getNickname(), false))
61-
.toList();
58+
room.getPlayerSessionMap().values().stream()
59+
.map(player -> new PlayerResponse(player.getNickname(), false))
60+
.toList();
6261

6362
return new PlayerListResponse(room.getHost().getNickname(), playerResponseList);
6463
}
6564

6665
public static RoomResponse toRoomResponse(Room room, Quiz quiz) {
6766
return new RoomResponse(
68-
room.getId(),
69-
room.getRoomSetting().roomName(),
70-
room.getRoomSetting().maxUserCount(),
71-
room.getPlayerSessionMap().size(),
72-
room.getRoomSetting().locked(),
73-
room.getState().name(),
74-
quiz.getTitle(),
75-
quiz.getDescription(),
76-
quiz.getCreator().getNickname(),
77-
quiz.getQuestions().size(),
78-
quiz.getThumbnailUrl());
67+
room.getId(),
68+
room.getRoomSetting().roomName(),
69+
room.getRoomSetting().maxUserCount(),
70+
room.getPlayerSessionMap().size(),
71+
room.getRoomSetting().locked(),
72+
room.getState().name(),
73+
quiz.getTitle(),
74+
quiz.getDescription(),
75+
quiz.getCreator().getNickname(),
76+
quiz.getQuestions().size(),
77+
quiz.getThumbnailUrl());
7978
}
8079

8180
public static QuizResponse toQuizResponse(Quiz quiz) {
8281
return new QuizResponse(
83-
quiz.getId(),
84-
quiz.getTitle(),
85-
quiz.getDescription(),
86-
quiz.getThumbnailUrl(),
87-
quiz.getQuestions().size());
82+
quiz.getId(),
83+
quiz.getTitle(),
84+
quiz.getDescription(),
85+
quiz.getThumbnailUrl(),
86+
quiz.getQuestions().size());
8887
}
8988

9089
public static SystemNoticeResponse ofPlayerEvent(String nickname, RoomEventType roomEventType) {
9190
return new SystemNoticeResponse(roomEventType.getMessage(nickname), Instant.now());
9291
}
9392

94-
public static QuestionResultResponse toQuestionResultResponse(
95-
String nickname, String answer) {
93+
public static QuestionResultResponse toQuestionResultResponse(String nickname, String answer) {
9694
return new QuestionResultResponse(nickname, answer);
9795
}
9896

9997
public static RankUpdateResponse toRankUpdateResponse(Room room) {
10098
return new RankUpdateResponse(
101-
room.getPlayerSessionMap().values().stream()
102-
.sorted(Comparator.comparing(Player::getCorrectCount).reversed())
103-
.map(player -> new Rank(player.getNickname(), player.getCorrectCount()))
104-
.toList());
99+
room.getPlayerSessionMap().values().stream()
100+
.sorted(Comparator.comparing(Player::getCorrectCount).reversed())
101+
.map(player -> new Rank(player.getNickname(), player.getCorrectCount()))
102+
.toList());
105103
}
106104

107105
public static QuestionStartResponse toQuestionStartResponse(Room room, int delay) {
108106
return new QuestionStartResponse(
109-
room.getCurrentQuestion().getId(),
110-
room.getCurrentRound(),
111-
Instant.now().plusSeconds(delay));
107+
room.getCurrentQuestion().getId(),
108+
room.getCurrentRound(),
109+
Instant.now().plusSeconds(delay));
112110
}
113111
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ public void updateTimer(ScheduledFuture<?> timer) {
9191
this.timer = timer;
9292
}
9393

94-
9594
public void removeSessionId(String sessionId) {
9695
this.playerSessionMap.remove(sessionId);
9796
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,13 @@ public void addRoomId(Long roomId, String sessionId) {
3636

3737
public void handleUserReconnect(Long roomId, String newSessionId, Long userId) {
3838

39-
if(userIdLatestSession.get(userId) != null) {
39+
if (userIdLatestSession.get(userId) != null) {
4040
String oldSessionId = userIdLatestSession.get(userId);
4141
/* room 재연결 대상인지 아닌지 판별 */
4242
if (roomService.isReconnectTarget(roomId, oldSessionId)) {
4343
roomService.reconnectSession(roomId, oldSessionId, newSessionId);
4444
}
4545
}
46-
4746
}
4847

4948
public void handleUserDisconnect(String sessionId, UserPrincipal principal) {

‎backend/src/main/java/io/f1/backend/domain/game/websocket/controller/GameSocketController.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
import io.f1.backend.domain.game.dto.ChatMessage;
99
import io.f1.backend.domain.game.dto.request.DefaultWebSocketRequest;
1010
import io.f1.backend.domain.user.dto.UserPrincipal;
11+
1112
import lombok.RequiredArgsConstructor;
13+
1214
import org.springframework.messaging.Message;
1315
import org.springframework.messaging.handler.annotation.DestinationVariable;
1416
import org.springframework.messaging.handler.annotation.MessageMapping;

0 commit comments

Comments
 (0)