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

Author: silver-eunjoo

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

@@ -1,26 +1,33 @@
 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;
 import io.f1.backend.global.exception.errorcode.GameErrorCode;
 import io.f1.backend.global.exception.errorcode.RoomErrorCode;
 
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class GameService {
@@ -29,7 +36,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,14 +55,17 @@ 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) {

backend/src/main/java/io/f1/backend/domain/game/dto/request/DefaultWebSocketRequest.java

@@ -0,0 +1,14 @@
+package io.f1.backend.domain.game.dto.request;
+
+import io.f1.backend.domain.game.dto.MessageType;
+import io.f1.backend.domain.game.dto.WebSocketDto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class DefaultWebSocketRequest<T> implements WebSocketDto<T> {
+    private final MessageType type;
+    private final T message;
+}

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

@@ -13,8 +13,8 @@ public class GameSetting {
 
     public boolean checkQuizId(Long quizId) {
         if (this.quizId != null && this.quizId.equals(quizId)) {
-            return false;
+            return true;
         }
-        return true;
+        return false;
     }
 }

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

@@ -42,6 +42,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

@@ -6,16 +6,19 @@
 import io.f1.backend.domain.game.dto.MessageType;
 import io.f1.backend.domain.game.dto.RoomExitData;
 import io.f1.backend.domain.game.dto.RoomInitialData;
+import io.f1.backend.domain.game.dto.request.DefaultWebSocketRequest;
 import io.f1.backend.domain.game.dto.request.GameStartRequest;
 
 import lombok.RequiredArgsConstructor;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.handler.annotation.DestinationVariable;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
 import org.springframework.stereotype.Controller;
 
+@Slf4j
 @Controller
 @RequiredArgsConstructor
 public class GameSocketController {
@@ -61,11 +64,9 @@ public void exitRoom(@DestinationVariable Long roomId, Message<?> message) {
     }
 
     @MessageMapping("/room/start/{roomId}")
-    public void gameStart(@DestinationVariable Long roomId, Message<GameStartRequest> message) {
+    public void gameStart(@DestinationVariable Long roomId, Message<DefaultWebSocketRequest<GameStartRequest>> message) {
 
-        Long quizId = message.getPayload().quizId();
-
-        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

@@ -252,13 +252,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,16 @@
 INSERT INTO user (id, nickname, provider, provider_id, last_login)
 VALUES (1, 'test-user', 'kakao', 'kakao-1234', NOW());
+
+-- INSERT INTO quiz (
+--     title,
+--     description,
+--     quiz_type,
+--     thumbnail_url,
+--     creator_id
+-- ) VALUES (
+--              '기본 상식 퀴즈',
+--              '일반 상식을 테스트하는 쉬운 퀴즈입니다.',
+--              'TEXT',             -- Enum 타입: QuizType에 따라 값 조정
+--              'https://example.com/thumbnail.png',
+--              1
+--          );