Refactor/nuget upgrade (#74)

* Restructure folders * Refactor WebApiEndpoint to use TResponse instead of TViewModel
Game-as-a-Service · Jan 19, 2024 · 612f7b6 · 612f7b6
1 parent b14eeb6
commit 612f7b6
Show file tree

Hide file tree

Showing 135 changed files with 114 additions and 158 deletions.
diff --git a/...nd/src/Application/Common/GameEventBus.cs → ...c/Core/Application/Common/GameEventBus.cs b/...nd/src/Application/Common/GameEventBus.cs → ...c/Core/Application/Common/GameEventBus.cs
diff --git a/...c/Application/Common/IGameEventHandler.cs → ...e/Application/Common/IGameEventHandler.cs b/...c/Application/Common/IGameEventHandler.cs → ...e/Application/Common/IGameEventHandler.cs
diff --git a/...kEnd/src/Application/Common/IPresenter.cs → ...src/Core/Application/Common/IPresenter.cs b/...kEnd/src/Application/Common/IPresenter.cs → ...src/Core/Application/Common/IPresenter.cs
diff --git a/...End/src/Application/Common/IRepository.cs → ...rc/Core/Application/Common/IRepository.cs b/...End/src/Application/Common/IRepository.cs → ...rc/Core/Application/Common/IRepository.cs
diff --git a/src/BackEnd/src/Application/Common/Policy.cs → ...End/src/Core/Application/Common/Policy.cs b/src/BackEnd/src/Application/Common/Policy.cs → ...End/src/Core/Application/Common/Policy.cs
diff --git a/...BackEnd/src/Application/Common/UseCase.cs → ...nd/src/Core/Application/Common/UseCase.cs b/...BackEnd/src/Application/Common/UseCase.cs → ...nd/src/Core/Application/Common/UseCase.cs
diff --git a/...nd/src/Application/DependencyInjection.cs → ...c/Core/Application/DependencyInjection.cs b/...nd/src/Application/DependencyInjection.cs → ...c/Core/Application/DependencyInjection.cs
@@ -27,7 +27,6 @@ private static IServiceCollection AddUseCases(this IServiceCollection services)
         {
             if (type.BaseType?.IsGenericType == true && type.BaseType?.GetGenericTypeDefinition() == useCaseType)
             {
-                // services.AddScoped<UseCase<TRequest, TResponse>, ImplementType>();
                 services.AddScoped(type.BaseType, type);
             }
         }

diff --git a/...BackEnd/src/Application/Dtos/PlayerDto.cs → ...nd/src/Core/Application/Dtos/PlayerDto.cs b/...BackEnd/src/Application/Dtos/PlayerDto.cs → ...nd/src/Core/Application/Dtos/PlayerDto.cs
diff --git a/src/BackEnd/src/Application/GlobalUsing.cs → ...ckEnd/src/Core/Application/GlobalUsing.cs b/src/BackEnd/src/Application/GlobalUsing.cs → ...ckEnd/src/Core/Application/GlobalUsing.cs
diff --git a/...Application/Options/GameSettingOptions.cs → ...Application/Options/GameSettingOptions.cs b/...Application/Options/GameSettingOptions.cs → ...Application/Options/GameSettingOptions.cs
diff --git a/...es/PlayerRoleConfirmationStartedPolicy.cs → ...es/PlayerRoleConfirmationStartedPolicy.cs b/...es/PlayerRoleConfirmationStartedPolicy.cs → ...es/PlayerRoleConfirmationStartedPolicy.cs
diff --git a/...n/Policies/SeerRoundStartedEventPolicy.cs → ...n/Policies/SeerRoundStartedEventPolicy.cs b/...n/Policies/SeerRoundStartedEventPolicy.cs → ...n/Policies/SeerRoundStartedEventPolicy.cs
diff --git a/...licies/WerewolfRoundStartedEventPolicy.cs → ...licies/WerewolfRoundStartedEventPolicy.cs b/...licies/WerewolfRoundStartedEventPolicy.cs → ...licies/WerewolfRoundStartedEventPolicy.cs
diff --git a/...s/WitchAntidoteRoundStartedEventPolicy.cs → ...s/WitchAntidoteRoundStartedEventPolicy.cs b/...s/WitchAntidoteRoundStartedEventPolicy.cs → ...s/WitchAntidoteRoundStartedEventPolicy.cs
diff --git a/...tion/UseCases/ConfirmPlayerRoleUseCase.cs → ...tion/UseCases/ConfirmPlayerRoleUseCase.cs b/...tion/UseCases/ConfirmPlayerRoleUseCase.cs → ...tion/UseCases/ConfirmPlayerRoleUseCase.cs
diff --git a/...Application/UseCases/CreateGameUseCase.cs → ...Application/UseCases/CreateGameUseCase.cs b/...Application/UseCases/CreateGameUseCase.cs → ...Application/UseCases/CreateGameUseCase.cs
diff --git a/...ion/UseCases/DiscoverPlayerRoleUseCase.cs → ...ion/UseCases/DiscoverPlayerRoleUseCase.cs b/...ion/UseCases/DiscoverPlayerRoleUseCase.cs → ...ion/UseCases/DiscoverPlayerRoleUseCase.cs
diff --git a/...rc/Application/UseCases/EndGameUseCase.cs → ...re/Application/UseCases/EndGameUseCase.cs b/...rc/Application/UseCases/EndGameUseCase.cs → ...re/Application/UseCases/EndGameUseCase.cs
diff --git a/...rc/Application/UseCases/GetGameUseCase.cs → ...re/Application/UseCases/GetGameUseCase.cs b/...rc/Application/UseCases/GetGameUseCase.cs → ...re/Application/UseCases/GetGameUseCase.cs
diff --git a/...ion/UseCases/PlayerTriggerSkillUseCase.cs → ...ion/UseCases/PlayerTriggerSkillUseCase.cs b/...ion/UseCases/PlayerTriggerSkillUseCase.cs → ...ion/UseCases/PlayerTriggerSkillUseCase.cs
diff --git a/.../Application/UseCases/StartGameUseCase.cs → .../Application/UseCases/StartGameUseCase.cs b/.../Application/UseCases/StartGameUseCase.cs → .../Application/UseCases/StartGameUseCase.cs
diff --git a/...plication/UseCases/WerewolfVoteUseCase.cs → ...plication/UseCases/WerewolfVoteUseCase.cs b/...plication/UseCases/WerewolfVoteUseCase.cs → ...plication/UseCases/WerewolfVoteUseCase.cs
diff --git a/...ation/UseCases/WitchUseAntidoteUseCase.cs → ...ation/UseCases/WitchUseAntidoteUseCase.cs b/...ation/UseCases/WitchUseAntidoteUseCase.cs → ...ation/UseCases/WitchUseAntidoteUseCase.cs
diff --git a/...ication/UseCases/WitchUsePoisonUseCase.cs → ...ication/UseCases/WitchUsePoisonUseCase.cs b/...ication/UseCases/WitchUsePoisonUseCase.cs → ...ication/UseCases/WitchUsePoisonUseCase.cs
diff --git a/...tion/Wsa.Gaas.Werewolf.Application.csproj → ...tion/Wsa.Gaas.Werewolf.Application.csproj b/...tion/Wsa.Gaas.Werewolf.Application.csproj → ...tion/Wsa.Gaas.Werewolf.Application.csproj
@@ -6,10 +6,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="UseCases\NewFile1.txt" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.1" />

diff --git a/src/BackEnd/src/Domain/Common/GameEvent.cs → ...ckEnd/src/Core/Domain/Common/GameEvent.cs b/src/BackEnd/src/Domain/Common/GameEvent.cs → ...ckEnd/src/Core/Domain/Common/GameEvent.cs
diff --git a/...ackEnd/src/Domain/Common/GameException.cs → ...d/src/Core/Domain/Common/GameException.cs b/...ackEnd/src/Domain/Common/GameException.cs → ...d/src/Core/Domain/Common/GameException.cs
diff --git a/...End/src/Domain/Events/GameCreatedEvent.cs → ...rc/Core/Domain/Events/GameCreatedEvent.cs b/...End/src/Domain/Events/GameCreatedEvent.cs → ...rc/Core/Domain/Events/GameCreatedEvent.cs
diff --git a/...ckEnd/src/Domain/Events/GameEndedEvent.cs → .../src/Core/Domain/Events/GameEndedEvent.cs b/...ckEnd/src/Domain/Events/GameEndedEvent.cs → .../src/Core/Domain/Events/GameEndedEvent.cs
diff --git a/...End/src/Domain/Events/GameStartedEvent.cs → ...rc/Core/Domain/Events/GameStartedEvent.cs b/...End/src/Domain/Events/GameStartedEvent.cs → ...rc/Core/Domain/Events/GameStartedEvent.cs
diff --git a/...BackEnd/src/Domain/Events/GetGameEvent.cs → ...nd/src/Core/Domain/Events/GetGameEvent.cs b/...BackEnd/src/Domain/Events/GetGameEvent.cs → ...nd/src/Core/Domain/Events/GetGameEvent.cs
diff --git a/...n/Events/LastNightResultAnnouncedEvent.cs → ...n/Events/LastNightResultAnnouncedEvent.cs b/...n/Events/LastNightResultAnnouncedEvent.cs → ...n/Events/LastNightResultAnnouncedEvent.cs
diff --git a/.../src/Domain/Events/PlayerDiedGameEvent.cs → ...Core/Domain/Events/PlayerDiedGameEvent.cs b/.../src/Domain/Events/PlayerDiedGameEvent.cs → ...Core/Domain/Events/PlayerDiedGameEvent.cs
diff --git a/...vents/PlayerRoleConfirmationEndedEvent.cs → ...vents/PlayerRoleConfirmationEndedEvent.cs b/...vents/PlayerRoleConfirmationEndedEvent.cs → ...vents/PlayerRoleConfirmationEndedEvent.cs
diff --git a/...nts/PlayerRoleConfirmationStartedEvent.cs → ...nts/PlayerRoleConfirmationStartedEvent.cs b/...nts/PlayerRoleConfirmationStartedEvent.cs → ...nts/PlayerRoleConfirmationStartedEvent.cs
diff --git a/...Domain/Events/PlayerRoleConfirmedEvent.cs → ...Domain/Events/PlayerRoleConfirmedEvent.cs b/...Domain/Events/PlayerRoleConfirmedEvent.cs → ...Domain/Events/PlayerRoleConfirmedEvent.cs
diff --git a/.../src/Domain/Events/PlayerSpeakingEvent.cs → ...Core/Domain/Events/PlayerSpeakingEvent.cs b/.../src/Domain/Events/PlayerSpeakingEvent.cs → ...Core/Domain/Events/PlayerSpeakingEvent.cs
diff --git a/.../Domain/Events/PlayerTriggerSkillEvent.cs → .../Domain/Events/PlayerTriggerSkillEvent.cs b/.../Domain/Events/PlayerTriggerSkillEvent.cs → .../Domain/Events/PlayerTriggerSkillEvent.cs
diff --git a/...d/src/Domain/Events/SafetyEveGameEvent.cs → .../Core/Domain/Events/SafetyEveGameEvent.cs b/...d/src/Domain/Events/SafetyEveGameEvent.cs → .../Core/Domain/Events/SafetyEveGameEvent.cs
diff --git a/.../src/Domain/Events/SeerDiscoveredEvent.cs → ...Core/Domain/Events/SeerDiscoveredEvent.cs b/.../src/Domain/Events/SeerDiscoveredEvent.cs → ...Core/Domain/Events/SeerDiscoveredEvent.cs
diff --git a/.../src/Domain/Events/SeerEyesOpenedEvent.cs → ...Core/Domain/Events/SeerEyesOpenedEvent.cs b/.../src/Domain/Events/SeerEyesOpenedEvent.cs → ...Core/Domain/Events/SeerEyesOpenedEvent.cs
diff --git a/...rc/Domain/Events/SeerRoundStartedEvent.cs → ...re/Domain/Events/SeerRoundStartedEvent.cs b/...rc/Domain/Events/SeerRoundStartedEvent.cs → ...re/Domain/Events/SeerRoundStartedEvent.cs
diff --git a/...omain/Events/WerewolfRoundStartedEvent.cs → ...omain/Events/WerewolfRoundStartedEvent.cs b/...omain/Events/WerewolfRoundStartedEvent.cs → ...omain/Events/WerewolfRoundStartedEvent.cs
diff --git a/...d/src/Domain/Events/WerewolfVotedEvent.cs → .../Core/Domain/Events/WerewolfVotedEvent.cs b/...d/src/Domain/Events/WerewolfVotedEvent.cs → .../Core/Domain/Events/WerewolfVotedEvent.cs
diff --git a/.../Events/WitchAntidoteRoundStartedEvent.cs → .../Events/WitchAntidoteRoundStartedEvent.cs b/.../Events/WitchAntidoteRoundStartedEvent.cs → .../Events/WitchAntidoteRoundStartedEvent.cs
diff --git a/...c/Domain/Events/WitchAntidoteUsedEvent.cs → ...e/Domain/Events/WitchAntidoteUsedEvent.cs b/...c/Domain/Events/WitchAntidoteUsedEvent.cs → ...e/Domain/Events/WitchAntidoteUsedEvent.cs
diff --git a/...in/Events/WitchPoisonRoundStartedEvent.cs → ...in/Events/WitchPoisonRoundStartedEvent.cs b/...in/Events/WitchPoisonRoundStartedEvent.cs → ...in/Events/WitchPoisonRoundStartedEvent.cs
diff --git a/...src/Domain/Events/WitchPoisonUsedEvent.cs → ...ore/Domain/Events/WitchPoisonUsedEvent.cs b/...src/Domain/Events/WitchPoisonUsedEvent.cs → ...ore/Domain/Events/WitchPoisonUsedEvent.cs
diff --git a/...n/Exceptions/GameAlreadyEndedException.cs → ...n/Exceptions/GameAlreadyEndedException.cs b/...n/Exceptions/GameAlreadyEndedException.cs → ...n/Exceptions/GameAlreadyEndedException.cs
diff --git a/...Exceptions/GameAlreadyStartedException.cs → ...Exceptions/GameAlreadyStartedException.cs b/...Exceptions/GameAlreadyStartedException.cs → ...Exceptions/GameAlreadyStartedException.cs
diff --git a/...Domain/Exceptions/GameChannelException.cs → ...Domain/Exceptions/GameChannelException.cs b/...Domain/Exceptions/GameChannelException.cs → ...Domain/Exceptions/GameChannelException.cs
diff --git a/...omain/Exceptions/GameNotFoundException.cs → ...omain/Exceptions/GameNotFoundException.cs b/...omain/Exceptions/GameNotFoundException.cs → ...omain/Exceptions/GameNotFoundException.cs
diff --git a/...ain/Exceptions/GameNotStartedException.cs → ...ain/Exceptions/GameNotStartedException.cs b/...ain/Exceptions/GameNotStartedException.cs → ...ain/Exceptions/GameNotStartedException.cs
diff --git a/.../Domain/Exceptions/GameStatusException.cs → .../Domain/Exceptions/GameStatusException.cs b/.../Domain/Exceptions/GameStatusException.cs → .../Domain/Exceptions/GameStatusException.cs
diff --git a/...ain/Exceptions/PlayerNotFoundException.cs → ...ain/Exceptions/PlayerNotFoundException.cs b/...ain/Exceptions/PlayerNotFoundException.cs → ...ain/Exceptions/PlayerNotFoundException.cs
diff --git a/.../Exceptions/PlayerNotSurvivedException.cs → .../Exceptions/PlayerNotSurvivedException.cs b/.../Exceptions/PlayerNotSurvivedException.cs → .../Exceptions/PlayerNotSurvivedException.cs
diff --git a/.../Exceptions/PlayerNotWerewolfException.cs → .../Exceptions/PlayerNotWerewolfException.cs b/.../Exceptions/PlayerNotWerewolfException.cs → .../Exceptions/PlayerNotWerewolfException.cs
diff --git a/...ain/Exceptions/PlayerNotWitchException.cs → ...ain/Exceptions/PlayerNotWitchException.cs b/...ain/Exceptions/PlayerNotWitchException.cs → ...ain/Exceptions/PlayerNotWitchException.cs
diff --git a/...eptions/PlayerRoleNotAssignedException.cs → ...eptions/PlayerRoleNotAssignedException.cs b/...eptions/PlayerRoleNotAssignedException.cs → ...eptions/PlayerRoleNotAssignedException.cs
diff --git a/.../Exceptions/PlayersDuplicatedException.cs → .../Exceptions/PlayersDuplicatedException.cs b/.../Exceptions/PlayersDuplicatedException.cs → .../Exceptions/PlayersDuplicatedException.cs
diff --git a/...ons/PlayersNumberNotSupportedException.cs → ...ons/PlayersNumberNotSupportedException.cs b/...ons/PlayersNumberNotSupportedException.cs → ...ons/PlayersNumberNotSupportedException.cs
diff --git a/src/BackEnd/src/Domain/Using.cs → src/BackEnd/src/Core/Domain/GlobalUsing.cs b/src/BackEnd/src/Domain/Using.cs → src/BackEnd/src/Core/Domain/GlobalUsing.cs
diff --git a/src/BackEnd/src/Domain/Objects/Game.cs → src/BackEnd/src/Core/Domain/Objects/Game.cs b/src/BackEnd/src/Domain/Objects/Game.cs → src/BackEnd/src/Core/Domain/Objects/Game.cs
diff --git a/src/BackEnd/src/Domain/Objects/GameStatus.cs → ...End/src/Core/Domain/Objects/GameStatus.cs b/src/BackEnd/src/Domain/Objects/GameStatus.cs → ...End/src/Core/Domain/Objects/GameStatus.cs
diff --git a/src/BackEnd/src/Domain/Objects/Player.cs → ...BackEnd/src/Core/Domain/Objects/Player.cs b/src/BackEnd/src/Domain/Objects/Player.cs → ...BackEnd/src/Core/Domain/Objects/Player.cs
diff --git a/src/BackEnd/src/Domain/Objects/Role.cs → src/BackEnd/src/Core/Domain/Objects/Role.cs b/src/BackEnd/src/Domain/Objects/Role.cs → src/BackEnd/src/Core/Domain/Objects/Role.cs
diff --git a/...src/Domain/Objects/Roles/AlphaWerewolf.cs → ...ore/Domain/Objects/Roles/AlphaWerewolf.cs b/...src/Domain/Objects/Roles/AlphaWerewolf.cs → ...ore/Domain/Objects/Roles/AlphaWerewolf.cs
diff --git a/...kEnd/src/Domain/Objects/Roles/Guardian.cs → ...src/Core/Domain/Objects/Roles/Guardian.cs b/...kEnd/src/Domain/Objects/Roles/Guardian.cs → ...src/Core/Domain/Objects/Roles/Guardian.cs
diff --git a/...ackEnd/src/Domain/Objects/Roles/Hunter.cs → ...d/src/Core/Domain/Objects/Roles/Hunter.cs b/...ackEnd/src/Domain/Objects/Roles/Hunter.cs → ...d/src/Core/Domain/Objects/Roles/Hunter.cs
diff --git a/src/BackEnd/src/Domain/Objects/Roles/Seer.cs → ...End/src/Core/Domain/Objects/Roles/Seer.cs b/src/BackEnd/src/Domain/Objects/Roles/Seer.cs → ...End/src/Core/Domain/Objects/Roles/Seer.cs
diff --git a/...kEnd/src/Domain/Objects/Roles/Villager.cs → ...src/Core/Domain/Objects/Roles/Villager.cs b/...kEnd/src/Domain/Objects/Roles/Villager.cs → ...src/Core/Domain/Objects/Roles/Villager.cs
diff --git a/...kEnd/src/Domain/Objects/Roles/Werewolf.cs → ...src/Core/Domain/Objects/Roles/Werewolf.cs b/...kEnd/src/Domain/Objects/Roles/Werewolf.cs → ...src/Core/Domain/Objects/Roles/Werewolf.cs
diff --git a/...BackEnd/src/Domain/Objects/Roles/Witch.cs → ...nd/src/Core/Domain/Objects/Roles/Witch.cs b/...BackEnd/src/Domain/Objects/Roles/Witch.cs → ...nd/src/Core/Domain/Objects/Roles/Witch.cs
diff --git a/...BackEnd/src/Domain/Objects/VoteManager.cs → ...nd/src/Core/Domain/Objects/VoteManager.cs b/...BackEnd/src/Domain/Objects/VoteManager.cs → ...nd/src/Core/Domain/Objects/VoteManager.cs
diff --git a/...rc/Domain/Wsa.Gaas.Werewolf.Domain.csproj → ...re/Domain/Wsa.Gaas.Werewolf.Domain.csproj b/...rc/Domain/Wsa.Gaas.Werewolf.Domain.csproj → ...re/Domain/Wsa.Gaas.Werewolf.Domain.csproj
diff --git a/...ntityFrameworkCore/DependencyInjection.cs → ...tructure/SqlServer/DependencyInjection.cs b/...ntityFrameworkCore/DependencyInjection.cs → ...tructure/SqlServer/DependencyInjection.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Wsa.Gaas.Werewolf.Application.Common;
 
-namespace Wsa.Gaas.Werewolf.EntityFrameworkCore;
+namespace Wsa.Gaas.Werewolf.SqlServer;
 public static class DependencyInjection
 {
     public static IServiceCollection AddEntityFrameworkCoreRepository(this IServiceCollection services)

diff --git a/...EntityFrameworkCore/InMemoryRepository.cs → ...structure/SqlServer/InMemoryRepository.cs b/...EntityFrameworkCore/InMemoryRepository.cs → ...structure/SqlServer/InMemoryRepository.cs
@@ -1,7 +1,7 @@
 using Wsa.Gaas.Werewolf.Application.Common;
 using Wsa.Gaas.Werewolf.Domain.Objects;
 
-namespace Wsa.Gaas.Werewolf.EntityFrameworkCore;
+namespace Wsa.Gaas.Werewolf.SqlServer;
 public class InMemoryRepository : IRepository
 {
     private readonly Dictionary<ulong, Game> _discordIdMemory = new();

diff --git a/...workCore/EntityFrameworkCoreRepository.cs → ...tructure/SqlServer/SqlServerRepository.cs b/...workCore/EntityFrameworkCoreRepository.cs → ...tructure/SqlServer/SqlServerRepository.cs
@@ -2,10 +2,10 @@
 using Wsa.Gaas.Werewolf.Application.Common;
 using Wsa.Gaas.Werewolf.Domain.Objects;
 
-namespace Wsa.Gaas.Werewolf.EntityFrameworkCore;
-public class EntityFrameworkCoreRepository : DbContext, IRepository
+namespace Wsa.Gaas.Werewolf.SqlServer;
+public class SqlServerRepository : DbContext, IRepository
 {
-    public EntityFrameworkCoreRepository(DbContextOptions opt) : base(opt)
+    public SqlServerRepository(DbContextOptions opt) : base(opt)
     {
     }
 

diff --git a/...peConfigurations/GameTypeConfiguration.cs → ...peConfigurations/GameTypeConfiguration.cs b/...peConfigurations/GameTypeConfiguration.cs → ...peConfigurations/GameTypeConfiguration.cs
@@ -2,7 +2,7 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Wsa.Gaas.Werewolf.Domain.Objects;
 
-namespace Wsa.Gaas.Werewolf.EntityFrameworkCore.TypeConfigurations;
+namespace Wsa.Gaas.Werewolf.SqlServer.TypeConfigurations;
 internal class GameTypeConfiguration : IEntityTypeConfiguration<Game>
 {
     public void Configure(EntityTypeBuilder<Game> builder)

diff --git a/...Configurations/PlayerTypeConfiguration.cs → ...Configurations/PlayerTypeConfiguration.cs b/...Configurations/PlayerTypeConfiguration.cs → ...Configurations/PlayerTypeConfiguration.cs
@@ -2,7 +2,7 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Wsa.Gaas.Werewolf.Domain.Objects;
 
-namespace Wsa.Gaas.Werewolf.EntityFrameworkCore.TypeConfigurations;
+namespace Wsa.Gaas.Werewolf.SqlServer.TypeConfigurations;
 internal class PlayerTypeConfiguration : IEntityTypeConfiguration<Player>
 {
     public void Configure(EntityTypeBuilder<Player> builder)

diff --git a/...peConfigurations/RoleTypeConfiguration.cs → ...peConfigurations/RoleTypeConfiguration.cs b/...peConfigurations/RoleTypeConfiguration.cs → ...peConfigurations/RoleTypeConfiguration.cs
@@ -3,7 +3,7 @@
 using Wsa.Gaas.Werewolf.Domain.Objects;
 using Wsa.Gaas.Werewolf.Domain.Objects.Roles;
 
-namespace Wsa.Gaas.Werewolf.EntityFrameworkCore.TypeConfigurations;
+namespace Wsa.Gaas.Werewolf.SqlServer.TypeConfigurations;
 internal class RoleTypeConfiguration : IEntityTypeConfiguration<Role>
     , IEntityTypeConfiguration<Domain.Objects.Roles.Werewolf>
     , IEntityTypeConfiguration<AlphaWerewolf>

diff --git a/....Gaas.Werewolf.EntityFrameworkCore.csproj → ...Server/Wsa.Gaas.Werewolf.SqlServer.csproj b/....Gaas.Werewolf.EntityFrameworkCore.csproj → ...Server/Wsa.Gaas.Werewolf.SqlServer.csproj
@@ -9,11 +9,10 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Application\Wsa.Gaas.Werewolf.Application.csproj" />
+    <ProjectReference Include="..\..\Core\Application\Wsa.Gaas.Werewolf.Application.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/BackEnd/src/InterfaceAdapter/WebApi/Common/WebApiEndpoint.cs b/src/BackEnd/src/InterfaceAdapter/WebApi/Common/WebApiEndpoint.cs
diff --git a/.../src/InterfaceAdapter/WebApi/ApiClient.cs → ...kEnd/src/Presentation/WebApi/ApiClient.cs b/.../src/InterfaceAdapter/WebApi/ApiClient.cs → ...kEnd/src/Presentation/WebApi/ApiClient.cs
diff --git a/src/BackEnd/src/Presentation/WebApi/Common/WebApiEndpoint.cs b/src/BackEnd/src/Presentation/WebApi/Common/WebApiEndpoint.cs
@@ -0,0 +1,13 @@
+using FastEndpoints;
+using Wsa.Gaas.Werewolf.Application.Common;
+
+namespace Wsa.Gaas.Werewolf.WebApi.Common;
+public abstract class WebApiEndpoint<TRequest, TResponse> : Endpoint<TRequest, TResponse>
+    where TRequest : notnull, new()
+    where TResponse : notnull
+{
+    public required UseCase<TRequest, TResponse> UseCase { get; set; }
+
+    public abstract override Task<TResponse> ExecuteAsync(TRequest req, CancellationToken ct);
+
+}
diff --git a/...faceAdapter/WebApi/DependencyInjection.cs → ...resentation/WebApi/DependencyInjection.cs b/...faceAdapter/WebApi/DependencyInjection.cs → ...resentation/WebApi/DependencyInjection.cs
@@ -3,7 +3,7 @@
 using Wsa.Gaas.Werewolf.Application.Common;
 using Wsa.Gaas.Werewolf.Application.Options;
 
-namespace Wsa.Gaas.Werewolf.Application;
+namespace Wsa.Gaas.Werewolf.WebApi;
 public static class DependencyInjection
 {
     public static IServiceCollection AddWebApi(this IServiceCollection services, IConfiguration configuration)

diff --git a/...pi/Endpoints/ConfirmPlayerRoleEndpoint.cs → ...pi/Endpoints/ConfirmPlayerRoleEndpoint.cs b/...pi/Endpoints/ConfirmPlayerRoleEndpoint.cs → ...pi/Endpoints/ConfirmPlayerRoleEndpoint.cs
@@ -1,4 +1,6 @@
-namespace Wsa.Gaas.Werewolf.Application;
+using Wsa.Gaas.Werewolf.WebApi.Common;
+
+namespace Wsa.Gaas.Werewolf.WebApi.Endpoints;
 
 public class ConfirmPlayerRoleEndpoint : WebApiEndpoint<ConfirmPlayerRoleRequest, ConfirmPlayerRoleResponse>
 {

diff --git a/...er/WebApi/Endpoints/CreateGameEndpoint.cs → ...on/WebApi/Endpoints/CreateGameEndpoint.cs b/...er/WebApi/Endpoints/CreateGameEndpoint.cs → ...on/WebApi/Endpoints/CreateGameEndpoint.cs
@@ -1,4 +1,6 @@
-namespace Wsa.Gaas.Werewolf.Application;
+using Wsa.Gaas.Werewolf.WebApi.Common;
+
+namespace Wsa.Gaas.Werewolf.WebApi.Endpoints;
 public class CreateGameEndpoint : WebApiEndpoint<CreateGameRequest, CreateGameResponse>
 {
     public override void Configure()

diff --git a/...i/Endpoints/DiscoverPlayerRoleEndpoint.cs → ...i/Endpoints/DiscoverPlayerRoleEndpoint.cs b/...i/Endpoints/DiscoverPlayerRoleEndpoint.cs → ...i/Endpoints/DiscoverPlayerRoleEndpoint.cs
@@ -1,4 +1,6 @@
-namespace Wsa.Gaas.Werewolf.Application;
+using Wsa.Gaas.Werewolf.WebApi.Common;
+
+namespace Wsa.Gaas.Werewolf.WebApi.Endpoints;
 public class DiscoverPlayerRoleEndpoint : WebApiEndpoint<DiscoverPlayerRoleRequest, DiscoverPlayerRoleResponse>
 {
     public override void Configure()

diff --git a/...apter/WebApi/Endpoints/EndGameEndpoint.cs → ...ation/WebApi/Endpoints/EndGameEndpoint.cs b/...apter/WebApi/Endpoints/EndGameEndpoint.cs → ...ation/WebApi/Endpoints/EndGameEndpoint.cs
@@ -1,4 +1,6 @@
-namespace Wsa.Gaas.Werewolf.Application;
+using Wsa.Gaas.Werewolf.WebApi.Common;
+
+namespace Wsa.Gaas.Werewolf.WebApi.Endpoints;
 public class EndGameEndpoint : WebApiEndpoint<EndGameRequest, EndGameResponse>
 {
     public override void Configure()

diff --git a/...apter/WebApi/Endpoints/GetGameEndpoint.cs → ...ation/WebApi/Endpoints/GetGameEndpoint.cs b/...apter/WebApi/Endpoints/GetGameEndpoint.cs → ...ation/WebApi/Endpoints/GetGameEndpoint.cs
@@ -1,4 +1,6 @@
-namespace Wsa.Gaas.Werewolf.Application;
+using Wsa.Gaas.Werewolf.WebApi.Common;
+
+namespace Wsa.Gaas.Werewolf.WebApi.Endpoints;
 
 public class GetGameEndpoint : WebApiEndpoint<GetGameRequest, GetGameResponse>
 {

diff --git a/...i/Endpoints/PlayerTriggerSkillEndpoint.cs → ...i/Endpoints/PlayerTriggerSkillEndpoint.cs b/...i/Endpoints/PlayerTriggerSkillEndpoint.cs → ...i/Endpoints/PlayerTriggerSkillEndpoint.cs
@@ -1,4 +1,4 @@
-using Wsa.Gaas.Werewolf.Application;
+using Wsa.Gaas.Werewolf.WebApi.Common;
 
 namespace Wsa.Gaas.Werewolf.WebApi.Endpoints;
 

diff --git a/...ter/WebApi/Endpoints/StartGameEndpoint.cs → ...ion/WebApi/Endpoints/StartGameEndpoint.cs b/...ter/WebApi/Endpoints/StartGameEndpoint.cs → ...ion/WebApi/Endpoints/StartGameEndpoint.cs
@@ -1,6 +1,6 @@
-
+using Wsa.Gaas.Werewolf.WebApi.Common;
 
-namespace Wsa.Gaas.Werewolf.Application;
+namespace Wsa.Gaas.Werewolf.WebApi.Endpoints;
 public class StartGameEndpoint : WebApiEndpoint<StartGameRequest, StartGameResponse>
 {
     public override void Configure()

diff --git a/.../WebApi/Endpoints/WerewolfVoteEndpoint.cs → .../WebApi/Endpoints/WerewolfVoteEndpoint.cs b/.../WebApi/Endpoints/WerewolfVoteEndpoint.cs → .../WebApi/Endpoints/WerewolfVoteEndpoint.cs
@@ -1,4 +1,6 @@
-namespace Wsa.Gaas.Werewolf.Application;
+using Wsa.Gaas.Werewolf.WebApi.Common;
+
+namespace Wsa.Gaas.Werewolf.WebApi.Endpoints;
 public class WerewolfVoteEndpoint : WebApiEndpoint<WerewolfVoteRequest, WerewolfVoteResponse>
 {
     public override void Configure()

diff --git a/...Api/Endpoints/WitchUseAntidoteEndpoint.cs → ...Api/Endpoints/WitchUseAntidoteEndpoint.cs b/...Api/Endpoints/WitchUseAntidoteEndpoint.cs → ...Api/Endpoints/WitchUseAntidoteEndpoint.cs
@@ -1,4 +1,6 @@
-namespace Wsa.Gaas.Werewolf.Application;
+using Wsa.Gaas.Werewolf.WebApi.Common;
+
+namespace Wsa.Gaas.Werewolf.WebApi.Endpoints;
 public class WitchUseAntidoteEndpoint : WebApiEndpoint<WitchUseAntidoteRequest, WitchUseAntidoteResponse>
 {
     public override void Configure()

diff --git a/...ebApi/Endpoints/WitchUsePoisonEndpoint.cs → ...ebApi/Endpoints/WitchUsePoisonEndpoint.cs b/...ebApi/Endpoints/WitchUsePoisonEndpoint.cs → ...ebApi/Endpoints/WitchUsePoisonEndpoint.cs
@@ -1,4 +1,6 @@
-namespace Wsa.Gaas.Werewolf.Application;
+using Wsa.Gaas.Werewolf.WebApi.Common;
+
+namespace Wsa.Gaas.Werewolf.WebApi.Endpoints;
 
 
 public class WitchUsePoisonEndpoint : WebApiEndpoint<WitchUsePoisonRequest, WitchUsePoisonResponse>

diff --git a/.../Extensions/ExceptionHandlerExtensions.cs → .../Extensions/ExceptionHandlerExtensions.cs b/.../Extensions/ExceptionHandlerExtensions.cs → .../Extensions/ExceptionHandlerExtensions.cs
@@ -3,7 +3,7 @@
 using Wsa.Gaas.Werewolf.Domain.Common;
 using Wsa.Gaas.Werewolf.Domain.Exceptions;
 
-namespace Wsa.Gaas.Werewolf.Application;
+namespace Wsa.Gaas.Werewolf.WebApi.Extensions;
 public static class ExceptionHandlerExtensions
 {
     public static IApplicationBuilder UseJsonExceptionHandler(this IApplicationBuilder app, ILogger? logger = null, bool logStructuredException = false)

diff --git a/...c/InterfaceAdapter/WebApi/GameEventHub.cs → ...d/src/Presentation/WebApi/GameEventHub.cs b/...c/InterfaceAdapter/WebApi/GameEventHub.cs → ...d/src/Presentation/WebApi/GameEventHub.cs
@@ -2,8 +2,9 @@
 using Microsoft.AspNetCore.SignalR;
 using Wsa.Gaas.Werewolf.Application.Common;
 using Wsa.Gaas.Werewolf.Domain.Common;
+using Wsa.Gaas.Werewolf.WebApi.ViewModels;
 
-namespace Wsa.Gaas.Werewolf.Application;
+namespace Wsa.Gaas.Werewolf.WebApi;
 /**
  * https://learn.microsoft.com/en-us/aspnet/core/signalr/hubs?view=aspnetcore-7.0#create-and-use-hubs-3
  * > Hubs are transient:

diff --git a/...nd/src/InterfaceAdapter/WebApi/Program.cs → ...ackEnd/src/Presentation/WebApi/Program.cs b/...nd/src/InterfaceAdapter/WebApi/Program.cs → ...ackEnd/src/Presentation/WebApi/Program.cs
@@ -3,7 +3,9 @@
 using System.Text.Json.Serialization;
 using Wsa.Gaas.Werewolf.Application;
 using Wsa.Gaas.Werewolf.Application.Common;
-using Wsa.Gaas.Werewolf.EntityFrameworkCore;
+using Wsa.Gaas.Werewolf.SqlServer;
+using Wsa.Gaas.Werewolf.WebApi;
+using Wsa.Gaas.Werewolf.WebApi.Extensions;
 
 var builder = WebApplication.CreateBuilder(args);
 

diff --git a/...ter/WebApi/Properties/launchSettings.json → ...ion/WebApi/Properties/launchSettings.json b/...ter/WebApi/Properties/launchSettings.json → ...ion/WebApi/Properties/launchSettings.json
diff --git a/...erfaceAdapter/WebApi/ViewModels/GameVm.cs → .../Presentation/WebApi/ViewModels/GameVm.cs b/...erfaceAdapter/WebApi/ViewModels/GameVm.cs → .../Presentation/WebApi/ViewModels/GameVm.cs
@@ -1,6 +1,6 @@
 using Wsa.Gaas.Werewolf.Domain.Objects;
 
-namespace Wsa.Gaas.Werewolf.Application;
+namespace Wsa.Gaas.Werewolf.WebApi.ViewModels;
 public class GameVm
 {
     public string Id { get; set; } = string.Empty;

diff --git a/...faceAdapter/WebApi/ViewModels/PlayerVm.cs → ...resentation/WebApi/ViewModels/PlayerVm.cs b/...faceAdapter/WebApi/ViewModels/PlayerVm.cs → ...resentation/WebApi/ViewModels/PlayerVm.cs
@@ -1,6 +1,6 @@
 using Wsa.Gaas.Werewolf.Domain.Objects;
 
-namespace Wsa.Gaas.Werewolf.Application;
+namespace Wsa.Gaas.Werewolf.WebApi.ViewModels;
 public class PlayerVm
 {
     public string Id { get; set; } = string.Empty;

diff --git a/...InterfaceAdapter/WebApi/WebApiDefaults.cs → ...src/Presentation/WebApi/WebApiDefaults.cs b/...InterfaceAdapter/WebApi/WebApiDefaults.cs → ...src/Presentation/WebApi/WebApiDefaults.cs
@@ -1,4 +1,4 @@
-namespace Wsa.Gaas.Werewolf.Application;
+namespace Wsa.Gaas.Werewolf.WebApi;
 public static class WebApiDefaults
 {
     public const string SignalrEndpoint = "/events"

diff --git a/...er/WebApi/Wsa.Gaas.Werewolf.WebApi.csproj → ...on/WebApi/Wsa.Gaas.Werewolf.WebApi.csproj b/...er/WebApi/Wsa.Gaas.Werewolf.WebApi.csproj → ...on/WebApi/Wsa.Gaas.Werewolf.WebApi.csproj
@@ -5,26 +5,17 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="Endpoints\NewFile.txt" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="FastEndpoints" Version="5.21.2" />
+ <ItemGroup>
     <PackageReference Include="FastEndpoints.Swagger" Version="5.21.2" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <TreatAsUsed>true</TreatAsUsed>
     </PackageReference>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Application\Wsa.Gaas.Werewolf.Application.csproj" />
-    <ProjectReference Include="..\EntityFrameworkCore\Wsa.Gaas.Werewolf.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\..\Infrastructure\SqlServer\Wsa.Gaas.Werewolf.SqlServer.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...apter/WebApi/appsettings.Development.json → ...ation/WebApi/appsettings.Development.json b/...apter/WebApi/appsettings.Development.json → ...ation/WebApi/appsettings.Development.json
diff --git a/.../InterfaceAdapter/WebApi/appsettings.json → .../src/Presentation/WebApi/appsettings.json b/.../InterfaceAdapter/WebApi/appsettings.json → .../src/Presentation/WebApi/appsettings.json
diff --git a/...bApiTests/ATDD/Common/WebApiTestServer.cs → ...bApiTests/ATDD/Common/WebApiTestServer.cs b/...bApiTests/ATDD/Common/WebApiTestServer.cs → ...bApiTests/ATDD/Common/WebApiTestServer.cs
@@ -4,10 +4,11 @@
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 using System.Threading.Tasks.Dataflow;
-using Wsa.Gaas.Werewolf.Application;
 using Wsa.Gaas.Werewolf.Application.Common;
 using Wsa.Gaas.Werewolf.Application.Options;
 using Wsa.Gaas.Werewolf.Domain.Common;
+using Wsa.Gaas.Werewolf.WebApi;
+using Wsa.Gaas.Werewolf.WebApi.ViewModels;
 using Wsa.Gaas.Werewolf.WebApiTests.Common;
 
 namespace Wsa.Gaas.Werewolf.WebApiTests.ATDD.Common;

diff --git a/...ebApiTests/ATDD/GameTests/End2EndTests.cs → ...ebApiTests/ATDD/GameTests/End2EndTests.cs b/...ebApiTests/ATDD/GameTests/End2EndTests.cs → ...ebApiTests/ATDD/GameTests/End2EndTests.cs
@@ -1,8 +1,9 @@
 using FastEndpoints;
 using System.Threading.Tasks.Dataflow;
-using Wsa.Gaas.Werewolf.Application;
 using Wsa.Gaas.Werewolf.Application.UseCases;
 using Wsa.Gaas.Werewolf.Domain.Objects;
+using Wsa.Gaas.Werewolf.WebApi.Endpoints;
+using Wsa.Gaas.Werewolf.WebApi.ViewModels;
 using Wsa.Gaas.Werewolf.WebApiTests.ATDD.Common;
 
 namespace Wsa.Gaas.Werewolf.WebApiTests.ATDD.GameTests;

diff --git a/...iTests/ATDD/GameTests/GameCreatedTests.cs → ...iTests/ATDD/GameTests/GameCreatedTests.cs b/...iTests/ATDD/GameTests/GameCreatedTests.cs → ...iTests/ATDD/GameTests/GameCreatedTests.cs
@@ -1,10 +1,10 @@
 using FastEndpoints;
 using System.Net;
 using System.Threading.Tasks.Dataflow;
-using Wsa.Gaas.Werewolf.Application;
 using Wsa.Gaas.Werewolf.Application.Common;
 using Wsa.Gaas.Werewolf.Application.UseCases;
 using Wsa.Gaas.Werewolf.Domain.Events;
+using Wsa.Gaas.Werewolf.WebApi.Endpoints;
 using Wsa.Gaas.Werewolf.WebApiTests.ATDD.Common;
 
 namespace Wsa.Gaas.Werewolf.WebApiTests.ATDD.GameTests;

diff --git a/...ApiTests/ATDD/GameTests/GameEndedTests.cs → ...ApiTests/ATDD/GameTests/GameEndedTests.cs b/...ApiTests/ATDD/GameTests/GameEndedTests.cs → ...ApiTests/ATDD/GameTests/GameEndedTests.cs
@@ -1,9 +1,9 @@
 using FastEndpoints;
 using System.Net;
-using Wsa.Gaas.Werewolf.Application;
 using Wsa.Gaas.Werewolf.Application.Common;
 using Wsa.Gaas.Werewolf.Application.UseCases;
 using Wsa.Gaas.Werewolf.Domain.Events;
+using Wsa.Gaas.Werewolf.WebApi.Endpoints;
 using Wsa.Gaas.Werewolf.WebApiTests.ATDD.Common;
 
 namespace Wsa.Gaas.Werewolf.WebApiTests.ATDD.GameTests;

diff --git a/...iTests/ATDD/GameTests/GameStartedTests.cs → ...iTests/ATDD/GameTests/GameStartedTests.cs b/...iTests/ATDD/GameTests/GameStartedTests.cs → ...iTests/ATDD/GameTests/GameStartedTests.cs
@@ -1,11 +1,12 @@
 using FastEndpoints;
 using System.Net;
 using System.Threading.Tasks.Dataflow;
-using Wsa.Gaas.Werewolf.Application;
 using Wsa.Gaas.Werewolf.Application.Common;
 using Wsa.Gaas.Werewolf.Application.UseCases;
 using Wsa.Gaas.Werewolf.Domain.Events;
 using Wsa.Gaas.Werewolf.Domain.Objects;
+using Wsa.Gaas.Werewolf.WebApi.Endpoints;
+using Wsa.Gaas.Werewolf.WebApi.ViewModels;
 using Wsa.Gaas.Werewolf.WebApiTests.ATDD.Common;
 
 namespace Wsa.Gaas.Werewolf.WebApiTests.ATDD.GameTests;

diff --git a/...ebApiTests/ATDD/GameTests/GetGameTests.cs → ...ebApiTests/ATDD/GameTests/GetGameTests.cs b/...ebApiTests/ATDD/GameTests/GetGameTests.cs → ...ebApiTests/ATDD/GameTests/GetGameTests.cs
diff --git a/...TDD/GameTests/PlayerRoleConfirmedTests.cs → ...TDD/GameTests/PlayerRoleConfirmedTests.cs b/...TDD/GameTests/PlayerRoleConfirmedTests.cs → ...TDD/GameTests/PlayerRoleConfirmedTests.cs
@@ -1,8 +1,8 @@
 using FastEndpoints;
-using Wsa.Gaas.Werewolf.Application;
 using Wsa.Gaas.Werewolf.Application.Common;
 using Wsa.Gaas.Werewolf.Application.UseCases;
 using Wsa.Gaas.Werewolf.Domain.Objects;
+using Wsa.Gaas.Werewolf.WebApi.Endpoints;
 using Wsa.Gaas.Werewolf.WebApiTests.ATDD.Common;
 
 namespace Wsa.Gaas.Werewolf.WebApiTests.ATDD.GameTests;

diff --git a/...sts/ATDD/GameTests/PlayerSpeakingTests.cs → ...sts/ATDD/GameTests/PlayerSpeakingTests.cs b/...sts/ATDD/GameTests/PlayerSpeakingTests.cs → ...sts/ATDD/GameTests/PlayerSpeakingTests.cs
diff --git a/...ATDD/GameTests/PlayerTriggerSkillTests.cs → ...ATDD/GameTests/PlayerTriggerSkillTests.cs b/...ATDD/GameTests/PlayerTriggerSkillTests.cs → ...ATDD/GameTests/PlayerTriggerSkillTests.cs
diff --git a/...Tests/ATDD/GameTests/SeerDiscoverTests.cs → ...Tests/ATDD/GameTests/SeerDiscoverTests.cs b/...Tests/ATDD/GameTests/SeerDiscoverTests.cs → ...Tests/ATDD/GameTests/SeerDiscoverTests.cs
@@ -1,10 +1,10 @@
 using FastEndpoints;
-using Wsa.Gaas.Werewolf.Application;
 using Wsa.Gaas.Werewolf.Application.Common;
 using Wsa.Gaas.Werewolf.Application.UseCases;
 using Wsa.Gaas.Werewolf.Domain.Events;
 using Wsa.Gaas.Werewolf.Domain.Objects;
 using Wsa.Gaas.Werewolf.Domain.Objects.Roles;
+using Wsa.Gaas.Werewolf.WebApi.Endpoints;
 using Wsa.Gaas.Werewolf.WebApiTests.ATDD.Common;
 
 namespace Wsa.Gaas.Werewolf.WebApiTests.ATDD.GameTests;

diff --git a/...ests/ATDD/GameTests/WerewolfVotedTests.cs → ...ests/ATDD/GameTests/WerewolfVotedTests.cs b/...ests/ATDD/GameTests/WerewolfVotedTests.cs → ...ests/ATDD/GameTests/WerewolfVotedTests.cs
@@ -1,10 +1,10 @@
 using FastEndpoints;
 using System.Net;
 using System.Net.Http.Json;
-using Wsa.Gaas.Werewolf.Application;
 using Wsa.Gaas.Werewolf.Application.Common;
 using Wsa.Gaas.Werewolf.Application.UseCases;
 using Wsa.Gaas.Werewolf.Domain.Objects;
+using Wsa.Gaas.Werewolf.WebApi.Endpoints;
 using Wsa.Gaas.Werewolf.WebApiTests.ATDD.Common;
 
 /* Game

diff --git a/...s/ATDD/GameTests/WitchUseAntidoteTests.cs → ...s/ATDD/GameTests/WitchUseAntidoteTests.cs b/...s/ATDD/GameTests/WitchUseAntidoteTests.cs → ...s/ATDD/GameTests/WitchUseAntidoteTests.cs
@@ -1,9 +1,9 @@
 using FastEndpoints;
-using Wsa.Gaas.Werewolf.Application;
 using Wsa.Gaas.Werewolf.Application.Common;
 using Wsa.Gaas.Werewolf.Application.UseCases;
 using Wsa.Gaas.Werewolf.Domain.Objects;
 using Wsa.Gaas.Werewolf.Domain.Objects.Roles;
+using Wsa.Gaas.Werewolf.WebApi.Endpoints;
 using Wsa.Gaas.Werewolf.WebApiTests.ATDD.Common;
 
 namespace Wsa.Gaas.Werewolf.WebApiTests.ATDD.GameTests;