diff --git a/apps/server/src/application/coordinators/readyForGameCoordinator.ts b/apps/server/src/application/coordinators/readyForGameCoordinator.ts index c87243b..41e1836 100644 --- a/apps/server/src/application/coordinators/readyForGameCoordinator.ts +++ b/apps/server/src/application/coordinators/readyForGameCoordinator.ts @@ -4,15 +4,15 @@ */ import { type GameOutputPort, - type GameRoomLookupPort, type ReadyForGamePort, } from "@server/domains/game/application/ports/gameUseCasePorts"; +import type { FindRoomByPlayerPort } from "@server/domains/room/application/ports/roomUseCasePorts"; import { readyForGameUseCase } from "@server/domains/game/application/useCases/readyForGameUseCase"; type ReadyForGameCoordinatorParams = { socketId: string; gameManager: ReadyForGamePort; - roomManager: GameRoomLookupPort; + roomManager: FindRoomByPlayerPort; output: Pick; }; diff --git a/apps/server/src/domains/game/application/ports/gameUseCasePorts.ts b/apps/server/src/domains/game/application/ports/gameUseCasePorts.ts index a269b40..249545b 100644 --- a/apps/server/src/domains/game/application/ports/gameUseCasePorts.ts +++ b/apps/server/src/domains/game/application/ports/gameUseCasePorts.ts @@ -36,11 +36,6 @@ markRoomWaiting(roomId: string): roomTypes.Room | undefined; } -/** ゲーム系調停で利用するプレイヤー所属ルーム解決入力ポート */ -export interface GameRoomLookupPort { - getRoomByPlayerId(playerId: string): roomTypes.Room | undefined; -} - /** 準備完了ユースケースが利用するゲーム状態参照入力ポート */ export interface ReadyForGamePort { getRoomPlayers(roomId: string): playerTypes.PlayerData[]; diff --git a/apps/server/src/domains/game/application/useCases/placeBombUseCase.ts b/apps/server/src/domains/game/application/useCases/placeBombUseCase.ts index a0e1290..0e9fde1 100644 --- a/apps/server/src/domains/game/application/useCases/placeBombUseCase.ts +++ b/apps/server/src/domains/game/application/useCases/placeBombUseCase.ts @@ -5,12 +5,12 @@ import type { BombPlacementPort, GameOutputPort, - GameRoomLookupPort, PlaceBombInput, } from "../ports/gameUseCasePorts"; +import type { FindRoomByPlayerPort } from "@server/domains/room/application/ports/roomUseCasePorts"; type PlaceBombUseCaseParams = { - roomResolver: GameRoomLookupPort; + roomResolver: FindRoomByPlayerPort; bombStore: BombPlacementPort; input: PlaceBombInput; output: Pick; diff --git a/apps/server/src/network/handlers/game/registerGameHandlers.ts b/apps/server/src/network/handlers/game/registerGameHandlers.ts index c9ca666..6794b78 100644 --- a/apps/server/src/network/handlers/game/registerGameHandlers.ts +++ b/apps/server/src/network/handlers/game/registerGameHandlers.ts @@ -6,9 +6,9 @@ import { protocol } from "@repo/shared"; import { readyForGameCoordinator } from "@server/application/coordinators/readyForGameCoordinator"; import { startGameCoordinator } from "@server/application/coordinators/startGameCoordinator"; +import type { FindRoomByPlayerPort } from "@server/domains/room/application/ports/roomUseCasePorts"; import type { BombStatePort, - GameRoomLookupPort, MovePlayerPort, ReadyForGamePort, StartGamePort, @@ -35,7 +35,7 @@ io: Server, socket: Socket, gameManager: StartGamePort & ReadyForGamePort & MovePlayerPort & BombStatePort, - roomManager: StartGameRoomPort & GameRoomLookupPort + roomManager: StartGameRoomPort & FindRoomByPlayerPort ) => { const common = createCommonHandlerContext(io, socket); const gameOutputAdapter = createGameOutputAdapter(common); diff --git a/apps/server/src/network/types/connectionPorts.ts b/apps/server/src/network/types/connectionPorts.ts index 6649026..10e3c85 100644 --- a/apps/server/src/network/types/connectionPorts.ts +++ b/apps/server/src/network/types/connectionPorts.ts @@ -6,7 +6,6 @@ import type { BombStatePort, DisconnectPlayerPort, - GameRoomLookupPort, MovePlayerPort, ReadyForGamePort, StartGamePort, @@ -31,7 +30,7 @@ export type ConnectionRoomPort = & JoinRoomPort & StartGameRoomPort - & GameRoomLookupPort; + & FindRoomByPlayerPort; /** ソケット接続全体で利用するゲーム管理ポート集合 */ export type SocketConnectionGamePort =