✨ feat : 게임 종료 로직 구현

silver-eunjoo · silver-eunjoo · commit 6f3b0e7bdb89 · 2025-07-22T14:40:07.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
@@ -1,10 +1,16 @@
 package io.f1.backend.domain.game.app;
 
+import static io.f1.backend.domain.game.mapper.RoomMapper.toGameResultListResponse;
+import static io.f1.backend.domain.game.mapper.RoomMapper.toGameSettingResponse;
+import static io.f1.backend.domain.game.mapper.RoomMapper.toPlayerListResponse;
 import static io.f1.backend.domain.game.mapper.RoomMapper.toQuestionStartResponse;
+import static io.f1.backend.domain.game.mapper.RoomMapper.toRoomSetting;
+import static io.f1.backend.domain.game.mapper.RoomMapper.toRoomSettingResponse;
 import static io.f1.backend.domain.game.websocket.WebSocketUtils.getDestination;
 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.response.GameResultResponse;
 import io.f1.backend.domain.game.event.RoomUpdatedEvent;
 import io.f1.backend.domain.game.model.Player;
 import io.f1.backend.domain.game.model.Room;
@@ -19,6 +25,7 @@
 import io.f1.backend.global.exception.errorcode.GameErrorCode;
 import io.f1.backend.global.exception.errorcode.RoomErrorCode;
 
+import java.util.ArrayList;
 import lombok.RequiredArgsConstructor;
 
 import org.springframework.context.ApplicationEventPublisher;
@@ -70,6 +77,28 @@ public void gameStart(Long roomId, UserPrincipal principal) {
                 toQuestionStartResponse(room, START_DELAY));
     }
 
+    public void gameEnd(Room room) {
+        room.updateRoomState(RoomState.FINISHED);
+
+        Long roomId = room.getId();
+        String destination = getDestination(roomId);
+
+        Map<String, Player> playerSessionMap = room.getPlayerSessionMap();
+
+        messageSender.send(destination, MessageType.GAME_SETTING, toGameSettingResponse(room.getGameSetting(), room.getCurrentQuestion()
+            .getQuiz()));
+        messageSender.send(destination, MessageType.PLAYER_LIST, toPlayerListResponse(room));
+        messageSender.send(destination, MessageType.ROOM_SETTING, toRoomSettingResponse(room));
+        messageSender.send(destination, MessageType.GAME_RESULT, toGameResultListResponse(playerSessionMap, room.getGameSetting().getRound()));
+
+        room.initializeRound();
+        for (Player player : playerSessionMap.values()) {
+            player.initializeCorrectCount();
+            player.toggleReady();
+        }
+        room.updateRoomState(RoomState.WAITING);
+    }
+
     private boolean validateReadyStatus(Room room) {
 
         Map<String, Player> playerSessionMap = room.getPlayerSessionMap();
diff --git a/backend/src/main/java/io/f1/backend/domain/game/app/RoomService.java b/backend/src/main/java/io/f1/backend/domain/game/app/RoomService.java
@@ -59,6 +59,7 @@
 @RequiredArgsConstructor
 public class RoomService {
 
+    private final GameService gameService;
     private final TimerService timerService;
     private final QuizService quizService;
     private final RoomRepository roomRepository;
@@ -263,9 +264,8 @@ public void chat(Long roomId, String sessionId, ChatMessage chatMessage) {
 
             timerService.cancelTimer(room);
 
-            // TODO : 게임 종료 로직 추가
             if (!timerService.validateCurrentRound(room)) {
-                // 게임 종료 로직
+                gameService.gameEnd(room);
                 return;
             }
 
diff --git a/backend/src/main/java/io/f1/backend/domain/game/app/TimerService.java b/backend/src/main/java/io/f1/backend/domain/game/app/TimerService.java
@@ -26,6 +26,8 @@ public class TimerService {
     private static final String NONE_CORRECT_USER = "";
     private static final int CONTINUE_DELAY = 3;
 
+    private final GameService gameService;
+
     public void startTimer(Room room, int delaySec) {
         cancelTimer(room);
 
@@ -53,14 +55,11 @@ private void handleTimeout(Room room) {
                 MessageType.SYSTEM_NOTICE,
                 ofPlayerEvent(NONE_CORRECT_USER, RoomEventType.TIMEOUT));
 
-        // TODO : 게임 종료 로직
         if (!validateCurrentRound(room)) {
-            // 게임 종료 로직
-            // GAME_SETTING, PLAYER_LIST, GAME_RESULT, ROOM_SETTING
+            gameService.gameEnd(room);
             return;
         }
 
-        // 다음 문제 출제
         room.increaseCurrentRound();
 
         startTimer(room, CONTINUE_DELAY);
diff --git a/backend/src/main/java/io/f1/backend/domain/game/dto/MessageType.java b/backend/src/main/java/io/f1/backend/domain/game/dto/MessageType.java
@@ -9,5 +9,6 @@ public enum MessageType {
     CHAT,
     QUESTION_RESULT,
     RANK_UPDATE,
-    QUESTION_START
+    QUESTION_START,
+    GAME_RESULT
 }
diff --git a/backend/src/main/java/io/f1/backend/domain/game/dto/response/GameResultListResponse.java b/backend/src/main/java/io/f1/backend/domain/game/dto/response/GameResultListResponse.java
@@ -0,0 +1,7 @@
+package io.f1.backend.domain.game.dto.response;
+
+import java.util.List;
+
+public record GameResultListResponse(List<GameResultResponse> result) {
+
+}
diff --git a/backend/src/main/java/io/f1/backend/domain/game/dto/response/GameResultResponse.java b/backend/src/main/java/io/f1/backend/domain/game/dto/response/GameResultResponse.java
@@ -0,0 +1,4 @@
+package io.f1.backend.domain.game.dto.response;
+
+public record GameResultResponse(String nickname, int score, int totalCorrectCount, int rank) {
+}
diff --git a/backend/src/main/java/io/f1/backend/domain/game/mapper/RoomMapper.java b/backend/src/main/java/io/f1/backend/domain/game/mapper/RoomMapper.java
@@ -3,6 +3,8 @@
 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.GameResultListResponse;
+import io.f1.backend.domain.game.dto.response.GameResultResponse;
 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;
@@ -21,8 +23,10 @@
 import io.f1.backend.domain.quiz.entity.Quiz;
 
 import java.time.Instant;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 
 public class RoomMapper {
 
@@ -109,4 +113,40 @@ public static QuestionStartResponse toQuestionStartResponse(Room room, int delay
                 room.getCurrentRound(),
                 Instant.now().plusSeconds(delay));
     }
+
+    public static GameResultResponse toGameResultResponse(Player player, int round, int rank, int totalPlayers) {
+        double correctRate = (double) player.getCorrectCount() / round;
+        int score = (int) (correctRate * 100) + (totalPlayers - rank) * 5;
+
+        return new GameResultResponse(player.nickname, score, player.getCorrectCount(), rank);
+    }
+
+    public static GameResultListResponse toGameResultListResponse(Map<String, Player> playerSessionMap, int round) {
+
+        List<Player> rankedPlayers = playerSessionMap.values().stream()
+            .sorted(Comparator.comparingInt(Player::getCorrectCount).reversed())
+            .toList();
+
+        int totalPlayers = rankedPlayers.size();
+
+        int prevCorrectCnt = -1;
+        int rank = 0;
+
+        List<GameResultResponse> gameResults = new ArrayList<>();
+        for(int i=0; i<totalPlayers; i++) {
+            Player player = rankedPlayers.get(i);
+
+            int correctCnt = player.getCorrectCount();
+
+            if(prevCorrectCnt != correctCnt) {
+                rank = i + 1;
+            }
+
+            gameResults.add(toGameResultResponse(player, round, rank, totalPlayers));
+            prevCorrectCnt = correctCnt;
+        }
+
+        return new GameResultListResponse(gameResults);
+    }
 }
+
diff --git a/backend/src/main/java/io/f1/backend/domain/game/model/Player.java b/backend/src/main/java/io/f1/backend/domain/game/model/Player.java
@@ -27,4 +27,8 @@ public void toggleReady() {
     public void increaseCorrectCount() {
         correctCount++;
     }
+
+    public void initializeCorrectCount() {
+        correctCount = 0;
+    }
 }
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
@@ -90,4 +90,8 @@ public Boolean isPlaying() {
     public void increaseCurrentRound() {
         currentRound++;
     }
+
+    public void initializeRound() {
+        currentRound = 0;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,6 @@ public enum MessageType {`
`9`	`9`	`CHAT,`
`10`	`10`	`QUESTION_RESULT,`
`11`	`11`	`RANK_UPDATE,`
`12`		`- QUESTION_START`
	`12`	`+ QUESTION_START,`
	`13`	`+ GAME_RESULT`
`13`	`14`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +package io.f1.backend.domain.game.dto.response;
++
 +public record GameResultResponse(String nickname, int score, int totalCorrectCount, int rank) {
 +}
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,8 @@ public void toggleReady() {`
`27`	`27`	`public void increaseCorrectCount() {`
`28`	`28`	`correctCount++;`
`29`	`29`	`}`
	`30`	`+`
	`31`	`+ public void initializeCorrectCount() {`
	`32`	`+ correctCount = 0;`
	`33`	`+ }`
`30`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,4 +90,8 @@ public Boolean isPlaying() {`
`90`	`90`	`public void increaseCurrentRound() {`
`91`	`91`	`currentRound++;`
`92`	`92`	`}`
	`93`	`+`
	`94`	`+ public void initializeRound() {`
	`95`	`+ currentRound = 0;`
	`96`	`+ }`
`93`	`97`	`}`