fix: resolve conflict

Author: hamlsy

src/main/java/com/kospot/application/multi/flow/PlayerTransitionService.java

@@ -32,12 +32,9 @@ public boolean supports(GameMode gameMode, PlayerMatchType matchType) {
     }
 
     /**
-<<<<<<< HEAD
      * 로드뷰 개인전 시작 컨텍스트를 구성해 게임, 플레이어 정보를 준비
-=======
      * 로드뷰 개인전 시작 컨텍스트를 구성해 게임, 플레이어 정보를 준비한다.
      * Factory로 게임/플레이어 생성을 위임하고, Mapper로 DTO 변환을 위임한다.
->>>>>>> b6ea0d14dbf42f0519020a45269942e57b63af7e
      */
     @Override
     public StartGamePreparation prepare(GameRoom gameRoom,

src/main/java/com/kospot/application/multi/game/strategy/RoadViewSoloStartStrategy.java

@@ -13,6 +13,7 @@
 import com.kospot.infrastructure.exception.payload.code.ErrorStatus;
 import com.kospot.infrastructure.websocket.domain.multi.game.service.GameNotificationService;
 import com.kospot.presentation.multi.flow.dto.message.RoomGameStartMessage;
+import com.kospot.presentation.multi.game.dto.request.MultiGameRequest;
 import com.kospot.presentation.multi.game.dto.response.MultiGameResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -72,7 +73,6 @@ public MultiGameResponse.StartGame execute(Member host, Long gameRoomId) {
         return response;
     }
 
-<<<<<<< HEAD
     private GameMode resolveGameMode(GameRoom gameRoom, MultiGameRequest.Start request) {
         String gameModeKey = request.getGameModeKey();
         if (gameModeKey == null || gameModeKey.isBlank()) {
@@ -88,13 +88,14 @@ private PlayerMatchType resolveMatchType(GameRoom gameRoom, MultiGameRequest.Sta
             return gameRoom.getPlayerMatchType();
         }
         return PlayerMatchType.fromKey(matchTypeKey);
-=======
+    }
+
     private MultiGameStartStrategy findStrategy(GameMode gameMode, PlayerMatchType matchType) {
         return startStrategies.stream()
                 .filter(it -> it.supports(gameMode, matchType))
                 .findFirst()
                 .orElseThrow(() -> new GameHandler(ErrorStatus.GAME_TYPE_NOT_FOUND));
->>>>>>> b6ea0d14dbf42f0519020a45269942e57b63af7e
+
     }
 
 

src/main/java/com/kospot/application/multi/game/usecase/NotifyStartGameUseCase.java

@@ -39,12 +39,8 @@ public class RoundCompletionEventListener {
 
     // Domain Adaptor
     private final MultiRoadViewGameAdaptor multiRoadViewGameAdaptor;
-<<<<<<< HEAD
-    private final GamePlayerAdaptor gamePlayerAdaptor;
-=======
 
     // Infrastructure Services (직접 사용)
->>>>>>> b6ea0d14dbf42f0519020a45269942e57b63af7e
     private final GameRoundNotificationService gameRoundNotificationService;
     private final GameTimerService gameTimerService;
 

src/main/java/com/kospot/application/multi/round/listener/RoundCompletionEventListener.java

@@ -51,7 +51,6 @@ public boolean execute(String gameRoomId, Long gameId, Long roundId,
         return true;
     }
 
-<<<<<<< HEAD
     private boolean completeRoundEarly(String gameRoomId, Long gameId, Long roundId,
                                        GameMode mode, PlayerMatchType matchType) {
         RoadViewGameRound round = roadViewGameRoundAdaptor.queryById(roundId);
@@ -78,8 +77,6 @@ private boolean completeRoundEarly(String gameRoomId, Long gameId, Long roundId,
 
         return true;
     }
-=======
->>>>>>> b6ea0d14dbf42f0519020a45269942e57b63af7e
 
     /**
      * 매치 타입에 따른 예상 제출 수 계산

src/main/java/com/kospot/application/multi/round/roadview/CheckAndCompleteRoundEarlyUseCase.java

@@ -1,11 +1,8 @@
 package com.kospot.application.multi.round.roadview;
 
 import com.kospot.application.multi.flow.MultiGameFlowScheduler;
-<<<<<<< HEAD
 import com.kospot.application.multi.game.service.CancelMultiGameService;
 import com.kospot.domain.multi.game.adaptor.MultiRoadViewGameAdaptor;
-=======
->>>>>>> b6ea0d14dbf42f0519020a45269942e57b63af7e
 import com.kospot.domain.multi.game.entity.MultiRoadViewGame;
 import com.kospot.domain.multi.room.vo.GameRoomStatus;
 import com.kospot.domain.multi.round.entity.RoadViewGameRound;
@@ -38,6 +35,7 @@ public class NextRoadViewRoundUseCase {
 
     // Domain Service
     private final RoundPreparationService roundPreparationService;
+    private final MultiRoadViewGameAdaptor multiRoadViewGameAdaptor;
 
     // Infrastructure Services (직접 사용)
     private final MultiGameRedisService multiGameRedisService;
@@ -52,24 +50,17 @@ public class NextRoadViewRoundUseCase {
      * 모든 플레이어 로딩이 끝난 직후 호출되어 1라운드를 준비한다.
      */
     public MultiRoadViewGameResponse.StartPlayerGame executeInitial(Long roomId, Long gameId) {
-<<<<<<< HEAD
         // 활성 플레이어 검증 (안전장치)
         if (cancelMultiGameService.cancelIfNoActivePlayers(roomId, gameId)) {
             log.info("Game cancelled before initial round - no active players. RoomId: {}, GameId: {}", roomId, gameId);
             return null;
         }
 
-        MultiRoadViewGame game = multiRoadViewGameAdaptor.queryById(gameId);
-        if (game.isInProgress()) {
-            log.info("Game already started - skip initial execution. GameId: {}", gameId);
-=======
         // 도메인 서비스에 라운드 준비 위임
         RoundPreparationService.InitialRoundResult result =
                 roundPreparationService.prepareInitialRound(gameId);
-
         if (result == null) {
             log.info("Initial round already prepared - RoomId: {}, GameId: {}", roomId, gameId);
->>>>>>> b6ea0d14dbf42f0519020a45269942e57b63af7e
             return null;
         }
 
@@ -94,20 +85,14 @@ public MultiRoadViewGameResponse.StartPlayerGame executeInitial(Long roomId, Lon
      * 라운드가 종료된 뒤 다음 라운드를 준비할 때 사용한다.
      */
     public MultiRoadViewGameResponse.NextRound execute(Long roomId, Long gameId) {
-<<<<<<< HEAD
         // 활성 플레이어 검증 (안전장치)
         if (cancelMultiGameService.cancelIfNoActivePlayers(roomId, gameId)) {
             log.info("Game cancelled before next round - no active players. RoomId: {}, GameId: {}", roomId, gameId);
             return null;
         }
-
-        MultiRoadViewGame game = multiRoadViewGameAdaptor.queryById(gameId);
-        game.moveToNextRound();
-=======
         // 도메인 서비스에 라운드 준비 위임
         RoundPreparationService.NextRoundResult result =
                 roundPreparationService.prepareNextRound(gameId);
->>>>>>> b6ea0d14dbf42f0519020a45269942e57b63af7e
 
         String roomKey = roomId.toString();
         long version = multiGameRedisService.incrementRoundVersion(roomKey, result.getRound().getId());
@@ -187,3 +172,4 @@ private void runInTransaction(Runnable runnable) {
         });
     }
 }
+

src/main/java/com/kospot/application/multi/round/roadview/NextRoadViewRoundUseCase.java

@@ -1,6 +1,7 @@
 package com.kospot.presentation.multi.game.controller;
 
-import com.kospot.application.multi.flow.PlayerTransitionService;
+import com.kospot.application.multi.flow.GameTransitionOrchestrator;
+import com.kospot.application.multi.flow.LoadingPhaseService;
 import com.kospot.application.multi.game.websocket.usecase.SendSoloGameMessageUseCase;
 import com.kospot.presentation.chat.dto.request.ChatMessageDto;
 import com.kospot.presentation.multi.game.dto.message.LoadingAckMessage;
@@ -17,15 +18,15 @@
 @RequiredArgsConstructor
 public class MultiGameWebSocketController {
 
-    private final PlayerTransitionService playerTransitionService;
+    private final GameTransitionOrchestrator gameTransitionOrchestrator;
 
     private final SendSoloGameMessageUseCase sendSoloGameMessageUseCase;
 
     @MessageMapping("/room.{roomId}.loading.ack")
     public void handleLoadingAck(@DestinationVariable("roomId") String roomId,
                                  @Payload LoadingAckMessage message,
                                  SimpMessageHeaderAccessor headerAccessor) {
-        playerTransitionService.handleLoadingAck(roomId, message, headerAccessor);
+        gameTransitionOrchestrator.handleLoadingAck(roomId, message, headerAccessor);
     }
 
     @MessageMapping("/room.{roomId}.game.global.chat")

src/main/java/com/kospot/presentation/multi/game/controller/MultiGameWebSocketController.java

@@ -94,7 +94,7 @@ void setUp() {
                 gameTimerService,
                 multiGameFlowScheduler,
                 multiGameRedisService,
-                transactionManager
+                transactionManager,
         );
     }