[feat] 게임 시작 후 게임 진행 + 타이머 기능 추가

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

@@ -1,13 +1,15 @@
 package io.f1.backend.domain.game.app;
 
+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.response.GameStartResponse;
+import io.f1.backend.domain.game.dto.MessageType;
 import io.f1.backend.domain.game.event.RoomUpdatedEvent;
 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.game.websocket.MessageSender;
 import io.f1.backend.domain.question.entity.Question;
 import io.f1.backend.domain.quiz.app.QuizService;
 import io.f1.backend.domain.quiz.entity.Quiz;
@@ -29,11 +31,18 @@
 @RequiredArgsConstructor
 public class GameService {
 
+    private static final int START_DELAY = 5;
+    private static final int CONTINUE_DELAY = 3;
+
+    private final MessageSender messageSender;
+    private final TimerService timerService;
     private final QuizService quizService;
     private final RoomRepository roomRepository;
     private final ApplicationEventPublisher eventPublisher;
 
-    public GameStartResponse gameStart(Long roomId, UserPrincipal principal) {
+    public void gameStart(Long roomId, UserPrincipal principal) {
+
+        String destination = getDestination(roomId);
 
         Room room =
                 roomRepository
@@ -47,13 +56,18 @@ public GameStartResponse gameStart(Long roomId, UserPrincipal principal) {
         List<Question> questions = prepareQuestions(room, quiz);
 
         room.updateQuestions(questions);
-
-        // 방 정보 게임 중으로 변경
+        room.increaseCurrentRound();
         room.updateRoomState(RoomState.PLAYING);
 
         eventPublisher.publishEvent(new RoomUpdatedEvent(room, quiz));
 
-        return toGameStartResponse(questions);
+        timerService.startTimer(room, START_DELAY);
+
+        messageSender.send(destination, MessageType.GAME_START, toGameStartResponse(questions));
+        messageSender.send(
+                destination,
+                MessageType.QUESTION_START,
+                toQuestionStartResponse(room, START_DELAY));
     }
 
     private boolean validateReadyStatus(Room room) {
@@ -83,4 +97,8 @@ private List<Question> prepareQuestions(Room room, Quiz quiz) {
         Integer round = room.getGameSetting().getRound();
         return quizService.getRandomQuestionsWithoutAnswer(quizId, round);
     }
+
+    private String getDestination(Long roomId) {
+        return "/sub/room/" + roomId;
+    }
 }

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

@@ -56,12 +56,18 @@
 @RequiredArgsConstructor
 public class RoomService {
 
+    private final TimerService timerService;
     private final QuizService quizService;
     private final RoomRepository roomRepository;
     private final AtomicLong roomIdGenerator = new AtomicLong(0);
     private final ApplicationEventPublisher eventPublisher;
     private final Map<Long, Object> roomLocks = new ConcurrentHashMap<>();
+
     private final MessageSender messageSender;
+
+    private static final int START_DELAY = 5;
+    private static final int CONTINUE_DELAY = 3;
+
     private static final String PENDING_SESSION_ID = "PENDING_SESSION_ID";
 
     public RoomCreateResponse saveRoom(RoomCreateRequest request) {
@@ -244,13 +250,26 @@ public void chat(Long roomId, String sessionId, ChatMessage chatMessage) {
             messageSender.send(
                     destination,
                     MessageType.QUESTION_RESULT,
-                    toQuestionResultResponse(currentQuestion.getId(), chatMessage, answer));
+                    toQuestionResultResponse(chatMessage.nickname(), answer));
             messageSender.send(destination, MessageType.RANK_UPDATE, toRankUpdateResponse(room));
             messageSender.send(
                     destination,
                     MessageType.SYSTEM_NOTICE,
-                    ofPlayerEvent(chatMessage.nickname(), RoomEventType.ENTER));
+                    ofPlayerEvent(chatMessage.nickname(), RoomEventType.CORRECT_ANSWER));
         }
+
+        timerService.cancelTimer(room);
+
+        // TODO : 게임 종료 로직 추가
+        if (!timerService.validateCurrentRound(room)) {
+            // 게임 종료 로직
+            return;
+        }
+
+        room.increaseCurrentRound();
+
+        // 타이머 추가하기
+        timerService.startTimer(room, CONTINUE_DELAY);
     }
 
     private Player getRemovePlayer(Room room, String sessionId, UserPrincipal principal) {

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

@@ -0,0 +1,92 @@
+package io.f1.backend.domain.game.app;
+
+import static io.f1.backend.domain.game.mapper.RoomMapper.ofPlayerEvent;
+import static io.f1.backend.domain.game.mapper.RoomMapper.toQuestionResultResponse;
+import static io.f1.backend.domain.game.mapper.RoomMapper.toQuestionStartResponse;
+
+import io.f1.backend.domain.game.dto.MessageType;
+import io.f1.backend.domain.game.dto.RoomEventType;
+import io.f1.backend.domain.game.model.Room;
+import io.f1.backend.domain.game.websocket.MessageSender;
+
+import lombok.RequiredArgsConstructor;
+
+import org.springframework.stereotype.Service;
+
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+@Service
+@RequiredArgsConstructor
+public class TimerService {
+
+    private final MessageSender messageSender;
+
+    private static final String NONE_CORRECT_USER = "";
+    private static final int CONTINUE_DELAY = 3;
+
+    public void startTimer(Room room, int delaySec) {
+        cancelTimer(room);
+
+        ScheduledFuture<?> timer =
+                room.getScheduler()
+                        .schedule(
+                                () -> {
+                                    handleTimeout(room);
+                                },
+                                delaySec + room.getGameSetting().getTimeLimit(),
+                                TimeUnit.SECONDS);
+
+        room.updateTimer(timer);
+    }
+
+    private void handleTimeout(Room room) {
+        String destination = getDestination(room.getId());
+
+        messageSender.send(
+                destination,
+                MessageType.QUESTION_RESULT,
+                toQuestionResultResponse(NONE_CORRECT_USER, room.getCurrentQuestion().getAnswer()));
+        messageSender.send(
+                destination,
+                MessageType.SYSTEM_NOTICE,
+                ofPlayerEvent(NONE_CORRECT_USER, RoomEventType.TIMEOUT));
+
+        // TODO : 게임 종료 로직
+        if (!validateCurrentRound(room)) {
+            // 게임 종료 로직
+            // GAME_SETTING, PLAYER_LIST, GAME_RESULT, ROOM_SETTING
+            return;
+        }
+
+        // 다음 문제 출제
+        room.increaseCurrentRound();
+
+        startTimer(room, CONTINUE_DELAY);
+        messageSender.send(
+                destination,
+                MessageType.QUESTION_START,
+                toQuestionStartResponse(room, CONTINUE_DELAY));
+    }
+
+    public boolean validateCurrentRound(Room room) {
+        if (room.getGameSetting().getRound() != room.getCurrentRound()) {
+            return true;
+        }
+        cancelTimer(room);
+        room.getScheduler().shutdown();
+        return false;
+    }
+
+    public void cancelTimer(Room room) {
+        // 정답 맞혔어요 ~ 타이머 캔슬 부탁
+        ScheduledFuture<?> timer = room.getTimer();
+        if (timer != null && !timer.isDone()) {
+            timer.cancel(false);
+        }
+    }
+
+    private String getDestination(Long roomId) {
+        return "/sub/room/" + roomId;
+    }
+}

backend/src/main/java/io/f1/backend/domain/game/dto/GameEventType.java

@@ -0,0 +1,6 @@
+package io.f1.backend.domain.game.dto;
+
+public enum GameEventType {
+    START,
+    CONTINUE
+}

backend/src/main/java/io/f1/backend/domain/game/dto/GameStartData.java

@@ -0,0 +1,7 @@
+package io.f1.backend.domain.game.dto;
+
+import io.f1.backend.domain.game.dto.response.GameStartResponse;
+import io.f1.backend.domain.game.dto.response.QuestionStartResponse;
+
+public record GameStartData(
+        GameStartResponse gameStartResponse, QuestionStartResponse questionStartResponse) {}

backend/src/main/java/io/f1/backend/domain/game/dto/MessageType.java

@@ -9,4 +9,5 @@ public enum MessageType {
     CHAT,
     QUESTION_RESULT,
     RANK_UPDATE,
+    QUESTION_START
 }

backend/src/main/java/io/f1/backend/domain/game/dto/RoomEventType.java

@@ -5,4 +5,6 @@ public enum RoomEventType {
     EXIT,
     START,
     END,
+    CORRECT_ANSWER,
+    TIMEOUT
 }

backend/src/main/java/io/f1/backend/domain/game/dto/response/QuestionResultResponse.java

@@ -1,3 +1,3 @@
 package io.f1.backend.domain.game.dto.response;
 
-public record QuestionResultResponse(Long questionId, String correctUser, String answer) {}
+public record QuestionResultResponse(String correctUser, String answer) {}

backend/src/main/java/io/f1/backend/domain/game/dto/response/QuestionStartResponse.java

@@ -0,0 +1,5 @@
+package io.f1.backend.domain.game.dto.response;
+
+import java.time.Instant;
+
+public record QuestionStartResponse(Long questionId, int round, Instant timestamp) {}

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

@@ -1,13 +1,13 @@
 package io.f1.backend.domain.game.mapper;
 
-import io.f1.backend.domain.game.dto.ChatMessage;
 import io.f1.backend.domain.game.dto.Rank;
 import io.f1.backend.domain.game.dto.RoomEventType;
 import io.f1.backend.domain.game.dto.request.RoomCreateRequest;
 import io.f1.backend.domain.game.dto.response.GameSettingResponse;
 import io.f1.backend.domain.game.dto.response.PlayerListResponse;
 import io.f1.backend.domain.game.dto.response.PlayerResponse;
 import io.f1.backend.domain.game.dto.response.QuestionResultResponse;
+import io.f1.backend.domain.game.dto.response.QuestionStartResponse;
 import io.f1.backend.domain.game.dto.response.QuizResponse;
 import io.f1.backend.domain.game.dto.response.RankUpdateResponse;
 import io.f1.backend.domain.game.dto.response.RoomResponse;
@@ -91,13 +91,17 @@ public static SystemNoticeResponse ofPlayerEvent(String nickname, RoomEventType
             message = " 님이 입장하셨습니다";
         } else if (roomEventType == RoomEventType.EXIT) {
             message = " 님이 퇴장하셨습니다";
+        } else if (roomEventType == RoomEventType.CORRECT_ANSWER) {
+            message = " 님 정답입니다 !";
+        } else if (roomEventType == RoomEventType.TIMEOUT) {
+            message = "땡 ~ ⏰ 제한 시간 초과!";
         }
         return new SystemNoticeResponse(nickname + message, Instant.now());
     }
 
     public static QuestionResultResponse toQuestionResultResponse(
-            Long questionId, ChatMessage chatMessage, String answer) {
-        return new QuestionResultResponse(questionId, chatMessage.nickname(), answer);
+            String correctUser, String answer) {
+        return new QuestionResultResponse(correctUser, answer);
     }
 
     public static RankUpdateResponse toRankUpdateResponse(Room room) {
@@ -107,4 +111,11 @@ public static RankUpdateResponse toRankUpdateResponse(Room room) {
                         .map(player -> new Rank(player.getNickname(), player.getCorrectCount()))
                         .toList());
     }
+
+    public static QuestionStartResponse toQuestionStartResponse(Room room, int delay) {
+        return new QuestionStartResponse(
+                room.getCurrentQuestion().getId(),
+                room.getCurrentRound(),
+                Instant.now().plusSeconds(delay));
+    }
 }

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

@@ -11,7 +11,7 @@ public class GameSetting {
 
     private Long quizId;
     private Integer round; // 게임 변경 시 해당 게임의 총 문제 수로 설정
-    private int timeLimit = 60;
+    private int timeLimit;
 
     public boolean validateQuizId(Long quizId) {
         return Objects.equals(this.quizId, quizId);

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

@@ -9,6 +9,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
 
 @Getter
 public class Room {
@@ -33,6 +36,10 @@ public class Room {
 
     private int currentRound = 0;
 
+    private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
+
+    private ScheduledFuture<?> timer;
+
     public Room(Long id, RoomSetting roomSetting, GameSetting gameSetting, Player host) {
         this.id = id;
         this.roomSetting = roomSetting;
@@ -56,6 +63,10 @@ public void updateRoomState(RoomState newState) {
         this.state = newState;
     }
 
+    public void updateTimer(ScheduledFuture<?> timer) {
+        this.timer = timer;
+    }
+
     public void removeUserId(Long id) {
         this.userIdSessionMap.remove(id);
     }
@@ -76,7 +87,7 @@ public Boolean isPlaying() {
         return state == RoomState.PLAYING;
     }
 
-    public void increaseCorrectCount() {
+    public void increaseCurrentRound() {
         currentRound++;
     }
 }

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

@@ -20,8 +20,6 @@
 @RequiredArgsConstructor
 public class GameSocketController {
 
-    // todo 삭제
-    private final MessageSender messageSender;
     private final RoomService roomService;
     private final GameService gameService;
 
@@ -65,9 +63,4 @@ public void playerReady(@DestinationVariable Long roomId, Message<?> message) {
 
         roomService.handlePlayerReady(roomId, getSessionId(message));
     }
-
-    // todo 삭제
-    private String getDestination(Long roomId) {
-        return "/sub/room/" + roomId;
-    }
 }

backend/src/test/java/io/f1/backend/domain/game/app/RoomServiceTests.java

@@ -45,13 +45,16 @@ class RoomServiceTests {
 
     @Mock private RoomRepository roomRepository;
     @Mock private QuizService quizService;
+    @Mock private TimerService timerService;
     @Mock private ApplicationEventPublisher eventPublisher;
     @Mock private MessageSender messageSender;
 
     @BeforeEach
     void setUp() {
         MockitoAnnotations.openMocks(this); // @Mock 어노테이션이 붙은 필드들을 초기화합니다.
-        roomService = new RoomService(quizService, roomRepository, eventPublisher, messageSender);
+        roomService =
+                new RoomService(
+                        timerService, quizService, roomRepository, eventPublisher, messageSender);
 
         SecurityContextHolder.clearContext();
     }