♻️ refactor: 불필요 정보 조회 쿼리 변경

- 퀴즈가 문제의 정보까지 fetch join하는 쿼리에서 findQuizById 쿼리로 문제는 Lazy 로딩하도록 변경

Author: LimKangHyun

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

@@ -77,14 +77,15 @@ public void gameStart(Long roomId, UserPrincipal principal) {
         validateRoomStart(room, principal);
 
         Long quizId = room.getGameSetting().getQuizId();
-        Quiz quiz = quizService.getQuizWithQuestionsById(quizId);
+        Quiz quiz = quizService.findQuizById(quizId);
+        Long questionsCount = quizService.getQuestionsCount(quizId);
         List<Question> questions = prepareQuestions(room, quiz);
 
         room.updateQuestions(questions);
         room.increaseCurrentRound();
         room.updateRoomState(RoomState.PLAYING);
 
-        eventPublisher.publishEvent(new RoomUpdatedEvent(room, quiz));
+        eventPublisher.publishEvent(new RoomUpdatedEvent(room, quiz, questionsCount));
 
         timerService.startTimer(room, START_DELAY);
 
@@ -210,7 +211,10 @@ public void gameEnd(Room room) {
                 MessageType.GAME_SETTING,
                 toGameSettingResponse(
                         room.getGameSetting(),
-                        quizService.getQuizWithQuestionsById(room.getGameSetting().getQuizId())));
+                        quizService.findQuizById(room.getGameSetting().getQuizId()),
+                        room.getRound()
+                )
+        );
         messageSender.sendBroadcast(
                 destination, MessageType.ROOM_SETTING, toRoomSettingResponse(room));
     }
@@ -315,10 +319,11 @@ private void toggleReadyIfPossible(Room room, Player player) {
 
     private void broadcastGameSetting(Room room) {
         String destination = getDestination(room.getId());
-        Quiz quiz = quizService.getQuizWithQuestionsById(room.getGameSetting().getQuizId());
+        Quiz quiz = quizService.findQuizById(room.getGameSetting().getQuizId());
+        Long questionsCount = quizService.getQuestionsCount(quiz.getId());
         messageSender.sendBroadcast(
                 destination,
                 MessageType.GAME_SETTING,
-                toGameSettingResponse(room.getGameSetting(), quiz));
+                toGameSettingResponse(room.getGameSetting(), quiz, questionsCount));
     }
 }

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

@@ -106,7 +106,7 @@ public RoomCreateResponse saveRoom(RoomCreateRequest request) {
                 host.getId(),
                 () -> exitIfInAnotherRoom(room, getCurrentUserPrincipal()));
 
-        eventPublisher.publishEvent(new RoomCreatedEvent(room, quiz));
+        eventPublisher.publishEvent(new RoomCreatedEvent(room, quiz, gameSetting.getRound()));
 
         return new RoomCreateResponse(newId);
     }
@@ -205,7 +205,7 @@ public void initializeRoomSocket(Long roomId, UserPrincipal principal) {
                                 Quiz quiz = quizService.getQuizWithQuestionsById(quizId);
 
                                 GameSettingResponse gameSettingResponse =
-                                        toGameSettingResponse(room.getGameSetting(), quiz);
+                                        toGameSettingResponse(room.getGameSetting(), quiz, quiz.getQuestions().size());
 
                                 PlayerListResponse playerListResponse = toPlayerListResponse(room);
 
@@ -231,7 +231,7 @@ public void initializeRoomSocket(Long roomId, UserPrincipal principal) {
                                         MessageType.SYSTEM_NOTICE,
                                         systemNoticeResponse);
 
-                                eventPublisher.publishEvent(new RoomUpdatedEvent(room, quiz));
+                                eventPublisher.publishEvent(new RoomUpdatedEvent(room, quiz, quiz.getQuestions().size()));
                             });
                 });
     }
@@ -286,9 +286,9 @@ public RoomListResponse getAllRooms() {
                         .map(
                                 room -> {
                                     Long quizId = room.getGameSetting().getQuizId();
-                                    Quiz quiz = quizService.getQuizWithQuestionsById(quizId);
-
-                                    return toRoomResponse(room, quiz);
+                                    Quiz quiz = quizService.findQuizById(quizId);
+                                    Long questionsCount = quizService.getQuestionsCount(quizId);
+                                    return toRoomResponse(room, quiz, questionsCount);
                                 })
                         .toList();
         return new RoomListResponse(roomResponses);
@@ -332,10 +332,11 @@ public void reconnectSendResponse(Long roomId, UserPrincipal principal) {
 
             Long quizId = room.getGameSetting().getQuizId();
 
-            Quiz quiz = quizService.getQuizWithQuestionsById(quizId);
+            Quiz quiz = quizService.findQuizById(quizId);
+            Long questionsCount = quizService.getQuestionsCount(quizId);
 
             GameSettingResponse gameSettingResponse =
-                    toGameSettingResponse(room.getGameSetting(), quiz);
+                    toGameSettingResponse(room.getGameSetting(), quiz, questionsCount);
 
             PlayerListResponse playerListResponse = toPlayerListResponse(room);
 
@@ -475,9 +476,10 @@ private void cleanRoom(Room room, Player player) {
         room.removePlayer(player);
 
         Long quizId = room.getQuizId();
-        Quiz quiz = quizService.getQuizWithQuestionsById(quizId);
+        Quiz quiz = quizService.findQuizById(quizId);
+        Long questionsCount = quizService.getQuestionsCount(quizId);
 
-        eventPublisher.publishEvent(new RoomUpdatedEvent(room, quiz));
+        eventPublisher.publishEvent(new RoomUpdatedEvent(room, quiz, questionsCount));
     }
 
     public void handleDisconnectedPlayers(Room room, List<Player> disconnectedPlayers) {

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

@@ -44,7 +44,9 @@ public void afterChange(
         RoomUpdatedEvent roomUpdatedEvent =
                 new RoomUpdatedEvent(
                         room,
-                        quizService.getQuizWithQuestionsById(room.getGameSetting().getQuizId()));
+                        quizService.findQuizById(room.getGameSetting().getQuizId()),
+                        room.getGameSetting().getRound()
+                );
 
         eventPublisher.publishEvent(roomUpdatedEvent);
     }

backend/src/main/java/io/f1/backend/domain/game/event/RoomCreatedEvent.java

@@ -3,4 +3,4 @@
 import io.f1.backend.domain.game.model.Room;
 import io.f1.backend.domain.quiz.entity.Quiz;
 
-public record RoomCreatedEvent(Room room, Quiz quiz) {}
+public record RoomCreatedEvent(Room room, Quiz quiz, long questionSize) {}

backend/src/main/java/io/f1/backend/domain/game/event/RoomUpdatedEvent.java

@@ -3,4 +3,4 @@
 import io.f1.backend.domain.game.model.Room;
 import io.f1.backend.domain.quiz.entity.Quiz;
 
-public record RoomUpdatedEvent(Room room, Quiz quiz) {}
+public record RoomUpdatedEvent(Room room, Quiz quiz, long questionSize) {}

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

@@ -51,9 +51,9 @@ public static RoomSettingResponse toRoomSettingResponse(Room room) {
                 room.getRoomSetting().locked());
     }
 
-    public static GameSettingResponse toGameSettingResponse(GameSetting gameSetting, Quiz quiz) {
+    public static GameSettingResponse toGameSettingResponse(GameSetting gameSetting, Quiz quiz, long questionsCount) {
         return new GameSettingResponse(
-                gameSetting.getRound(), gameSetting.getTimeLimit(), toQuizResponse(quiz));
+                gameSetting.getRound(), gameSetting.getTimeLimit(), toQuizResponse(quiz, questionsCount));
     }
 
     public static PlayerListResponse toPlayerListResponse(Room room) {
@@ -66,7 +66,7 @@ public static PlayerListResponse toPlayerListResponse(Room room) {
                 room.getHost().getNickname(), playerResponseList, playerResponseList.size());
     }
 
-    public static RoomResponse toRoomResponse(Room room, Quiz quiz) {
+    public static RoomResponse toRoomResponse(Room room, Quiz quiz, long questionsCount) {
         return new RoomResponse(
                 room.getId(),
                 room.getRoomSetting().roomName(),
@@ -77,17 +77,17 @@ public static RoomResponse toRoomResponse(Room room, Quiz quiz) {
                 quiz.getTitle(),
                 quiz.getDescription(),
                 quiz.getCreator().getNickname(),
-                quiz.getQuestions().size(),
+                (int) questionsCount,
                 quiz.getThumbnailUrl());
     }
 
-    public static QuizResponse toQuizResponse(Quiz quiz) {
+    public static QuizResponse toQuizResponse(Quiz quiz, long questionsCount) {
         return new QuizResponse(
                 quiz.getId(),
                 quiz.getTitle(),
                 quiz.getDescription(),
                 quiz.getThumbnailUrl(),
-                quiz.getQuestions().size());
+                (int) questionsCount);
     }
 
     public static SystemNoticeResponse ofPlayerEvent(String nickname, RoomEventType roomEventType) {

backend/src/main/java/io/f1/backend/domain/game/sse/dto/RoomCreatedPayload.java

@@ -10,5 +10,5 @@ public record RoomCreatedPayload(
         String quizTitle,
         String description,
         String creator,
-        int numberOfQuestion,
+        int numberOfQuestions,
         String thumbnailUrl) {}

backend/src/main/java/io/f1/backend/domain/game/sse/dto/RoomUpdatedPayload.java

@@ -7,5 +7,5 @@ public record RoomUpdatedPayload(
         String quizTitle,
         String description,
         String creator,
-        int numberOfQuestion,
+        int numberOfQuestions,
         String thumbnailUrl) {}

backend/src/main/java/io/f1/backend/domain/game/sse/mapper/SseMapper.java

@@ -16,6 +16,7 @@ public class SseMapper {
     public static LobbySseEvent<RoomCreatedPayload> fromRoomCreated(RoomCreatedEvent event) {
         Room room = event.room();
         Quiz quiz = event.quiz();
+        long questionSize = event.questionSize();
         RoomCreatedPayload payload =
                 new RoomCreatedPayload(
                         room.getId(),
@@ -27,14 +28,15 @@ public static LobbySseEvent<RoomCreatedPayload> fromRoomCreated(RoomCreatedEvent
                         quiz.getTitle(),
                         quiz.getDescription(),
                         quiz.getCreator().getNickname(),
-                        quiz.getQuestions().size(),
+                        (int) questionSize,
                         quiz.getThumbnailUrl());
         return new LobbySseEvent<>(SseEventType.CREATE.name(), payload);
     }
 
     public static LobbySseEvent<RoomUpdatedPayload> fromRoomUpdated(RoomUpdatedEvent event) {
         Room room = event.room();
         Quiz quiz = event.quiz();
+        long questionSize = event.questionSize();
         RoomUpdatedPayload payload =
                 new RoomUpdatedPayload(
                         room.getId(),
@@ -43,7 +45,7 @@ public static LobbySseEvent<RoomUpdatedPayload> fromRoomUpdated(RoomUpdatedEvent
                         quiz.getTitle(),
                         quiz.getDescription(),
                         quiz.getCreator().getNickname(),
-                        quiz.getQuestions().size(),
+                        (int) questionSize,
                         quiz.getThumbnailUrl());
         return new LobbySseEvent<>(SseEventType.UPDATE.name(), payload);
     }