refactor: rename Prepare to Ready

Game-as-a-Service · May 7, 2024 · ef1c72e · ef1c72e
1 parent 3515673
commit ef1c72e
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 37 deletions.
diff --git a/Application/Usecases/PlayerPreparedUsecase.cs b/Application/Usecases/PlayerPreparedUsecase.cs
diff --git a/Application/Usecases/PlayerReadyUsecase.cs b/Application/Usecases/PlayerReadyUsecase.cs
@@ -0,0 +1,28 @@
+using Application.Common;
+using Domain.Common;
+
+namespace Application.Usecases;
+
+public record PlayerReadyRequest(string GameId, string PlayerId)
+    : Request(GameId, PlayerId);
+
+public record PlayerReadyResponse(IReadOnlyList<DomainEvent> Events) : CommandResponse(Events);
+
+public class PlayerReadyUsecase(ICommandRepository repository, IEventBus<DomainEvent> eventBus)
+    : CommandUsecase<PlayerReadyRequest, PlayerReadyResponse>(repository, eventBus)
+{
+    public override async Task ExecuteAsync(PlayerReadyRequest request, IPresenter<PlayerReadyResponse> presenter)
+    {
+        //查
+        var game = Repository.FindGameById(request.GameId).ToDomain();
+
+        //改
+        game.PlayerReady(request.PlayerId);
+
+        //存
+        Repository.Save(game);
+
+        //推
+        await presenter.PresentAsync(new PlayerReadyResponse(game.DomainEvents));
+    }
+}
diff --git a/Domain/Monopoly.cs b/Domain/Monopoly.cs
@@ -282,13 +282,13 @@ public void SelectLocation(string playerId, int locationID)
     /// 
     /// </summary>
     /// <param name="playerId"></param>
-    public void PlayerPrepare(string playerId)
+    public void PlayerReady(string playerId)
     {
         if (GameStage == GameStage.Preparing)
         {
             Player player = GetPlayer(playerId);
 
-            AddDomainEvent(player.Parpare());
+            AddDomainEvent(player.Ready());
         }
 
     }

diff --git a/Domain/Player.cs b/Domain/Player.cs
@@ -267,7 +267,7 @@ internal bool CanNotSelectDirection(Map.Direction d)
         return d == chess.CurrentDirection.Opposite();
     }
 
-    internal DomainEvent Parpare()
+    internal DomainEvent Ready()
     {
         if (RoleId is null || LocationId == 0)
         {

diff --git a/Server/Hubs/MonopolyHub.cs b/Server/Hubs/MonopolyHub.cs
@@ -123,10 +123,10 @@ await usecase.ExecuteAsync(
             );
     }
 
-    public async Task PlayerReady(PlayerPreparedUsecase usecase, SignalrDefaultPresenter<PlayerPreparedResponse> presenter)
+    public async Task PlayerReady(PlayerReadyUsecase usecase, SignalrDefaultPresenter<PlayerReadyResponse> presenter)
     {
         await usecase.ExecuteAsync(
-            new PlayerPreparedRequest(GameId, PlayerId),
+            new PlayerReadyRequest(GameId, PlayerId),
             presenter
             );
     }

diff --git a/Test/DomainTests/Testcases/PraparedTest.cs b/Test/DomainTests/Testcases/PraparedTest.cs
@@ -30,7 +30,7 @@ public void 玩家成功準備()
             .Build();
 
         // Act 
-        monopoly.PlayerPrepare(B.Id);
+        monopoly.PlayerReady(B.Id);
 
         // Assert
         Assert.AreEqual(B.preparedState, monopoly.Players.First(p => p.Id == B.Id).State);
@@ -58,7 +58,7 @@ public void 玩家取消準備()
             .Build();
 
         // Act 
-        monopoly.PlayerPrepare(A.Id);
+        monopoly.PlayerReady(A.Id);
 
         // Assert
         Assert.AreEqual(A.preparingState, monopoly.Players.First(p => p.Id == A.Id).State);
@@ -95,7 +95,7 @@ public void 玩家未選擇位置按下準備()
             .Build();
 
         // Act 
-        monopoly.PlayerPrepare(B.Id);
+        monopoly.PlayerReady(B.Id);
 
         // Assert
         Assert.AreEqual(B.preparingState, monopoly.Players.First(p => p.Id == B.Id).State);
@@ -131,7 +131,7 @@ public void 玩家未選擇角色按下準備()
             .Build();
 
         // Act 
-        monopoly.PlayerPrepare(B.Id);
+        monopoly.PlayerReady(B.Id);
 
         // Assert
         Assert.AreEqual(B.preparingState, monopoly.Players.First(p => p.Id == B.Id).State);