♻️ refactor: 코드 리뷰 반영

LimKangHyun · LimKangHyun · commit 655929e2c57c · 2025-07-23T13:22:33.000+09:00
diff --git a/backend/src/main/java/io/f1/backend/domain/game/app/GameService.java b/backend/src/main/java/io/f1/backend/domain/game/app/GameService.java
@@ -5,8 +5,9 @@
 import static io.f1.backend.domain.game.mapper.RoomMapper.toQuestionStartResponse;
 import static io.f1.backend.domain.quiz.mapper.QuizMapper.toGameStartResponse;
 
-import io.f1.backend.domain.game.dto.MessageType;
 import io.f1.backend.domain.game.dto.request.GameSettingChanger;
+import io.f1.backend.domain.game.dto.MessageType;
+import io.f1.backend.domain.game.dto.response.PlayerListResponse;
 import io.f1.backend.domain.game.event.RoomUpdatedEvent;
 import io.f1.backend.domain.game.model.Player;
 import io.f1.backend.domain.game.model.Room;
@@ -23,12 +24,14 @@
 
 import lombok.RequiredArgsConstructor;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Objects;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class GameService {
@@ -72,18 +75,18 @@ public void gameStart(Long roomId, UserPrincipal principal) {
     }
 
     public void handlePlayerReady(Long roomId, String sessionId) {
-        Player player =
-                roomRepository
-                        .findPlayerInRoomBySessionId(roomId, sessionId)
-                        .orElseThrow(() -> new CustomException(RoomErrorCode.PLAYER_NOT_FOUND));
 
         Room room = findRoom(roomId);
 
+        Player player = room.getPlayerSessionMap().get(sessionId);
+
         toggleReadyIfPossible(room, player);
 
         String destination = getDestination(roomId);
 
-        messageSender.send(destination, MessageType.PLAYER_LIST, toPlayerListResponse(room));
+        PlayerListResponse playerListResponse = toPlayerListResponse(room);
+        log.info(playerListResponse.toString());
+        messageSender.send(destination, MessageType.PLAYER_LIST, playerListResponse);
     }
 
     public void changeGameSetting(
@@ -98,10 +101,8 @@ public void changeGameSetting(
 
         broadcastGameSetting(room);
 
-        RoomUpdatedEvent roomUpdatedEvent =
-                new RoomUpdatedEvent(
-                        room,
-                        quizService.getQuizWithQuestionsById(room.getGameSetting().getQuizId()));
+        RoomUpdatedEvent roomUpdatedEvent = new RoomUpdatedEvent(room,
+            quizService.getQuizWithQuestionsById(room.getGameSetting().getQuizId()));
 
         eventPublisher.publishEvent(roomUpdatedEvent);
     }
@@ -138,7 +139,7 @@ private String getDestination(Long roomId) {
     }
 
     private void validateHostAndState(Room room, UserPrincipal principal) {
-        if (!Objects.equals(principal.getUserId(), room.getHost().getId())) {
+        if (!room.isHost(principal.getUserId())) {
             throw new CustomException(RoomErrorCode.NOT_ROOM_OWNER);
         }
         if (room.isPlaying()) {
@@ -150,7 +151,7 @@ private void toggleReadyIfPossible(Room room, Player player) {
         if (room.isPlaying()) {
             throw new CustomException(RoomErrorCode.GAME_ALREADY_PLAYING);
         }
-        if (!Objects.equals(player.getId(), room.getHost().getId())) {
+        if (!room.isHost(player.getId())) {
             player.toggleReady();
         }
     }
@@ -159,8 +160,8 @@ private void broadcastGameSetting(Room room) {
         String destination = getDestination(room.getId());
         Quiz quiz = quizService.getQuizWithQuestionsById(room.getGameSetting().getQuizId());
         messageSender.send(
-                destination,
-                MessageType.GAME_SETTING,
-                toGameSettingResponse(room.getGameSetting(), quiz));
+            destination,
+            MessageType.GAME_SETTING,
+            toGameSettingResponse(room.getGameSetting(), quiz));
     }
 }
diff --git a/backend/src/main/java/io/f1/backend/domain/game/dto/request/QuizChangeRequest.java b/backend/src/main/java/io/f1/backend/domain/game/dto/request/QuizChangeRequest.java
@@ -1,7 +1,5 @@
 package io.f1.backend.domain.game.dto.request;
 
-import static io.f1.backend.domain.game.mapper.RoomMapper.toPlayerListResponse;
-
 import io.f1.backend.domain.game.dto.MessageType;
 import io.f1.backend.domain.game.dto.response.PlayerListResponse;
 import io.f1.backend.domain.game.model.Room;
@@ -10,29 +8,35 @@
 import io.f1.backend.domain.quiz.entity.Quiz;
 
 import java.util.Objects;
+import lombok.extern.slf4j.Slf4j;
+
+import static io.f1.backend.domain.game.mapper.RoomMapper.toPlayerListResponse;
+import static io.f1.backend.domain.game.websocket.WebSocketUtils.getDestination;
 
+@Slf4j
 public record QuizChangeRequest(Long quizId) implements GameSettingChanger {
 
     @Override
     public boolean change(Room room, QuizService quizService) {
-        if (Objects.equals(room.getGameSetting().getQuizId(), quizId)) {
+        if (Objects.equals(room.getQuizId(), quizId)) {
             return false; // 동일하면 무시
         }
         Quiz quiz = quizService.getQuizWithQuestionsById(quizId);
         int questionSize = quiz.getQuestions().size();
-        room.getGameSetting().changeQuiz(quiz);
+        room.changeQuiz(quiz);
         // 퀴즈의 문제 갯수로 변경
-        room.getGameSetting().changeRound(questionSize, questionSize);
+        room.changeRound(questionSize, questionSize);
         return true;
     }
 
     @Override
     public void afterChange(Room room, MessageSender messageSender) {
         room.resetAllPlayerReadyStates();
 
-        String destination = "/sub/room/" + room.getId();
+        String destination = getDestination(room.getId());
         PlayerListResponse response = toPlayerListResponse(room);
 
+        log.info(response.toString());
         messageSender.send(destination, MessageType.PLAYER_LIST, response);
     }
 }
diff --git a/backend/src/main/java/io/f1/backend/domain/game/dto/request/RoundChangeRequest.java b/backend/src/main/java/io/f1/backend/domain/game/dto/request/RoundChangeRequest.java
@@ -11,14 +11,14 @@ public record RoundChangeRequest(Integer round) implements GameSettingChanger {
 
     @Override
     public boolean change(Room room, QuizService quizService) {
-        if (Objects.equals(room.getGameSetting().getRound(), round)) {
+        if (Objects.equals(room.getRound(), round)) {
             return false; // 동일하면 무시
         }
 
-        Quiz quiz = quizService.findQuizById(room.getGameSetting().getQuizId());
+        Quiz quiz = quizService.findQuizById(room.getQuizId());
         int questionSize = quiz.getQuestions().size();
 
-        room.getGameSetting().changeRound(round, questionSize);
+        room.changeRound(round, questionSize);
         return true;
     }
 
diff --git a/backend/src/main/java/io/f1/backend/domain/game/dto/request/TimeLimitChangeRequest.java b/backend/src/main/java/io/f1/backend/domain/game/dto/request/TimeLimitChangeRequest.java
@@ -8,10 +8,10 @@ public record TimeLimitChangeRequest(int timeLimit) implements GameSettingChange
 
     @Override
     public boolean change(Room room, QuizService quizService) {
-        if (room.getGameSetting().getTimeLimit() == timeLimit) {
+        if (room.getTimeLimit() == timeLimit) {
             return false; // 동일하면 무시
         }
-        room.getGameSetting().changeTimeLimit(TimeLimit.from(timeLimit));
+        room.changeTimeLimit(TimeLimit.from(timeLimit));
         return true;
     }
 
diff --git a/backend/src/main/java/io/f1/backend/domain/game/model/Room.java b/backend/src/main/java/io/f1/backend/domain/game/model/Room.java
@@ -1,7 +1,9 @@
 package io.f1.backend.domain.game.model;
 
+import io.f1.backend.domain.game.dto.request.TimeLimit;
 import io.f1.backend.domain.question.entity.Question;
 
+import io.f1.backend.domain.quiz.entity.Quiz;
 import lombok.Getter;
 
 import java.time.LocalDateTime;
@@ -49,7 +51,7 @@ public Room(Long id, RoomSetting roomSetting, GameSetting gameSetting, Player ho
     }
 
     public boolean isHost(Long id) {
-        return this.host.getId().equals(id);
+        return Objects.equals(host.id, id);
     }
 
     public void updateQuestions(List<Question> questions) {
@@ -103,4 +105,29 @@ public void resetAllPlayerReadyStates() {
             player.setReadyFalse();
         }
     }
+
+    public void changeQuiz(Quiz quiz) {
+        gameSetting.changeQuiz(quiz);
+    }
+
+    public void changeTimeLimit(TimeLimit timeLimit) {
+        gameSetting.changeTimeLimit(timeLimit);
+    }
+
+    public void changeRound(int round, int questionCount) {
+        gameSetting.changeRound(round, questionCount);
+    }
+
+    public Long getQuizId() {
+        return gameSetting.getQuizId();
+    }
+
+    public int getTimeLimit() {
+        return gameSetting.getTimeLimit();
+    }
+
+    public int getRound() {
+        return gameSetting.getRound();
+    }
+
 }
diff --git a/backend/src/main/java/io/f1/backend/domain/game/websocket/GameSocketController.java b/backend/src/main/java/io/f1/backend/domain/game/websocket/GameSocketController.java
@@ -6,9 +6,9 @@
 import io.f1.backend.domain.game.app.GameService;
 import io.f1.backend.domain.game.app.RoomService;
 import io.f1.backend.domain.game.dto.ChatMessage;
-import io.f1.backend.domain.game.dto.QuizChangeRequest;
-import io.f1.backend.domain.game.dto.RoundChangeRequest;
-import io.f1.backend.domain.game.dto.TimeLimitChangeRequest;
+import io.f1.backend.domain.game.dto.request.QuizChangeRequest;
+import io.f1.backend.domain.game.dto.request.RoundChangeRequest;
+import io.f1.backend.domain.game.dto.request.TimeLimitChangeRequest;
 import io.f1.backend.domain.game.dto.request.DefaultWebSocketRequest;
 import io.f1.backend.domain.user.dto.UserPrincipal;
 
diff --git a/backend/src/main/java/io/f1/backend/global/exception/errorcode/RoomErrorCode.java b/backend/src/main/java/io/f1/backend/global/exception/errorcode/RoomErrorCode.java
@@ -15,7 +15,7 @@ public enum RoomErrorCode implements ErrorCode {
     PLAYER_NOT_FOUND("E404007", HttpStatus.NOT_FOUND, "존재하지 않는 플레이어입니다."),
     SOCKET_SESSION_NOT_FOUND("E404006", HttpStatus.NOT_FOUND, "존재하지 않는 소켓 세션입니다."),
     GAME_ALREADY_PLAYING("E400015", HttpStatus.BAD_REQUEST, "이미 게임이 진행 중 입니다."),
-    NOT_ROOM_OWNER("E403005", HttpStatus.FORBIDDEN, "방장만 게임 시작이 가능합니다.");
+    NOT_ROOM_OWNER("E403005", HttpStatus.FORBIDDEN, "방장의 권한입니다.");
 
     private final String code;
 

Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,14 @@ public record RoundChangeRequest(Integer round) implements GameSettingChanger {`
`11`	`11`
`12`	`12`	`@Override`
`13`	`13`	`public boolean change(Room room, QuizService quizService) {`
`14`		`- if (Objects.equals(room.getGameSetting().getRound(), round)) {`
	`14`	`+ if (Objects.equals(room.getRound(), round)) {`
`15`	`15`	`return false; // 동일하면 무시`
`16`	`16`	`}`
`17`	`17`
`18`		`- Quiz quiz = quizService.findQuizById(room.getGameSetting().getQuizId());`
	`18`	`+ Quiz quiz = quizService.findQuizById(room.getQuizId());`
`19`	`19`	`int questionSize = quiz.getQuestions().size();`
`20`	`20`
`21`		`- room.getGameSetting().changeRound(round, questionSize);`
	`21`	`+ room.changeRound(round, questionSize);`
`22`	`22`	`return true;`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,10 @@ public record TimeLimitChangeRequest(int timeLimit) implements GameSettingChange`
`8`	`8`
`9`	`9`	`@Override`
`10`	`10`	`public boolean change(Room room, QuizService quizService) {`
`11`		`- if (room.getGameSetting().getTimeLimit() == timeLimit) {`
	`11`	`+ if (room.getTimeLimit() == timeLimit) {`
`12`	`12`	`return false; // 동일하면 무시`
`13`	`13`	`}`
`14`		`- room.getGameSetting().changeTimeLimit(TimeLimit.from(timeLimit));`
	`14`	`+ room.changeTimeLimit(TimeLimit.from(timeLimit));`
`15`	`15`	`return true;`
`16`	`16`	`}`
`17`	`17`