🐛 fix : 게임 시작 API 테스트 및 테스트 중 발견한 버그 수정 (#67)

* 🐛 fix : 게임 시작 API 테스트 및 버그 수정

* chore: Java 스타일 수정

* ♻️ refactor : 단순한 조건문 return문으로

* 🔧 chore : 필요없는 주석문, 어노테이션 삭제

* chore: Java 스타일 수정

* ♻️ refactor : null safe 동등 비교

---------

Co-authored-by: github-actions <>

Author: silver-eunjoo

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

@@ -1,13 +1,17 @@
 package io.f1.backend.domain.game.app;
 
+import static io.f1.backend.domain.quiz.mapper.QuizMapper.toGameStartResponse;
+
 import io.f1.backend.domain.game.dto.GameStartData;
+import io.f1.backend.domain.game.dto.request.GameStartRequest;
 import io.f1.backend.domain.game.dto.response.GameStartResponse;
 import io.f1.backend.domain.game.event.RoomUpdatedEvent;
 import io.f1.backend.domain.game.model.GameSetting;
 import io.f1.backend.domain.game.model.Player;
 import io.f1.backend.domain.game.model.Room;
 import io.f1.backend.domain.game.model.RoomState;
 import io.f1.backend.domain.game.store.RoomRepository;
+import io.f1.backend.domain.question.entity.Question;
 import io.f1.backend.domain.quiz.app.QuizService;
 import io.f1.backend.domain.quiz.entity.Quiz;
 import io.f1.backend.global.exception.CustomException;
@@ -19,6 +23,7 @@
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 @Service
@@ -29,7 +34,9 @@ public class GameService {
     private final RoomRepository roomRepository;
     private final ApplicationEventPublisher eventPublisher;
 
-    public GameStartData gameStart(Long roomId, Long quizId) {
+    public GameStartData gameStart(Long roomId, GameStartRequest gameStartRequest) {
+
+        Long quizId = gameStartRequest.quizId();
 
         Room room =
                 roomRepository
@@ -46,21 +53,24 @@ public GameStartData gameStart(Long roomId, Long quizId) {
         Quiz quiz = quizService.getQuizWithQuestionsById(quizId);
 
         // 라운드 수만큼 랜덤 Question 추출
-        GameStartResponse questions = quizService.getRandomQuestionsWithoutAnswer(quizId, round);
+        List<Question> questions = quizService.getRandomQuestionsWithoutAnswer(quizId, round);
+        room.updateQuestions(questions);
+
+        GameStartResponse gameStartResponse = toGameStartResponse(questions);
 
         // 방 정보 게임 중으로 변경
         room.updateRoomState(RoomState.PLAYING);
 
         eventPublisher.publishEvent(new RoomUpdatedEvent(room, quiz));
 
-        return new GameStartData(getDestination(roomId), questions);
+        return new GameStartData(getDestination(roomId), gameStartResponse);
     }
 
     private Integer checkGameSetting(Room room, Long quizId) {
 
         GameSetting gameSetting = room.getGameSetting();
 
-        if (!gameSetting.checkQuizId(quizId)) {
+        if (!gameSetting.validateQuizId(quizId)) {
             throw new CustomException(GameErrorCode.GAME_SETTING_CONFLICT);
         }
 

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

@@ -3,6 +3,8 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.util.Objects;
+
 @Getter
 @AllArgsConstructor
 public class GameSetting {
@@ -11,10 +13,7 @@ public class GameSetting {
     private Integer round; // 게임 변경 시 해당 게임의 총 문제 수로 설정
     private int timeLimit = 60;
 
-    public boolean checkQuizId(Long quizId) {
-        if (this.quizId != null && this.quizId.equals(quizId)) {
-            return false;
-        }
-        return true;
+    public boolean validateQuizId(Long quizId) {
+        return Objects.equals(this.quizId, quizId);
     }
 }

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

@@ -44,6 +44,10 @@ public boolean isHost(Long id) {
         return this.host.getId().equals(id);
     }
 
+    public void updateQuestions(List<Question> questions) {
+        this.questions = questions;
+    }
+
     public void updateHost(Player nextHost) {
         this.host = nextHost;
     }

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

@@ -70,11 +70,12 @@ public void exitRoom(@DestinationVariable Long roomId, Message<?> message) {
     }
 
     @MessageMapping("/room/start/{roomId}")
-    public void gameStart(@DestinationVariable Long roomId, Message<GameStartRequest> message) {
-
-        Long quizId = message.getPayload().quizId();
+    public void gameStart(
+            @DestinationVariable Long roomId,
+            Message<DefaultWebSocketRequest<GameStartRequest>> message) {
 
-        GameStartData gameStartData = gameService.gameStart(roomId, quizId);
+        GameStartData gameStartData =
+                gameService.gameStart(roomId, message.getPayload().getMessage());
 
         String destination = gameStartData.destination();
 

backend/src/main/java/io/f1/backend/domain/quiz/app/QuizService.java

@@ -4,7 +4,6 @@
 
 import static java.nio.file.Files.deleteIfExists;
 
-import io.f1.backend.domain.game.dto.response.GameStartResponse;
 import io.f1.backend.domain.question.app.QuestionService;
 import io.f1.backend.domain.question.dto.QuestionRequest;
 import io.f1.backend.domain.question.entity.Question;
@@ -252,13 +251,13 @@ public QuizQuestionListResponse getQuizWithQuestions(Long quizId) {
     }
 
     @Transactional(readOnly = true)
-    public GameStartResponse getRandomQuestionsWithoutAnswer(Long quizId, Integer round) {
+    public List<Question> getRandomQuestionsWithoutAnswer(Long quizId, Integer round) {
         quizRepository
                 .findById(quizId)
                 .orElseThrow(() -> new NoSuchElementException("존재하지 않는 퀴즈입니다."));
 
         List<Question> randomQuestions = quizRepository.findRandQuestionsByQuizId(quizId, round);
 
-        return toGameStartResponse(randomQuestions);
+        return randomQuestions;
     }
 }

backend/src/main/resources/data.sql

@@ -1,2 +1,2 @@
 INSERT INTO user (id, nickname, provider, provider_id, last_login)
-VALUES (1, 'test-user', 'kakao', 'kakao-1234', NOW());
+VALUES (1, 'test-user', 'kakao', 'kakao-1234', NOW());