refactor: game UI

Game-as-a-Service · Jul 10, 2023 · 07ed20b · 07ed20b
1 parent 7a11ca7
commit 07ed20b
Show file tree

Hide file tree

Showing 36 changed files with 348 additions and 427 deletions.
diff --git a/src/BackEnd/src/Application/Common/GameEventBus.cs b/src/BackEnd/src/Application/Common/GameEventBus.cs
@@ -7,16 +7,12 @@ public class GameEventBus
     {
         private readonly IServiceScopeFactory _factory;
 
-#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
-        protected GameEventBus() { }
-#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
-
         public GameEventBus(IServiceScopeFactory facotry)
         {
             _factory = facotry;
         }
 
-        public virtual Task BroadcastAsync<T>(T gameEvent, CancellationToken cancellationToken = default)
+        public virtual Task BroadcastAsync<T>(IEnumerable<T> gameEvents, CancellationToken cancellationToken = default)
             where T : GameEvent
         {
             // Run this in sparate Thread
@@ -27,19 +23,22 @@ public virtual Task BroadcastAsync<T>(T gameEvent, CancellationToken cancellatio
 
                 // Trigger Handlers
 
-                // 1. Game Event Hub Handler
+                // Game Event Hub Handler
                 var handler = provider.GetRequiredService<IGameEventHandler>();
-                await handler.Handle(gameEvent, cancellationToken);
 
-                // 2. Policies
-                if (provider.GetService<Policy<T>>() is Policy<T> policy)
+                foreach (var gameEvent in gameEvents)
                 {
-                    await policy.ExecuteAsync(gameEvent, cancellationToken);
+                    await handler.Handle(gameEvent, cancellationToken);
                 }
-
             }, cancellationToken);
 
             return Task.CompletedTask;
         }
+
+        public virtual Task BroadcastAsync<T>(T gameEvent, CancellationToken cancellationToken = default)
+            where T : GameEvent
+        {
+            return BroadcastAsync(new[] { gameEvent }, cancellationToken);
+        }
     }
 }
diff --git a/src/BackEnd/src/Application/Common/IGameEventHandler.cs b/src/BackEnd/src/Application/Common/IGameEventHandler.cs
@@ -4,6 +4,6 @@ namespace Wsa.Gaas.Werewolf.Application.Common
 {
     public interface IGameEventHandler
     {
-        Task Handle(GameEvent gameEvent, CancellationToken cancellationToken = default);
+        Task Handle(GameEvent events, CancellationToken cancellationToken = default);
     }
 }
diff --git a/src/BackEnd/src/Application/Common/IRepository.cs b/src/BackEnd/src/Application/Common/IRepository.cs
@@ -7,6 +7,7 @@ public interface IRepository
         // 讀
         Task<Game?> FindByIdAsync(Guid id);
         Task<Game?> FindByDiscordChannelIdAsync(ulong discordChannelId);
+        Game? FindByDiscordChannelId(ulong discordChannelId);
         IQueryable<Game> FindAll();
 
         // 存

diff --git a/src/BackEnd/src/Application/Common/Policy.cs b/src/BackEnd/src/Application/Common/Policy.cs
diff --git a/src/BackEnd/src/Application/DependencyInjection.cs b/src/BackEnd/src/Application/DependencyInjection.cs
@@ -10,9 +10,6 @@ public static IServiceCollection AddWerewolfApplication(this IServiceCollection
             // Inject Use Cases
             services.AddUseCases();
 
-            // Inject Policies
-            services.AddPolicies();
-
             // GameEvenPublisher
             services.AddScoped<GameEventBus>();
 
@@ -36,22 +33,5 @@ private static IServiceCollection AddUseCases(this IServiceCollection services)
 
             return services;
         }
-
-        private static IServiceCollection AddPolicies(this IServiceCollection services)
-        {
-            var assembly = typeof(DependencyInjection).Assembly;
-            var types = assembly.GetTypes();
-            var policyType = typeof(Policy<>);
-
-            foreach (var type in types)
-            {
-                if (type.BaseType?.IsGenericType == true && type.BaseType?.GetGenericTypeDefinition() == policyType)
-                {
-                    services.AddScoped(type.BaseType, type);
-                }
-            }
-
-            return services;
-        }
     }
 }
diff --git a/src/BackEnd/src/Application/Policies/GameStartedPolicy.cs b/src/BackEnd/src/Application/Policies/GameStartedPolicy.cs
diff --git a/src/BackEnd/src/Application/Policies/LastNightResultAnnouncedPolicy.cs b/src/BackEnd/src/Application/Policies/LastNightResultAnnouncedPolicy.cs
diff --git a/src/BackEnd/src/Application/UseCases/ConfirmPlayerRoleUseCase.cs b/src/BackEnd/src/Application/UseCases/ConfirmPlayerRoleUseCase.cs
@@ -31,9 +31,7 @@ public async override Task ExecuteAsync(ConfirmPlayerRoleRequest request, IPrese
 
             // Save
 
-
             // Push
-            await GameEventBus.BroadcastAsync(gameEvent, cancellationToken);
             await presenter.PresentAsync(gameEvent, cancellationToken);
         }
     }

diff --git a/src/BackEnd/src/Application/UseCases/CreateGameUseCase.cs b/src/BackEnd/src/Application/UseCases/CreateGameUseCase.cs
@@ -20,17 +20,14 @@ public CreateGameUseCase(IRepository repository, GameEventBus eventPublisher) :
 
         public override async Task ExecuteAsync(CreateGameRequest request, IPresenter<GameCreatedEvent> presenter, CancellationToken cancellationToken = default)
         {
-            Game game;
+            Game? game;
 
             lock (_lock)
             {
                 // Query
-                var anyExistingActiveGame = Repository.FindAll()
-                    .Where(x => x.DiscordVoiceChannelId == request.DiscordVoiceChannelId)
-                    .Where(x => x.Status != GameStatus.Ended)
-                    .Any();
+                game = Repository.FindByDiscordChannelId(request.DiscordVoiceChannelId);
 
-                if (anyExistingActiveGame)
+                if (game != null)
                 {
                     throw new GameChannelException();
                 }
@@ -46,7 +43,7 @@ public override async Task ExecuteAsync(CreateGameRequest request, IPresenter<Ga
             var gameEvent = new GameCreatedEvent(game);
 
             // SignalR
-            await GameEventBus.BroadcastAsync(gameEvent, cancellationToken);
+            await GameEventBus.BroadcastAsync(new[] { gameEvent }, cancellationToken);
 
             // Restful API
             await presenter.PresentAsync(gameEvent, cancellationToken);

diff --git a/src/BackEnd/src/Application/UseCases/DiscoverPlayerRoleUseCase.cs b/src/BackEnd/src/Application/UseCases/DiscoverPlayerRoleUseCase.cs
@@ -1,7 +1,6 @@
 using Wsa.Gaas.Werewolf.Application.Common;
 using Wsa.Gaas.Werewolf.Domain.Events;
 using Wsa.Gaas.Werewolf.Domain.Exceptions;
-using Wsa.Gaas.Werewolf.Domain.Objects;
 
 namespace Wsa.Gaas.Werewolf.Application.UseCases
 {
@@ -28,20 +27,8 @@ public override async Task ExecuteAsync(DiscoverPlayerRoleRequest request, IPres
                 throw new GameNotFoundException(request.DiscordVoiceChannelId);
             }
 
-            var discoverPlayer = Repository.FindAll().Where(x => x.DiscordVoiceChannelId == request.DiscordVoiceChannelId)
-                .Where(x => x.Status == GameStatus.SeerRoundStarted)
-                .SelectMany(y => y.Players)
-                .Where(y => y.IsDead == false)
-                .Where(y => y.PlayerNumber == request.DiscoverPlayerNumber)
-                .FirstOrDefault();
-
-            if (discoverPlayer == null)
-            {
-                throw new PlayerNotSurvivedException(request.DiscoverPlayerNumber);
-            }
-
             // Update
-            var seerDiscoveredEvent = game.DiscoverPlayerRole(request.PlayerId, discoverPlayer);
+            var seerDiscoveredEvent = game.DiscoverPlayerRole(request.PlayerId, request.DiscoverPlayerNumber);
 
             // Save
 

diff --git a/src/BackEnd/src/Application/UseCases/EndGameUseCase.cs b/src/BackEnd/src/Application/UseCases/EndGameUseCase.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Wsa.Gaas.Werewolf.Application.Common;
-using Wsa.Gaas.Werewolf.Domain.Common;
+using Wsa.Gaas.Werewolf.Application.Common;
 using Wsa.Gaas.Werewolf.Domain.Events;
 using Wsa.Gaas.Werewolf.Domain.Exceptions;
 using Wsa.Gaas.Werewolf.Domain.Objects;
@@ -28,23 +22,15 @@ public override async Task ExecuteAsync(EndGameRequest request, IPresenter<GameE
         {
             Game? game;
             lock (_lock)
-            { 
+            {
                 // 查
-                game = Repository.FindAll()
-                    .Where(x => x.DiscordVoiceChannelId == request.DiscordVoiceChannelId)
-                    //.Where(x => x.Status != GameStatus.Ended)
-                    .FirstOrDefault();
+                game = Repository.FindByDiscordChannelId(request.DiscordVoiceChannelId);
 
                 if (game == null)
                 {
                     throw new GameNotFoundException(request.DiscordVoiceChannelId);
                 }
 
-                if (game.Status == GameStatus.Ended)
-                {
-                    throw new GameAlreadyEndedException(request.DiscordVoiceChannelId);
-                }
-
                 game.EndGame();
 
                 Repository.Save(game);

diff --git a/src/BackEnd/src/Application/UseCases/StartGameUseCase.cs b/src/BackEnd/src/Application/UseCases/StartGameUseCase.cs
@@ -1,4 +1,5 @@
 using Wsa.Gaas.Werewolf.Application.Common;
+using Wsa.Gaas.Werewolf.Domain.Common;
 using Wsa.Gaas.Werewolf.Domain.Events;
 using Wsa.Gaas.Werewolf.Domain.Exceptions;
 using Wsa.Gaas.Werewolf.Domain.Objects;
@@ -23,34 +24,33 @@ public StartGameUseCase(IRepository repository, GameEventBus eventPublisher) : b
         public override async Task ExecuteAsync(StartGameRequest request, IPresenter<GameStartedEvent> presenter, CancellationToken cancellationToken = default)
         {
             Game? game;
-            GameStartedEvent? gameEvent;
+            IEnumerable<GameEvent> events;
 
             lock (_lock)
             {
                 // 查
-                game = Repository
-                    .FindByDiscordChannelIdAsync(request.DiscordVoiceChannelId)
-                    .GetAwaiter()
-                    .GetResult()
-                    ;
+                game = Repository.FindByDiscordChannelId(request.DiscordVoiceChannelId);
 
                 if (game == null)
                 {
                     throw new GameNotFoundException(request.DiscordVoiceChannelId);
                 }
 
                 // 改
-                gameEvent = game.StartGame(request.Players);
+                events = game.StartGame(request.Players);
 
                 // 存
                 Repository.Save(game);
             }
 
             // SignalR
-            await GameEventBus.BroadcastAsync(gameEvent, cancellationToken);
+            await GameEventBus.BroadcastAsync(events, cancellationToken);
 
             // Restful API
-            await presenter.PresentAsync(gameEvent, cancellationToken);
+            await presenter.PresentAsync(
+                (GameStartedEvent)events.First(x => x is GameStartedEvent), 
+                cancellationToken
+            );
         }
     }