From 56209472b813e8e1479485ad3e2b2272992de0b7 Mon Sep 17 00:00:00 2001 From: Rick Su <35659961+ricksu978@users.noreply.github.com> Date: Sat, 20 Jan 2024 10:27:20 +1100 Subject: [PATCH 1/2] Restructure folders --- .../Application/Common/GameEventBus.cs | 0 .../Application/Common/IGameEventHandler.cs | 0 .../Application/Common/IPresenter.cs | 0 .../Application/Common/IRepository.cs | 0 .../{ => Core}/Application/Common/Policy.cs | 0 .../{ => Core}/Application/Common/UseCase.cs | 0 .../Application/DependencyInjection.cs | 1 - .../{ => Core}/Application/Dtos/PlayerDto.cs | 0 .../src/{ => Core}/Application/GlobalUsing.cs | 0 .../Application/Options/GameSettingOptions.cs | 0 .../PlayerRoleConfirmationStartedPolicy.cs | 0 .../Policies/SeerRoundStartedEventPolicy.cs | 0 .../WerewolfRoundStartedEventPolicy.cs | 0 .../WitchAntidoteRoundStartedEventPolicy.cs | 0 .../UseCases/ConfirmPlayerRoleUseCase.cs | 0 .../Application/UseCases/CreateGameUseCase.cs | 0 .../UseCases/DiscoverPlayerRoleUseCase.cs | 0 .../Application/UseCases/EndGameUseCase.cs | 0 .../Application/UseCases/GetGameUseCase.cs | 0 .../UseCases/PlayerTriggerSkillUseCase.cs | 0 .../Application/UseCases/StartGameUseCase.cs | 0 .../UseCases/WerewolfVoteUseCase.cs | 0 .../UseCases/WitchUseAntidoteUseCase.cs | 0 .../UseCases/WitchUsePoisonUseCase.cs | 0 .../Wsa.Gaas.Werewolf.Application.csproj | 4 - .../src/{ => Core}/Domain/Common/GameEvent.cs | 0 .../{ => Core}/Domain/Common/GameException.cs | 0 .../Domain/Events/GameCreatedEvent.cs | 0 .../Domain/Events/GameEndedEvent.cs | 0 .../Domain/Events/GameStartedEvent.cs | 0 .../{ => Core}/Domain/Events/GetGameEvent.cs | 0 .../Events/LastNightResultAnnouncedEvent.cs | 0 .../Domain/Events/PlayerDiedGameEvent.cs | 0 .../PlayerRoleConfirmationEndedEvent.cs | 0 .../PlayerRoleConfirmationStartedEvent.cs | 0 .../Domain/Events/PlayerRoleConfirmedEvent.cs | 0 .../Domain/Events/PlayerSpeakingEvent.cs | 0 .../Domain/Events/PlayerTriggerSkillEvent.cs | 0 .../Domain/Events/SafetyEveGameEvent.cs | 0 .../Domain/Events/SeerDiscoveredEvent.cs | 0 .../Domain/Events/SeerEyesOpenedEvent.cs | 0 .../Domain/Events/SeerRoundStartedEvent.cs | 0 .../Events/WerewolfRoundStartedEvent.cs | 0 .../Domain/Events/WerewolfVotedEvent.cs | 0 .../Events/WitchAntidoteRoundStartedEvent.cs | 0 .../Domain/Events/WitchAntidoteUsedEvent.cs | 0 .../Events/WitchPoisonRoundStartedEvent.cs | 0 .../Domain/Events/WitchPoisonUsedEvent.cs | 0 .../Exceptions/GameAlreadyEndedException.cs | 0 .../Exceptions/GameAlreadyStartedException.cs | 0 .../Domain/Exceptions/GameChannelException.cs | 0 .../Exceptions/GameNotFoundException.cs | 0 .../Exceptions/GameNotStartedException.cs | 0 .../Domain/Exceptions/GameStatusException.cs | 0 .../Exceptions/PlayerNotFoundException.cs | 0 .../Exceptions/PlayerNotSurvivedException.cs | 0 .../Exceptions/PlayerNotWerewolfException.cs | 0 .../Exceptions/PlayerNotWitchException.cs | 0 .../PlayerRoleNotAssignedException.cs | 0 .../Exceptions/PlayersDuplicatedException.cs | 0 .../PlayersNumberNotSupportedException.cs | 0 .../Using.cs => Core/Domain/GlobalUsing.cs} | 0 .../src/{ => Core}/Domain/Objects/Game.cs | 0 .../{ => Core}/Domain/Objects/GameStatus.cs | 0 .../src/{ => Core}/Domain/Objects/Player.cs | 0 .../src/{ => Core}/Domain/Objects/Role.cs | 0 .../Domain/Objects/Roles/AlphaWerewolf.cs | 0 .../Domain/Objects/Roles/Guardian.cs | 0 .../{ => Core}/Domain/Objects/Roles/Hunter.cs | 0 .../{ => Core}/Domain/Objects/Roles/Seer.cs | 0 .../Domain/Objects/Roles/Villager.cs | 0 .../Domain/Objects/Roles/Werewolf.cs | 0 .../{ => Core}/Domain/Objects/Roles/Witch.cs | 0 .../{ => Core}/Domain/Objects/VoteManager.cs | 0 .../Domain/Wsa.Gaas.Werewolf.Domain.csproj | 0 .../SqlServer}/DependencyInjection.cs | 2 +- .../SqlServer}/InMemoryRepository.cs | 2 +- .../SqlServer/SqlServerRepository.cs} | 6 +- .../GameTypeConfiguration.cs | 2 +- .../PlayerTypeConfiguration.cs | 2 +- .../RoleTypeConfiguration.cs | 2 +- .../Wsa.Gaas.Werewolf.SqlServer.csproj} | 3 +- .../WebApi/ApiClient.cs | 0 .../WebApi/Common/WebApiEndpoint.cs | 2 +- .../WebApi/DependencyInjection.cs | 2 +- .../Endpoints/ConfirmPlayerRoleEndpoint.cs | 4 +- .../WebApi/Endpoints/CreateGameEndpoint.cs | 4 +- .../Endpoints/DiscoverPlayerRoleEndpoint.cs | 4 +- .../WebApi/Endpoints/EndGameEndpoint.cs | 4 +- .../WebApi/Endpoints/GetGameEndpoint.cs | 4 +- .../Endpoints/PlayerTriggerSkillEndpoint.cs | 2 +- .../WebApi/Endpoints/StartGameEndpoint.cs | 4 +- .../WebApi/Endpoints/WerewolfVoteEndpoint.cs | 4 +- .../Endpoints/WitchUseAntidoteEndpoint.cs | 4 +- .../Endpoints/WitchUsePoisonEndpoint.cs | 4 +- .../Extensions/ExceptionHandlerExtensions.cs | 2 +- .../WebApi/GameEventHub.cs | 3 +- .../WebApi/Program.cs | 4 +- .../WebApi/Properties/launchSettings.json | 0 .../WebApi/ViewModels/GameVm.cs | 2 +- .../WebApi/ViewModels/PlayerVm.cs | 2 +- .../WebApi/WebApiDefaults.cs | 2 +- .../WebApi/Wsa.Gaas.Werewolf.WebApi.csproj | 15 +--- .../WebApi/appsettings.Development.json | 0 .../WebApi/appsettings.json | 0 .../ATDD/Common/WebApiTestServer.cs | 3 +- .../ATDD/GameTests/End2EndTests.cs | 3 +- .../ATDD/GameTests/GameCreatedTests.cs | 2 +- .../ATDD/GameTests/GameEndedTests.cs | 2 +- .../ATDD/GameTests/GameStartedTests.cs | 3 +- .../ATDD/GameTests/GetGameTests.cs | 0 .../GameTests/PlayerRoleConfirmedTests.cs | 2 +- .../ATDD/GameTests/PlayerSpeakingTests.cs | 0 .../ATDD/GameTests/PlayerTriggerSkillTests.cs | 0 .../ATDD/GameTests/SeerDiscoverTests.cs | 2 +- .../ATDD/GameTests/WerewolfVotedTests.cs | 2 +- .../ATDD/GameTests/WitchUseAntidoteTests.cs | 2 +- .../ATDD/GameTests/WitchUsePoisonTests.cs | 2 +- .../WebApiTests/Common/GameBuilder.cs | 0 .../WebApiTests/Common/GameFaker.cs | 0 .../ConfirmPlayerRoleUseCaseTests.cs | 0 .../UseCases/ConfirmPlayerRoleUseCaseTests.cs | 2 +- .../UseCases/StartGameUseCaseTests.cs | 0 .../UseCases/WerewolfVoteUseCaseTests.cs | 0 .../TDD/Common/ArrayEqualityComparer.cs | 0 .../TDD/DomainTest/GameNightVoteTest.cs | 0 .../WebApiTests/TDD/DomainTest/GameTest.cs | 0 .../TDD/DomainTest/NightEndedTest.cs | 0 .../TDD/DomainTest/WerewolfVoteTests.cs | 0 .../EntityFrameworkCoreTest/RepositoryTest.cs | 2 +- .../{test => tests}/WebApiTests/Usings.cs | 0 .../Wsa.Gaas.Werewolf.WebApiTests.csproj | 6 +- src/Directory.Build.props | 44 ----------- src/Wsa.Gaas.Werewolf.BackEnd.sln | 75 +++++++++---------- 134 files changed, 102 insertions(+), 146 deletions(-) rename src/BackEnd/src/{ => Core}/Application/Common/GameEventBus.cs (100%) rename src/BackEnd/src/{ => Core}/Application/Common/IGameEventHandler.cs (100%) rename src/BackEnd/src/{ => Core}/Application/Common/IPresenter.cs (100%) rename src/BackEnd/src/{ => Core}/Application/Common/IRepository.cs (100%) rename src/BackEnd/src/{ => Core}/Application/Common/Policy.cs (100%) rename src/BackEnd/src/{ => Core}/Application/Common/UseCase.cs (100%) rename src/BackEnd/src/{ => Core}/Application/DependencyInjection.cs (94%) rename src/BackEnd/src/{ => Core}/Application/Dtos/PlayerDto.cs (100%) rename src/BackEnd/src/{ => Core}/Application/GlobalUsing.cs (100%) rename src/BackEnd/src/{ => Core}/Application/Options/GameSettingOptions.cs (100%) rename src/BackEnd/src/{ => Core}/Application/Policies/PlayerRoleConfirmationStartedPolicy.cs (100%) rename src/BackEnd/src/{ => Core}/Application/Policies/SeerRoundStartedEventPolicy.cs (100%) rename src/BackEnd/src/{ => Core}/Application/Policies/WerewolfRoundStartedEventPolicy.cs (100%) rename src/BackEnd/src/{ => Core}/Application/Policies/WitchAntidoteRoundStartedEventPolicy.cs (100%) rename src/BackEnd/src/{ => Core}/Application/UseCases/ConfirmPlayerRoleUseCase.cs (100%) rename src/BackEnd/src/{ => Core}/Application/UseCases/CreateGameUseCase.cs (100%) rename src/BackEnd/src/{ => Core}/Application/UseCases/DiscoverPlayerRoleUseCase.cs (100%) rename src/BackEnd/src/{ => Core}/Application/UseCases/EndGameUseCase.cs (100%) rename src/BackEnd/src/{ => Core}/Application/UseCases/GetGameUseCase.cs (100%) rename src/BackEnd/src/{ => Core}/Application/UseCases/PlayerTriggerSkillUseCase.cs (100%) rename src/BackEnd/src/{ => Core}/Application/UseCases/StartGameUseCase.cs (100%) rename src/BackEnd/src/{ => Core}/Application/UseCases/WerewolfVoteUseCase.cs (100%) rename src/BackEnd/src/{ => Core}/Application/UseCases/WitchUseAntidoteUseCase.cs (100%) rename src/BackEnd/src/{ => Core}/Application/UseCases/WitchUsePoisonUseCase.cs (100%) rename src/BackEnd/src/{ => Core}/Application/Wsa.Gaas.Werewolf.Application.csproj (87%) rename src/BackEnd/src/{ => Core}/Domain/Common/GameEvent.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Common/GameException.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Events/GameCreatedEvent.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Events/GameEndedEvent.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Events/GameStartedEvent.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Events/GetGameEvent.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Events/LastNightResultAnnouncedEvent.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Events/PlayerDiedGameEvent.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Events/PlayerRoleConfirmationEndedEvent.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Events/PlayerRoleConfirmationStartedEvent.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Events/PlayerRoleConfirmedEvent.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Events/PlayerSpeakingEvent.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Events/PlayerTriggerSkillEvent.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Events/SafetyEveGameEvent.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Events/SeerDiscoveredEvent.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Events/SeerEyesOpenedEvent.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Events/SeerRoundStartedEvent.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Events/WerewolfRoundStartedEvent.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Events/WerewolfVotedEvent.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Events/WitchAntidoteRoundStartedEvent.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Events/WitchAntidoteUsedEvent.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Events/WitchPoisonRoundStartedEvent.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Events/WitchPoisonUsedEvent.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Exceptions/GameAlreadyEndedException.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Exceptions/GameAlreadyStartedException.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Exceptions/GameChannelException.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Exceptions/GameNotFoundException.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Exceptions/GameNotStartedException.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Exceptions/GameStatusException.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Exceptions/PlayerNotFoundException.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Exceptions/PlayerNotSurvivedException.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Exceptions/PlayerNotWerewolfException.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Exceptions/PlayerNotWitchException.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Exceptions/PlayerRoleNotAssignedException.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Exceptions/PlayersDuplicatedException.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Exceptions/PlayersNumberNotSupportedException.cs (100%) rename src/BackEnd/src/{Domain/Using.cs => Core/Domain/GlobalUsing.cs} (100%) rename src/BackEnd/src/{ => Core}/Domain/Objects/Game.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Objects/GameStatus.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Objects/Player.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Objects/Role.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Objects/Roles/AlphaWerewolf.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Objects/Roles/Guardian.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Objects/Roles/Hunter.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Objects/Roles/Seer.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Objects/Roles/Villager.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Objects/Roles/Werewolf.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Objects/Roles/Witch.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Objects/VoteManager.cs (100%) rename src/BackEnd/src/{ => Core}/Domain/Wsa.Gaas.Werewolf.Domain.csproj (100%) rename src/BackEnd/src/{InterfaceAdapter/EntityFrameworkCore => Infrastructure/SqlServer}/DependencyInjection.cs (93%) rename src/BackEnd/src/{InterfaceAdapter/EntityFrameworkCore => Infrastructure/SqlServer}/InMemoryRepository.cs (96%) rename src/BackEnd/src/{InterfaceAdapter/EntityFrameworkCore/EntityFrameworkCoreRepository.cs => Infrastructure/SqlServer/SqlServerRepository.cs} (90%) rename src/BackEnd/src/{InterfaceAdapter/EntityFrameworkCore => Infrastructure/SqlServer}/TypeConfigurations/GameTypeConfiguration.cs (89%) rename src/BackEnd/src/{InterfaceAdapter/EntityFrameworkCore => Infrastructure/SqlServer}/TypeConfigurations/PlayerTypeConfiguration.cs (86%) rename src/BackEnd/src/{InterfaceAdapter/EntityFrameworkCore => Infrastructure/SqlServer}/TypeConfigurations/RoleTypeConfiguration.cs (96%) rename src/BackEnd/src/{InterfaceAdapter/EntityFrameworkCore/Wsa.Gaas.Werewolf.EntityFrameworkCore.csproj => Infrastructure/SqlServer/Wsa.Gaas.Werewolf.SqlServer.csproj} (69%) rename src/BackEnd/src/{InterfaceAdapter => Presentation}/WebApi/ApiClient.cs (100%) rename src/BackEnd/src/{InterfaceAdapter => Presentation}/WebApi/Common/WebApiEndpoint.cs (90%) rename src/BackEnd/src/{InterfaceAdapter => Presentation}/WebApi/DependencyInjection.cs (94%) rename src/BackEnd/src/{InterfaceAdapter => Presentation}/WebApi/Endpoints/ConfirmPlayerRoleEndpoint.cs (88%) rename src/BackEnd/src/{InterfaceAdapter => Presentation}/WebApi/Endpoints/CreateGameEndpoint.cs (80%) rename src/BackEnd/src/{InterfaceAdapter => Presentation}/WebApi/Endpoints/DiscoverPlayerRoleEndpoint.cs (83%) rename src/BackEnd/src/{InterfaceAdapter => Presentation}/WebApi/Endpoints/EndGameEndpoint.cs (80%) rename src/BackEnd/src/{InterfaceAdapter => Presentation}/WebApi/Endpoints/GetGameEndpoint.cs (82%) rename src/BackEnd/src/{InterfaceAdapter => Presentation}/WebApi/Endpoints/PlayerTriggerSkillEndpoint.cs (92%) rename src/BackEnd/src/{InterfaceAdapter => Presentation}/WebApi/Endpoints/StartGameEndpoint.cs (81%) rename src/BackEnd/src/{InterfaceAdapter => Presentation}/WebApi/Endpoints/WerewolfVoteEndpoint.cs (82%) rename src/BackEnd/src/{InterfaceAdapter => Presentation}/WebApi/Endpoints/WitchUseAntidoteEndpoint.cs (83%) rename src/BackEnd/src/{InterfaceAdapter => Presentation}/WebApi/Endpoints/WitchUsePoisonEndpoint.cs (83%) rename src/BackEnd/src/{InterfaceAdapter => Presentation}/WebApi/Extensions/ExceptionHandlerExtensions.cs (96%) rename src/BackEnd/src/{InterfaceAdapter => Presentation}/WebApi/GameEventHub.cs (94%) rename src/BackEnd/src/{InterfaceAdapter => Presentation}/WebApi/Program.cs (88%) rename src/BackEnd/src/{InterfaceAdapter => Presentation}/WebApi/Properties/launchSettings.json (100%) rename src/BackEnd/src/{InterfaceAdapter => Presentation}/WebApi/ViewModels/GameVm.cs (93%) rename src/BackEnd/src/{InterfaceAdapter => Presentation}/WebApi/ViewModels/PlayerVm.cs (91%) rename src/BackEnd/src/{InterfaceAdapter => Presentation}/WebApi/WebApiDefaults.cs (77%) rename src/BackEnd/src/{InterfaceAdapter => Presentation}/WebApi/Wsa.Gaas.Werewolf.WebApi.csproj (52%) rename src/BackEnd/src/{InterfaceAdapter => Presentation}/WebApi/appsettings.Development.json (100%) rename src/BackEnd/src/{InterfaceAdapter => Presentation}/WebApi/appsettings.json (100%) rename src/BackEnd/{test => tests}/WebApiTests/ATDD/Common/WebApiTestServer.cs (97%) rename src/BackEnd/{test => tests}/WebApiTests/ATDD/GameTests/End2EndTests.cs (96%) rename src/BackEnd/{test => tests}/WebApiTests/ATDD/GameTests/GameCreatedTests.cs (98%) rename src/BackEnd/{test => tests}/WebApiTests/ATDD/GameTests/GameEndedTests.cs (97%) rename src/BackEnd/{test => tests}/WebApiTests/ATDD/GameTests/GameStartedTests.cs (98%) rename src/BackEnd/{test => tests}/WebApiTests/ATDD/GameTests/GetGameTests.cs (100%) rename src/BackEnd/{test => tests}/WebApiTests/ATDD/GameTests/PlayerRoleConfirmedTests.cs (98%) rename src/BackEnd/{test => tests}/WebApiTests/ATDD/GameTests/PlayerSpeakingTests.cs (100%) rename src/BackEnd/{test => tests}/WebApiTests/ATDD/GameTests/PlayerTriggerSkillTests.cs (100%) rename src/BackEnd/{test => tests}/WebApiTests/ATDD/GameTests/SeerDiscoverTests.cs (99%) rename src/BackEnd/{test => tests}/WebApiTests/ATDD/GameTests/WerewolfVotedTests.cs (99%) rename src/BackEnd/{test => tests}/WebApiTests/ATDD/GameTests/WitchUseAntidoteTests.cs (98%) rename src/BackEnd/{test => tests}/WebApiTests/ATDD/GameTests/WitchUsePoisonTests.cs (97%) rename src/BackEnd/{test => tests}/WebApiTests/Common/GameBuilder.cs (100%) rename src/BackEnd/{test => tests}/WebApiTests/Common/GameFaker.cs (100%) rename src/BackEnd/{test => tests}/WebApiTests/TDD/ApplicationTest/UseCaseTests/ConfirmPlayerRoleUseCaseTests.cs (100%) rename src/BackEnd/{test => tests}/WebApiTests/TDD/ApplicationTest/UseCases/ConfirmPlayerRoleUseCaseTests.cs (97%) rename src/BackEnd/{test => tests}/WebApiTests/TDD/ApplicationTest/UseCases/StartGameUseCaseTests.cs (100%) rename src/BackEnd/{test => tests}/WebApiTests/TDD/ApplicationTest/UseCases/WerewolfVoteUseCaseTests.cs (100%) rename src/BackEnd/{test => tests}/WebApiTests/TDD/Common/ArrayEqualityComparer.cs (100%) rename src/BackEnd/{test => tests}/WebApiTests/TDD/DomainTest/GameNightVoteTest.cs (100%) rename src/BackEnd/{test => tests}/WebApiTests/TDD/DomainTest/GameTest.cs (100%) rename src/BackEnd/{test => tests}/WebApiTests/TDD/DomainTest/NightEndedTest.cs (100%) rename src/BackEnd/{test => tests}/WebApiTests/TDD/DomainTest/WerewolfVoteTests.cs (100%) rename src/BackEnd/{test => tests}/WebApiTests/TDD/EntityFrameworkCoreTest/RepositoryTest.cs (98%) rename src/BackEnd/{test => tests}/WebApiTests/Usings.cs (100%) rename src/BackEnd/{test => tests}/WebApiTests/Wsa.Gaas.Werewolf.WebApiTests.csproj (74%) delete mode 100644 src/Directory.Build.props diff --git a/src/BackEnd/src/Application/Common/GameEventBus.cs b/src/BackEnd/src/Core/Application/Common/GameEventBus.cs similarity index 100% rename from src/BackEnd/src/Application/Common/GameEventBus.cs rename to src/BackEnd/src/Core/Application/Common/GameEventBus.cs diff --git a/src/BackEnd/src/Application/Common/IGameEventHandler.cs b/src/BackEnd/src/Core/Application/Common/IGameEventHandler.cs similarity index 100% rename from src/BackEnd/src/Application/Common/IGameEventHandler.cs rename to src/BackEnd/src/Core/Application/Common/IGameEventHandler.cs diff --git a/src/BackEnd/src/Application/Common/IPresenter.cs b/src/BackEnd/src/Core/Application/Common/IPresenter.cs similarity index 100% rename from src/BackEnd/src/Application/Common/IPresenter.cs rename to src/BackEnd/src/Core/Application/Common/IPresenter.cs diff --git a/src/BackEnd/src/Application/Common/IRepository.cs b/src/BackEnd/src/Core/Application/Common/IRepository.cs similarity index 100% rename from src/BackEnd/src/Application/Common/IRepository.cs rename to src/BackEnd/src/Core/Application/Common/IRepository.cs diff --git a/src/BackEnd/src/Application/Common/Policy.cs b/src/BackEnd/src/Core/Application/Common/Policy.cs similarity index 100% rename from src/BackEnd/src/Application/Common/Policy.cs rename to src/BackEnd/src/Core/Application/Common/Policy.cs diff --git a/src/BackEnd/src/Application/Common/UseCase.cs b/src/BackEnd/src/Core/Application/Common/UseCase.cs similarity index 100% rename from src/BackEnd/src/Application/Common/UseCase.cs rename to src/BackEnd/src/Core/Application/Common/UseCase.cs diff --git a/src/BackEnd/src/Application/DependencyInjection.cs b/src/BackEnd/src/Core/Application/DependencyInjection.cs similarity index 94% rename from src/BackEnd/src/Application/DependencyInjection.cs rename to src/BackEnd/src/Core/Application/DependencyInjection.cs index ab7c267..84c6c6e 100644 --- a/src/BackEnd/src/Application/DependencyInjection.cs +++ b/src/BackEnd/src/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, ImplementType>(); services.AddScoped(type.BaseType, type); } } diff --git a/src/BackEnd/src/Application/Dtos/PlayerDto.cs b/src/BackEnd/src/Core/Application/Dtos/PlayerDto.cs similarity index 100% rename from src/BackEnd/src/Application/Dtos/PlayerDto.cs rename to src/BackEnd/src/Core/Application/Dtos/PlayerDto.cs diff --git a/src/BackEnd/src/Application/GlobalUsing.cs b/src/BackEnd/src/Core/Application/GlobalUsing.cs similarity index 100% rename from src/BackEnd/src/Application/GlobalUsing.cs rename to src/BackEnd/src/Core/Application/GlobalUsing.cs diff --git a/src/BackEnd/src/Application/Options/GameSettingOptions.cs b/src/BackEnd/src/Core/Application/Options/GameSettingOptions.cs similarity index 100% rename from src/BackEnd/src/Application/Options/GameSettingOptions.cs rename to src/BackEnd/src/Core/Application/Options/GameSettingOptions.cs diff --git a/src/BackEnd/src/Application/Policies/PlayerRoleConfirmationStartedPolicy.cs b/src/BackEnd/src/Core/Application/Policies/PlayerRoleConfirmationStartedPolicy.cs similarity index 100% rename from src/BackEnd/src/Application/Policies/PlayerRoleConfirmationStartedPolicy.cs rename to src/BackEnd/src/Core/Application/Policies/PlayerRoleConfirmationStartedPolicy.cs diff --git a/src/BackEnd/src/Application/Policies/SeerRoundStartedEventPolicy.cs b/src/BackEnd/src/Core/Application/Policies/SeerRoundStartedEventPolicy.cs similarity index 100% rename from src/BackEnd/src/Application/Policies/SeerRoundStartedEventPolicy.cs rename to src/BackEnd/src/Core/Application/Policies/SeerRoundStartedEventPolicy.cs diff --git a/src/BackEnd/src/Application/Policies/WerewolfRoundStartedEventPolicy.cs b/src/BackEnd/src/Core/Application/Policies/WerewolfRoundStartedEventPolicy.cs similarity index 100% rename from src/BackEnd/src/Application/Policies/WerewolfRoundStartedEventPolicy.cs rename to src/BackEnd/src/Core/Application/Policies/WerewolfRoundStartedEventPolicy.cs diff --git a/src/BackEnd/src/Application/Policies/WitchAntidoteRoundStartedEventPolicy.cs b/src/BackEnd/src/Core/Application/Policies/WitchAntidoteRoundStartedEventPolicy.cs similarity index 100% rename from src/BackEnd/src/Application/Policies/WitchAntidoteRoundStartedEventPolicy.cs rename to src/BackEnd/src/Core/Application/Policies/WitchAntidoteRoundStartedEventPolicy.cs diff --git a/src/BackEnd/src/Application/UseCases/ConfirmPlayerRoleUseCase.cs b/src/BackEnd/src/Core/Application/UseCases/ConfirmPlayerRoleUseCase.cs similarity index 100% rename from src/BackEnd/src/Application/UseCases/ConfirmPlayerRoleUseCase.cs rename to src/BackEnd/src/Core/Application/UseCases/ConfirmPlayerRoleUseCase.cs diff --git a/src/BackEnd/src/Application/UseCases/CreateGameUseCase.cs b/src/BackEnd/src/Core/Application/UseCases/CreateGameUseCase.cs similarity index 100% rename from src/BackEnd/src/Application/UseCases/CreateGameUseCase.cs rename to src/BackEnd/src/Core/Application/UseCases/CreateGameUseCase.cs diff --git a/src/BackEnd/src/Application/UseCases/DiscoverPlayerRoleUseCase.cs b/src/BackEnd/src/Core/Application/UseCases/DiscoverPlayerRoleUseCase.cs similarity index 100% rename from src/BackEnd/src/Application/UseCases/DiscoverPlayerRoleUseCase.cs rename to src/BackEnd/src/Core/Application/UseCases/DiscoverPlayerRoleUseCase.cs diff --git a/src/BackEnd/src/Application/UseCases/EndGameUseCase.cs b/src/BackEnd/src/Core/Application/UseCases/EndGameUseCase.cs similarity index 100% rename from src/BackEnd/src/Application/UseCases/EndGameUseCase.cs rename to src/BackEnd/src/Core/Application/UseCases/EndGameUseCase.cs diff --git a/src/BackEnd/src/Application/UseCases/GetGameUseCase.cs b/src/BackEnd/src/Core/Application/UseCases/GetGameUseCase.cs similarity index 100% rename from src/BackEnd/src/Application/UseCases/GetGameUseCase.cs rename to src/BackEnd/src/Core/Application/UseCases/GetGameUseCase.cs diff --git a/src/BackEnd/src/Application/UseCases/PlayerTriggerSkillUseCase.cs b/src/BackEnd/src/Core/Application/UseCases/PlayerTriggerSkillUseCase.cs similarity index 100% rename from src/BackEnd/src/Application/UseCases/PlayerTriggerSkillUseCase.cs rename to src/BackEnd/src/Core/Application/UseCases/PlayerTriggerSkillUseCase.cs diff --git a/src/BackEnd/src/Application/UseCases/StartGameUseCase.cs b/src/BackEnd/src/Core/Application/UseCases/StartGameUseCase.cs similarity index 100% rename from src/BackEnd/src/Application/UseCases/StartGameUseCase.cs rename to src/BackEnd/src/Core/Application/UseCases/StartGameUseCase.cs diff --git a/src/BackEnd/src/Application/UseCases/WerewolfVoteUseCase.cs b/src/BackEnd/src/Core/Application/UseCases/WerewolfVoteUseCase.cs similarity index 100% rename from src/BackEnd/src/Application/UseCases/WerewolfVoteUseCase.cs rename to src/BackEnd/src/Core/Application/UseCases/WerewolfVoteUseCase.cs diff --git a/src/BackEnd/src/Application/UseCases/WitchUseAntidoteUseCase.cs b/src/BackEnd/src/Core/Application/UseCases/WitchUseAntidoteUseCase.cs similarity index 100% rename from src/BackEnd/src/Application/UseCases/WitchUseAntidoteUseCase.cs rename to src/BackEnd/src/Core/Application/UseCases/WitchUseAntidoteUseCase.cs diff --git a/src/BackEnd/src/Application/UseCases/WitchUsePoisonUseCase.cs b/src/BackEnd/src/Core/Application/UseCases/WitchUsePoisonUseCase.cs similarity index 100% rename from src/BackEnd/src/Application/UseCases/WitchUsePoisonUseCase.cs rename to src/BackEnd/src/Core/Application/UseCases/WitchUsePoisonUseCase.cs diff --git a/src/BackEnd/src/Application/Wsa.Gaas.Werewolf.Application.csproj b/src/BackEnd/src/Core/Application/Wsa.Gaas.Werewolf.Application.csproj similarity index 87% rename from src/BackEnd/src/Application/Wsa.Gaas.Werewolf.Application.csproj rename to src/BackEnd/src/Core/Application/Wsa.Gaas.Werewolf.Application.csproj index 62ff1db..01d7b92 100644 --- a/src/BackEnd/src/Application/Wsa.Gaas.Werewolf.Application.csproj +++ b/src/BackEnd/src/Core/Application/Wsa.Gaas.Werewolf.Application.csproj @@ -6,10 +6,6 @@ enable - - - - diff --git a/src/BackEnd/src/Domain/Common/GameEvent.cs b/src/BackEnd/src/Core/Domain/Common/GameEvent.cs similarity index 100% rename from src/BackEnd/src/Domain/Common/GameEvent.cs rename to src/BackEnd/src/Core/Domain/Common/GameEvent.cs diff --git a/src/BackEnd/src/Domain/Common/GameException.cs b/src/BackEnd/src/Core/Domain/Common/GameException.cs similarity index 100% rename from src/BackEnd/src/Domain/Common/GameException.cs rename to src/BackEnd/src/Core/Domain/Common/GameException.cs diff --git a/src/BackEnd/src/Domain/Events/GameCreatedEvent.cs b/src/BackEnd/src/Core/Domain/Events/GameCreatedEvent.cs similarity index 100% rename from src/BackEnd/src/Domain/Events/GameCreatedEvent.cs rename to src/BackEnd/src/Core/Domain/Events/GameCreatedEvent.cs diff --git a/src/BackEnd/src/Domain/Events/GameEndedEvent.cs b/src/BackEnd/src/Core/Domain/Events/GameEndedEvent.cs similarity index 100% rename from src/BackEnd/src/Domain/Events/GameEndedEvent.cs rename to src/BackEnd/src/Core/Domain/Events/GameEndedEvent.cs diff --git a/src/BackEnd/src/Domain/Events/GameStartedEvent.cs b/src/BackEnd/src/Core/Domain/Events/GameStartedEvent.cs similarity index 100% rename from src/BackEnd/src/Domain/Events/GameStartedEvent.cs rename to src/BackEnd/src/Core/Domain/Events/GameStartedEvent.cs diff --git a/src/BackEnd/src/Domain/Events/GetGameEvent.cs b/src/BackEnd/src/Core/Domain/Events/GetGameEvent.cs similarity index 100% rename from src/BackEnd/src/Domain/Events/GetGameEvent.cs rename to src/BackEnd/src/Core/Domain/Events/GetGameEvent.cs diff --git a/src/BackEnd/src/Domain/Events/LastNightResultAnnouncedEvent.cs b/src/BackEnd/src/Core/Domain/Events/LastNightResultAnnouncedEvent.cs similarity index 100% rename from src/BackEnd/src/Domain/Events/LastNightResultAnnouncedEvent.cs rename to src/BackEnd/src/Core/Domain/Events/LastNightResultAnnouncedEvent.cs diff --git a/src/BackEnd/src/Domain/Events/PlayerDiedGameEvent.cs b/src/BackEnd/src/Core/Domain/Events/PlayerDiedGameEvent.cs similarity index 100% rename from src/BackEnd/src/Domain/Events/PlayerDiedGameEvent.cs rename to src/BackEnd/src/Core/Domain/Events/PlayerDiedGameEvent.cs diff --git a/src/BackEnd/src/Domain/Events/PlayerRoleConfirmationEndedEvent.cs b/src/BackEnd/src/Core/Domain/Events/PlayerRoleConfirmationEndedEvent.cs similarity index 100% rename from src/BackEnd/src/Domain/Events/PlayerRoleConfirmationEndedEvent.cs rename to src/BackEnd/src/Core/Domain/Events/PlayerRoleConfirmationEndedEvent.cs diff --git a/src/BackEnd/src/Domain/Events/PlayerRoleConfirmationStartedEvent.cs b/src/BackEnd/src/Core/Domain/Events/PlayerRoleConfirmationStartedEvent.cs similarity index 100% rename from src/BackEnd/src/Domain/Events/PlayerRoleConfirmationStartedEvent.cs rename to src/BackEnd/src/Core/Domain/Events/PlayerRoleConfirmationStartedEvent.cs diff --git a/src/BackEnd/src/Domain/Events/PlayerRoleConfirmedEvent.cs b/src/BackEnd/src/Core/Domain/Events/PlayerRoleConfirmedEvent.cs similarity index 100% rename from src/BackEnd/src/Domain/Events/PlayerRoleConfirmedEvent.cs rename to src/BackEnd/src/Core/Domain/Events/PlayerRoleConfirmedEvent.cs diff --git a/src/BackEnd/src/Domain/Events/PlayerSpeakingEvent.cs b/src/BackEnd/src/Core/Domain/Events/PlayerSpeakingEvent.cs similarity index 100% rename from src/BackEnd/src/Domain/Events/PlayerSpeakingEvent.cs rename to src/BackEnd/src/Core/Domain/Events/PlayerSpeakingEvent.cs diff --git a/src/BackEnd/src/Domain/Events/PlayerTriggerSkillEvent.cs b/src/BackEnd/src/Core/Domain/Events/PlayerTriggerSkillEvent.cs similarity index 100% rename from src/BackEnd/src/Domain/Events/PlayerTriggerSkillEvent.cs rename to src/BackEnd/src/Core/Domain/Events/PlayerTriggerSkillEvent.cs diff --git a/src/BackEnd/src/Domain/Events/SafetyEveGameEvent.cs b/src/BackEnd/src/Core/Domain/Events/SafetyEveGameEvent.cs similarity index 100% rename from src/BackEnd/src/Domain/Events/SafetyEveGameEvent.cs rename to src/BackEnd/src/Core/Domain/Events/SafetyEveGameEvent.cs diff --git a/src/BackEnd/src/Domain/Events/SeerDiscoveredEvent.cs b/src/BackEnd/src/Core/Domain/Events/SeerDiscoveredEvent.cs similarity index 100% rename from src/BackEnd/src/Domain/Events/SeerDiscoveredEvent.cs rename to src/BackEnd/src/Core/Domain/Events/SeerDiscoveredEvent.cs diff --git a/src/BackEnd/src/Domain/Events/SeerEyesOpenedEvent.cs b/src/BackEnd/src/Core/Domain/Events/SeerEyesOpenedEvent.cs similarity index 100% rename from src/BackEnd/src/Domain/Events/SeerEyesOpenedEvent.cs rename to src/BackEnd/src/Core/Domain/Events/SeerEyesOpenedEvent.cs diff --git a/src/BackEnd/src/Domain/Events/SeerRoundStartedEvent.cs b/src/BackEnd/src/Core/Domain/Events/SeerRoundStartedEvent.cs similarity index 100% rename from src/BackEnd/src/Domain/Events/SeerRoundStartedEvent.cs rename to src/BackEnd/src/Core/Domain/Events/SeerRoundStartedEvent.cs diff --git a/src/BackEnd/src/Domain/Events/WerewolfRoundStartedEvent.cs b/src/BackEnd/src/Core/Domain/Events/WerewolfRoundStartedEvent.cs similarity index 100% rename from src/BackEnd/src/Domain/Events/WerewolfRoundStartedEvent.cs rename to src/BackEnd/src/Core/Domain/Events/WerewolfRoundStartedEvent.cs diff --git a/src/BackEnd/src/Domain/Events/WerewolfVotedEvent.cs b/src/BackEnd/src/Core/Domain/Events/WerewolfVotedEvent.cs similarity index 100% rename from src/BackEnd/src/Domain/Events/WerewolfVotedEvent.cs rename to src/BackEnd/src/Core/Domain/Events/WerewolfVotedEvent.cs diff --git a/src/BackEnd/src/Domain/Events/WitchAntidoteRoundStartedEvent.cs b/src/BackEnd/src/Core/Domain/Events/WitchAntidoteRoundStartedEvent.cs similarity index 100% rename from src/BackEnd/src/Domain/Events/WitchAntidoteRoundStartedEvent.cs rename to src/BackEnd/src/Core/Domain/Events/WitchAntidoteRoundStartedEvent.cs diff --git a/src/BackEnd/src/Domain/Events/WitchAntidoteUsedEvent.cs b/src/BackEnd/src/Core/Domain/Events/WitchAntidoteUsedEvent.cs similarity index 100% rename from src/BackEnd/src/Domain/Events/WitchAntidoteUsedEvent.cs rename to src/BackEnd/src/Core/Domain/Events/WitchAntidoteUsedEvent.cs diff --git a/src/BackEnd/src/Domain/Events/WitchPoisonRoundStartedEvent.cs b/src/BackEnd/src/Core/Domain/Events/WitchPoisonRoundStartedEvent.cs similarity index 100% rename from src/BackEnd/src/Domain/Events/WitchPoisonRoundStartedEvent.cs rename to src/BackEnd/src/Core/Domain/Events/WitchPoisonRoundStartedEvent.cs diff --git a/src/BackEnd/src/Domain/Events/WitchPoisonUsedEvent.cs b/src/BackEnd/src/Core/Domain/Events/WitchPoisonUsedEvent.cs similarity index 100% rename from src/BackEnd/src/Domain/Events/WitchPoisonUsedEvent.cs rename to src/BackEnd/src/Core/Domain/Events/WitchPoisonUsedEvent.cs diff --git a/src/BackEnd/src/Domain/Exceptions/GameAlreadyEndedException.cs b/src/BackEnd/src/Core/Domain/Exceptions/GameAlreadyEndedException.cs similarity index 100% rename from src/BackEnd/src/Domain/Exceptions/GameAlreadyEndedException.cs rename to src/BackEnd/src/Core/Domain/Exceptions/GameAlreadyEndedException.cs diff --git a/src/BackEnd/src/Domain/Exceptions/GameAlreadyStartedException.cs b/src/BackEnd/src/Core/Domain/Exceptions/GameAlreadyStartedException.cs similarity index 100% rename from src/BackEnd/src/Domain/Exceptions/GameAlreadyStartedException.cs rename to src/BackEnd/src/Core/Domain/Exceptions/GameAlreadyStartedException.cs diff --git a/src/BackEnd/src/Domain/Exceptions/GameChannelException.cs b/src/BackEnd/src/Core/Domain/Exceptions/GameChannelException.cs similarity index 100% rename from src/BackEnd/src/Domain/Exceptions/GameChannelException.cs rename to src/BackEnd/src/Core/Domain/Exceptions/GameChannelException.cs diff --git a/src/BackEnd/src/Domain/Exceptions/GameNotFoundException.cs b/src/BackEnd/src/Core/Domain/Exceptions/GameNotFoundException.cs similarity index 100% rename from src/BackEnd/src/Domain/Exceptions/GameNotFoundException.cs rename to src/BackEnd/src/Core/Domain/Exceptions/GameNotFoundException.cs diff --git a/src/BackEnd/src/Domain/Exceptions/GameNotStartedException.cs b/src/BackEnd/src/Core/Domain/Exceptions/GameNotStartedException.cs similarity index 100% rename from src/BackEnd/src/Domain/Exceptions/GameNotStartedException.cs rename to src/BackEnd/src/Core/Domain/Exceptions/GameNotStartedException.cs diff --git a/src/BackEnd/src/Domain/Exceptions/GameStatusException.cs b/src/BackEnd/src/Core/Domain/Exceptions/GameStatusException.cs similarity index 100% rename from src/BackEnd/src/Domain/Exceptions/GameStatusException.cs rename to src/BackEnd/src/Core/Domain/Exceptions/GameStatusException.cs diff --git a/src/BackEnd/src/Domain/Exceptions/PlayerNotFoundException.cs b/src/BackEnd/src/Core/Domain/Exceptions/PlayerNotFoundException.cs similarity index 100% rename from src/BackEnd/src/Domain/Exceptions/PlayerNotFoundException.cs rename to src/BackEnd/src/Core/Domain/Exceptions/PlayerNotFoundException.cs diff --git a/src/BackEnd/src/Domain/Exceptions/PlayerNotSurvivedException.cs b/src/BackEnd/src/Core/Domain/Exceptions/PlayerNotSurvivedException.cs similarity index 100% rename from src/BackEnd/src/Domain/Exceptions/PlayerNotSurvivedException.cs rename to src/BackEnd/src/Core/Domain/Exceptions/PlayerNotSurvivedException.cs diff --git a/src/BackEnd/src/Domain/Exceptions/PlayerNotWerewolfException.cs b/src/BackEnd/src/Core/Domain/Exceptions/PlayerNotWerewolfException.cs similarity index 100% rename from src/BackEnd/src/Domain/Exceptions/PlayerNotWerewolfException.cs rename to src/BackEnd/src/Core/Domain/Exceptions/PlayerNotWerewolfException.cs diff --git a/src/BackEnd/src/Domain/Exceptions/PlayerNotWitchException.cs b/src/BackEnd/src/Core/Domain/Exceptions/PlayerNotWitchException.cs similarity index 100% rename from src/BackEnd/src/Domain/Exceptions/PlayerNotWitchException.cs rename to src/BackEnd/src/Core/Domain/Exceptions/PlayerNotWitchException.cs diff --git a/src/BackEnd/src/Domain/Exceptions/PlayerRoleNotAssignedException.cs b/src/BackEnd/src/Core/Domain/Exceptions/PlayerRoleNotAssignedException.cs similarity index 100% rename from src/BackEnd/src/Domain/Exceptions/PlayerRoleNotAssignedException.cs rename to src/BackEnd/src/Core/Domain/Exceptions/PlayerRoleNotAssignedException.cs diff --git a/src/BackEnd/src/Domain/Exceptions/PlayersDuplicatedException.cs b/src/BackEnd/src/Core/Domain/Exceptions/PlayersDuplicatedException.cs similarity index 100% rename from src/BackEnd/src/Domain/Exceptions/PlayersDuplicatedException.cs rename to src/BackEnd/src/Core/Domain/Exceptions/PlayersDuplicatedException.cs diff --git a/src/BackEnd/src/Domain/Exceptions/PlayersNumberNotSupportedException.cs b/src/BackEnd/src/Core/Domain/Exceptions/PlayersNumberNotSupportedException.cs similarity index 100% rename from src/BackEnd/src/Domain/Exceptions/PlayersNumberNotSupportedException.cs rename to src/BackEnd/src/Core/Domain/Exceptions/PlayersNumberNotSupportedException.cs diff --git a/src/BackEnd/src/Domain/Using.cs b/src/BackEnd/src/Core/Domain/GlobalUsing.cs similarity index 100% rename from src/BackEnd/src/Domain/Using.cs rename to src/BackEnd/src/Core/Domain/GlobalUsing.cs diff --git a/src/BackEnd/src/Domain/Objects/Game.cs b/src/BackEnd/src/Core/Domain/Objects/Game.cs similarity index 100% rename from src/BackEnd/src/Domain/Objects/Game.cs rename to src/BackEnd/src/Core/Domain/Objects/Game.cs diff --git a/src/BackEnd/src/Domain/Objects/GameStatus.cs b/src/BackEnd/src/Core/Domain/Objects/GameStatus.cs similarity index 100% rename from src/BackEnd/src/Domain/Objects/GameStatus.cs rename to src/BackEnd/src/Core/Domain/Objects/GameStatus.cs diff --git a/src/BackEnd/src/Domain/Objects/Player.cs b/src/BackEnd/src/Core/Domain/Objects/Player.cs similarity index 100% rename from src/BackEnd/src/Domain/Objects/Player.cs rename to src/BackEnd/src/Core/Domain/Objects/Player.cs diff --git a/src/BackEnd/src/Domain/Objects/Role.cs b/src/BackEnd/src/Core/Domain/Objects/Role.cs similarity index 100% rename from src/BackEnd/src/Domain/Objects/Role.cs rename to src/BackEnd/src/Core/Domain/Objects/Role.cs diff --git a/src/BackEnd/src/Domain/Objects/Roles/AlphaWerewolf.cs b/src/BackEnd/src/Core/Domain/Objects/Roles/AlphaWerewolf.cs similarity index 100% rename from src/BackEnd/src/Domain/Objects/Roles/AlphaWerewolf.cs rename to src/BackEnd/src/Core/Domain/Objects/Roles/AlphaWerewolf.cs diff --git a/src/BackEnd/src/Domain/Objects/Roles/Guardian.cs b/src/BackEnd/src/Core/Domain/Objects/Roles/Guardian.cs similarity index 100% rename from src/BackEnd/src/Domain/Objects/Roles/Guardian.cs rename to src/BackEnd/src/Core/Domain/Objects/Roles/Guardian.cs diff --git a/src/BackEnd/src/Domain/Objects/Roles/Hunter.cs b/src/BackEnd/src/Core/Domain/Objects/Roles/Hunter.cs similarity index 100% rename from src/BackEnd/src/Domain/Objects/Roles/Hunter.cs rename to src/BackEnd/src/Core/Domain/Objects/Roles/Hunter.cs diff --git a/src/BackEnd/src/Domain/Objects/Roles/Seer.cs b/src/BackEnd/src/Core/Domain/Objects/Roles/Seer.cs similarity index 100% rename from src/BackEnd/src/Domain/Objects/Roles/Seer.cs rename to src/BackEnd/src/Core/Domain/Objects/Roles/Seer.cs diff --git a/src/BackEnd/src/Domain/Objects/Roles/Villager.cs b/src/BackEnd/src/Core/Domain/Objects/Roles/Villager.cs similarity index 100% rename from src/BackEnd/src/Domain/Objects/Roles/Villager.cs rename to src/BackEnd/src/Core/Domain/Objects/Roles/Villager.cs diff --git a/src/BackEnd/src/Domain/Objects/Roles/Werewolf.cs b/src/BackEnd/src/Core/Domain/Objects/Roles/Werewolf.cs similarity index 100% rename from src/BackEnd/src/Domain/Objects/Roles/Werewolf.cs rename to src/BackEnd/src/Core/Domain/Objects/Roles/Werewolf.cs diff --git a/src/BackEnd/src/Domain/Objects/Roles/Witch.cs b/src/BackEnd/src/Core/Domain/Objects/Roles/Witch.cs similarity index 100% rename from src/BackEnd/src/Domain/Objects/Roles/Witch.cs rename to src/BackEnd/src/Core/Domain/Objects/Roles/Witch.cs diff --git a/src/BackEnd/src/Domain/Objects/VoteManager.cs b/src/BackEnd/src/Core/Domain/Objects/VoteManager.cs similarity index 100% rename from src/BackEnd/src/Domain/Objects/VoteManager.cs rename to src/BackEnd/src/Core/Domain/Objects/VoteManager.cs diff --git a/src/BackEnd/src/Domain/Wsa.Gaas.Werewolf.Domain.csproj b/src/BackEnd/src/Core/Domain/Wsa.Gaas.Werewolf.Domain.csproj similarity index 100% rename from src/BackEnd/src/Domain/Wsa.Gaas.Werewolf.Domain.csproj rename to src/BackEnd/src/Core/Domain/Wsa.Gaas.Werewolf.Domain.csproj diff --git a/src/BackEnd/src/InterfaceAdapter/EntityFrameworkCore/DependencyInjection.cs b/src/BackEnd/src/Infrastructure/SqlServer/DependencyInjection.cs similarity index 93% rename from src/BackEnd/src/InterfaceAdapter/EntityFrameworkCore/DependencyInjection.cs rename to src/BackEnd/src/Infrastructure/SqlServer/DependencyInjection.cs index 81aec7f..c63b224 100644 --- a/src/BackEnd/src/InterfaceAdapter/EntityFrameworkCore/DependencyInjection.cs +++ b/src/BackEnd/src/Infrastructure/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/src/BackEnd/src/InterfaceAdapter/EntityFrameworkCore/InMemoryRepository.cs b/src/BackEnd/src/Infrastructure/SqlServer/InMemoryRepository.cs similarity index 96% rename from src/BackEnd/src/InterfaceAdapter/EntityFrameworkCore/InMemoryRepository.cs rename to src/BackEnd/src/Infrastructure/SqlServer/InMemoryRepository.cs index 10cc2c1..cdf8100 100644 --- a/src/BackEnd/src/InterfaceAdapter/EntityFrameworkCore/InMemoryRepository.cs +++ b/src/BackEnd/src/Infrastructure/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 _discordIdMemory = new(); diff --git a/src/BackEnd/src/InterfaceAdapter/EntityFrameworkCore/EntityFrameworkCoreRepository.cs b/src/BackEnd/src/Infrastructure/SqlServer/SqlServerRepository.cs similarity index 90% rename from src/BackEnd/src/InterfaceAdapter/EntityFrameworkCore/EntityFrameworkCoreRepository.cs rename to src/BackEnd/src/Infrastructure/SqlServer/SqlServerRepository.cs index 26f8f31..af9bc14 100644 --- a/src/BackEnd/src/InterfaceAdapter/EntityFrameworkCore/EntityFrameworkCoreRepository.cs +++ b/src/BackEnd/src/Infrastructure/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/src/BackEnd/src/InterfaceAdapter/EntityFrameworkCore/TypeConfigurations/GameTypeConfiguration.cs b/src/BackEnd/src/Infrastructure/SqlServer/TypeConfigurations/GameTypeConfiguration.cs similarity index 89% rename from src/BackEnd/src/InterfaceAdapter/EntityFrameworkCore/TypeConfigurations/GameTypeConfiguration.cs rename to src/BackEnd/src/Infrastructure/SqlServer/TypeConfigurations/GameTypeConfiguration.cs index 180b953..198d385 100644 --- a/src/BackEnd/src/InterfaceAdapter/EntityFrameworkCore/TypeConfigurations/GameTypeConfiguration.cs +++ b/src/BackEnd/src/Infrastructure/SqlServer/TypeConfigurations/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 { public void Configure(EntityTypeBuilder builder) diff --git a/src/BackEnd/src/InterfaceAdapter/EntityFrameworkCore/TypeConfigurations/PlayerTypeConfiguration.cs b/src/BackEnd/src/Infrastructure/SqlServer/TypeConfigurations/PlayerTypeConfiguration.cs similarity index 86% rename from src/BackEnd/src/InterfaceAdapter/EntityFrameworkCore/TypeConfigurations/PlayerTypeConfiguration.cs rename to src/BackEnd/src/Infrastructure/SqlServer/TypeConfigurations/PlayerTypeConfiguration.cs index d2bcfe3..739c88d 100644 --- a/src/BackEnd/src/InterfaceAdapter/EntityFrameworkCore/TypeConfigurations/PlayerTypeConfiguration.cs +++ b/src/BackEnd/src/Infrastructure/SqlServer/TypeConfigurations/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 { public void Configure(EntityTypeBuilder builder) diff --git a/src/BackEnd/src/InterfaceAdapter/EntityFrameworkCore/TypeConfigurations/RoleTypeConfiguration.cs b/src/BackEnd/src/Infrastructure/SqlServer/TypeConfigurations/RoleTypeConfiguration.cs similarity index 96% rename from src/BackEnd/src/InterfaceAdapter/EntityFrameworkCore/TypeConfigurations/RoleTypeConfiguration.cs rename to src/BackEnd/src/Infrastructure/SqlServer/TypeConfigurations/RoleTypeConfiguration.cs index 8ba5159..547d50e 100644 --- a/src/BackEnd/src/InterfaceAdapter/EntityFrameworkCore/TypeConfigurations/RoleTypeConfiguration.cs +++ b/src/BackEnd/src/Infrastructure/SqlServer/TypeConfigurations/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 , IEntityTypeConfiguration , IEntityTypeConfiguration diff --git a/src/BackEnd/src/InterfaceAdapter/EntityFrameworkCore/Wsa.Gaas.Werewolf.EntityFrameworkCore.csproj b/src/BackEnd/src/Infrastructure/SqlServer/Wsa.Gaas.Werewolf.SqlServer.csproj similarity index 69% rename from src/BackEnd/src/InterfaceAdapter/EntityFrameworkCore/Wsa.Gaas.Werewolf.EntityFrameworkCore.csproj rename to src/BackEnd/src/Infrastructure/SqlServer/Wsa.Gaas.Werewolf.SqlServer.csproj index d245619..526b52b 100644 --- a/src/BackEnd/src/InterfaceAdapter/EntityFrameworkCore/Wsa.Gaas.Werewolf.EntityFrameworkCore.csproj +++ b/src/BackEnd/src/Infrastructure/SqlServer/Wsa.Gaas.Werewolf.SqlServer.csproj @@ -9,11 +9,10 @@ - - + diff --git a/src/BackEnd/src/InterfaceAdapter/WebApi/ApiClient.cs b/src/BackEnd/src/Presentation/WebApi/ApiClient.cs similarity index 100% rename from src/BackEnd/src/InterfaceAdapter/WebApi/ApiClient.cs rename to src/BackEnd/src/Presentation/WebApi/ApiClient.cs diff --git a/src/BackEnd/src/InterfaceAdapter/WebApi/Common/WebApiEndpoint.cs b/src/BackEnd/src/Presentation/WebApi/Common/WebApiEndpoint.cs similarity index 90% rename from src/BackEnd/src/InterfaceAdapter/WebApi/Common/WebApiEndpoint.cs rename to src/BackEnd/src/Presentation/WebApi/Common/WebApiEndpoint.cs index f864b8c..5d13867 100644 --- a/src/BackEnd/src/InterfaceAdapter/WebApi/Common/WebApiEndpoint.cs +++ b/src/BackEnd/src/Presentation/WebApi/Common/WebApiEndpoint.cs @@ -1,7 +1,7 @@ using FastEndpoints; using Wsa.Gaas.Werewolf.Application.Common; -namespace Wsa.Gaas.Werewolf.Application; +namespace Wsa.Gaas.Werewolf.WebApi.Common; public abstract class WebApiEndpoint : Endpoint where TRequest : notnull, new() where TViewModel : notnull diff --git a/src/BackEnd/src/InterfaceAdapter/WebApi/DependencyInjection.cs b/src/BackEnd/src/Presentation/WebApi/DependencyInjection.cs similarity index 94% rename from src/BackEnd/src/InterfaceAdapter/WebApi/DependencyInjection.cs rename to src/BackEnd/src/Presentation/WebApi/DependencyInjection.cs index c0bfc7c..2fc7fa7 100644 --- a/src/BackEnd/src/InterfaceAdapter/WebApi/DependencyInjection.cs +++ b/src/BackEnd/src/Presentation/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/src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/ConfirmPlayerRoleEndpoint.cs b/src/BackEnd/src/Presentation/WebApi/Endpoints/ConfirmPlayerRoleEndpoint.cs similarity index 88% rename from src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/ConfirmPlayerRoleEndpoint.cs rename to src/BackEnd/src/Presentation/WebApi/Endpoints/ConfirmPlayerRoleEndpoint.cs index a981304..9596c86 100644 --- a/src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/ConfirmPlayerRoleEndpoint.cs +++ b/src/BackEnd/src/Presentation/WebApi/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 { diff --git a/src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/CreateGameEndpoint.cs b/src/BackEnd/src/Presentation/WebApi/Endpoints/CreateGameEndpoint.cs similarity index 80% rename from src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/CreateGameEndpoint.cs rename to src/BackEnd/src/Presentation/WebApi/Endpoints/CreateGameEndpoint.cs index 29ebb24..30343f9 100644 --- a/src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/CreateGameEndpoint.cs +++ b/src/BackEnd/src/Presentation/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 { public override void Configure() diff --git a/src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/DiscoverPlayerRoleEndpoint.cs b/src/BackEnd/src/Presentation/WebApi/Endpoints/DiscoverPlayerRoleEndpoint.cs similarity index 83% rename from src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/DiscoverPlayerRoleEndpoint.cs rename to src/BackEnd/src/Presentation/WebApi/Endpoints/DiscoverPlayerRoleEndpoint.cs index adce910..6f09682 100644 --- a/src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/DiscoverPlayerRoleEndpoint.cs +++ b/src/BackEnd/src/Presentation/WebApi/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 { public override void Configure() diff --git a/src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/EndGameEndpoint.cs b/src/BackEnd/src/Presentation/WebApi/Endpoints/EndGameEndpoint.cs similarity index 80% rename from src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/EndGameEndpoint.cs rename to src/BackEnd/src/Presentation/WebApi/Endpoints/EndGameEndpoint.cs index d9a302f..735a7f7 100644 --- a/src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/EndGameEndpoint.cs +++ b/src/BackEnd/src/Presentation/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 { public override void Configure() diff --git a/src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/GetGameEndpoint.cs b/src/BackEnd/src/Presentation/WebApi/Endpoints/GetGameEndpoint.cs similarity index 82% rename from src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/GetGameEndpoint.cs rename to src/BackEnd/src/Presentation/WebApi/Endpoints/GetGameEndpoint.cs index 164e668..077999c 100644 --- a/src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/GetGameEndpoint.cs +++ b/src/BackEnd/src/Presentation/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 { diff --git a/src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/PlayerTriggerSkillEndpoint.cs b/src/BackEnd/src/Presentation/WebApi/Endpoints/PlayerTriggerSkillEndpoint.cs similarity index 92% rename from src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/PlayerTriggerSkillEndpoint.cs rename to src/BackEnd/src/Presentation/WebApi/Endpoints/PlayerTriggerSkillEndpoint.cs index 199762f..791b426 100644 --- a/src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/PlayerTriggerSkillEndpoint.cs +++ b/src/BackEnd/src/Presentation/WebApi/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/src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/StartGameEndpoint.cs b/src/BackEnd/src/Presentation/WebApi/Endpoints/StartGameEndpoint.cs similarity index 81% rename from src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/StartGameEndpoint.cs rename to src/BackEnd/src/Presentation/WebApi/Endpoints/StartGameEndpoint.cs index 202afee..ad63ede 100644 --- a/src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/StartGameEndpoint.cs +++ b/src/BackEnd/src/Presentation/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 { public override void Configure() diff --git a/src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/WerewolfVoteEndpoint.cs b/src/BackEnd/src/Presentation/WebApi/Endpoints/WerewolfVoteEndpoint.cs similarity index 82% rename from src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/WerewolfVoteEndpoint.cs rename to src/BackEnd/src/Presentation/WebApi/Endpoints/WerewolfVoteEndpoint.cs index 585e6d6..317a81b 100644 --- a/src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/WerewolfVoteEndpoint.cs +++ b/src/BackEnd/src/Presentation/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 { public override void Configure() diff --git a/src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/WitchUseAntidoteEndpoint.cs b/src/BackEnd/src/Presentation/WebApi/Endpoints/WitchUseAntidoteEndpoint.cs similarity index 83% rename from src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/WitchUseAntidoteEndpoint.cs rename to src/BackEnd/src/Presentation/WebApi/Endpoints/WitchUseAntidoteEndpoint.cs index 5fed14b..20f2933 100644 --- a/src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/WitchUseAntidoteEndpoint.cs +++ b/src/BackEnd/src/Presentation/WebApi/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 { public override void Configure() diff --git a/src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/WitchUsePoisonEndpoint.cs b/src/BackEnd/src/Presentation/WebApi/Endpoints/WitchUsePoisonEndpoint.cs similarity index 83% rename from src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/WitchUsePoisonEndpoint.cs rename to src/BackEnd/src/Presentation/WebApi/Endpoints/WitchUsePoisonEndpoint.cs index 8645eb9..1e4e0fe 100644 --- a/src/BackEnd/src/InterfaceAdapter/WebApi/Endpoints/WitchUsePoisonEndpoint.cs +++ b/src/BackEnd/src/Presentation/WebApi/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 diff --git a/src/BackEnd/src/InterfaceAdapter/WebApi/Extensions/ExceptionHandlerExtensions.cs b/src/BackEnd/src/Presentation/WebApi/Extensions/ExceptionHandlerExtensions.cs similarity index 96% rename from src/BackEnd/src/InterfaceAdapter/WebApi/Extensions/ExceptionHandlerExtensions.cs rename to src/BackEnd/src/Presentation/WebApi/Extensions/ExceptionHandlerExtensions.cs index 3f2bd72..7500346 100644 --- a/src/BackEnd/src/InterfaceAdapter/WebApi/Extensions/ExceptionHandlerExtensions.cs +++ b/src/BackEnd/src/Presentation/WebApi/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/src/BackEnd/src/InterfaceAdapter/WebApi/GameEventHub.cs b/src/BackEnd/src/Presentation/WebApi/GameEventHub.cs similarity index 94% rename from src/BackEnd/src/InterfaceAdapter/WebApi/GameEventHub.cs rename to src/BackEnd/src/Presentation/WebApi/GameEventHub.cs index c21da55..10e8544 100644 --- a/src/BackEnd/src/InterfaceAdapter/WebApi/GameEventHub.cs +++ b/src/BackEnd/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/src/BackEnd/src/InterfaceAdapter/WebApi/Program.cs b/src/BackEnd/src/Presentation/WebApi/Program.cs similarity index 88% rename from src/BackEnd/src/InterfaceAdapter/WebApi/Program.cs rename to src/BackEnd/src/Presentation/WebApi/Program.cs index 12a1fc9..dfdd381 100644 --- a/src/BackEnd/src/InterfaceAdapter/WebApi/Program.cs +++ b/src/BackEnd/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/src/BackEnd/src/InterfaceAdapter/WebApi/Properties/launchSettings.json b/src/BackEnd/src/Presentation/WebApi/Properties/launchSettings.json similarity index 100% rename from src/BackEnd/src/InterfaceAdapter/WebApi/Properties/launchSettings.json rename to src/BackEnd/src/Presentation/WebApi/Properties/launchSettings.json diff --git a/src/BackEnd/src/InterfaceAdapter/WebApi/ViewModels/GameVm.cs b/src/BackEnd/src/Presentation/WebApi/ViewModels/GameVm.cs similarity index 93% rename from src/BackEnd/src/InterfaceAdapter/WebApi/ViewModels/GameVm.cs rename to src/BackEnd/src/Presentation/WebApi/ViewModels/GameVm.cs index f85844e..1a9ed5a 100644 --- a/src/BackEnd/src/InterfaceAdapter/WebApi/ViewModels/GameVm.cs +++ b/src/BackEnd/src/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/src/BackEnd/src/InterfaceAdapter/WebApi/ViewModels/PlayerVm.cs b/src/BackEnd/src/Presentation/WebApi/ViewModels/PlayerVm.cs similarity index 91% rename from src/BackEnd/src/InterfaceAdapter/WebApi/ViewModels/PlayerVm.cs rename to src/BackEnd/src/Presentation/WebApi/ViewModels/PlayerVm.cs index 636b995..f200e58 100644 --- a/src/BackEnd/src/InterfaceAdapter/WebApi/ViewModels/PlayerVm.cs +++ b/src/BackEnd/src/Presentation/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/src/BackEnd/src/InterfaceAdapter/WebApi/WebApiDefaults.cs b/src/BackEnd/src/Presentation/WebApi/WebApiDefaults.cs similarity index 77% rename from src/BackEnd/src/InterfaceAdapter/WebApi/WebApiDefaults.cs rename to src/BackEnd/src/Presentation/WebApi/WebApiDefaults.cs index 7042135..3a321c5 100644 --- a/src/BackEnd/src/InterfaceAdapter/WebApi/WebApiDefaults.cs +++ b/src/BackEnd/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/src/BackEnd/src/InterfaceAdapter/WebApi/Wsa.Gaas.Werewolf.WebApi.csproj b/src/BackEnd/src/Presentation/WebApi/Wsa.Gaas.Werewolf.WebApi.csproj similarity index 52% rename from src/BackEnd/src/InterfaceAdapter/WebApi/Wsa.Gaas.Werewolf.WebApi.csproj rename to src/BackEnd/src/Presentation/WebApi/Wsa.Gaas.Werewolf.WebApi.csproj index 7f5baef..f5bea6e 100644 --- a/src/BackEnd/src/InterfaceAdapter/WebApi/Wsa.Gaas.Werewolf.WebApi.csproj +++ b/src/BackEnd/src/Presentation/WebApi/Wsa.Gaas.Werewolf.WebApi.csproj @@ -5,26 +5,17 @@ enable enable - - - - - - - + - - all runtime; build; native; contentfiles; analyzers; buildtransitive + true - - - + diff --git a/src/BackEnd/src/InterfaceAdapter/WebApi/appsettings.Development.json b/src/BackEnd/src/Presentation/WebApi/appsettings.Development.json similarity index 100% rename from src/BackEnd/src/InterfaceAdapter/WebApi/appsettings.Development.json rename to src/BackEnd/src/Presentation/WebApi/appsettings.Development.json diff --git a/src/BackEnd/src/InterfaceAdapter/WebApi/appsettings.json b/src/BackEnd/src/Presentation/WebApi/appsettings.json similarity index 100% rename from src/BackEnd/src/InterfaceAdapter/WebApi/appsettings.json rename to src/BackEnd/src/Presentation/WebApi/appsettings.json diff --git a/src/BackEnd/test/WebApiTests/ATDD/Common/WebApiTestServer.cs b/src/BackEnd/tests/WebApiTests/ATDD/Common/WebApiTestServer.cs similarity index 97% rename from src/BackEnd/test/WebApiTests/ATDD/Common/WebApiTestServer.cs rename to src/BackEnd/tests/WebApiTests/ATDD/Common/WebApiTestServer.cs index 7a4dc02..d735481 100644 --- a/src/BackEnd/test/WebApiTests/ATDD/Common/WebApiTestServer.cs +++ b/src/BackEnd/tests/WebApiTests/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/src/BackEnd/test/WebApiTests/ATDD/GameTests/End2EndTests.cs b/src/BackEnd/tests/WebApiTests/ATDD/GameTests/End2EndTests.cs similarity index 96% rename from src/BackEnd/test/WebApiTests/ATDD/GameTests/End2EndTests.cs rename to src/BackEnd/tests/WebApiTests/ATDD/GameTests/End2EndTests.cs index c7985a4..6193fb3 100644 --- a/src/BackEnd/test/WebApiTests/ATDD/GameTests/End2EndTests.cs +++ b/src/BackEnd/tests/WebApiTests/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/src/BackEnd/test/WebApiTests/ATDD/GameTests/GameCreatedTests.cs b/src/BackEnd/tests/WebApiTests/ATDD/GameTests/GameCreatedTests.cs similarity index 98% rename from src/BackEnd/test/WebApiTests/ATDD/GameTests/GameCreatedTests.cs rename to src/BackEnd/tests/WebApiTests/ATDD/GameTests/GameCreatedTests.cs index e9124de..3e13571 100644 --- a/src/BackEnd/test/WebApiTests/ATDD/GameTests/GameCreatedTests.cs +++ b/src/BackEnd/tests/WebApiTests/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/src/BackEnd/test/WebApiTests/ATDD/GameTests/GameEndedTests.cs b/src/BackEnd/tests/WebApiTests/ATDD/GameTests/GameEndedTests.cs similarity index 97% rename from src/BackEnd/test/WebApiTests/ATDD/GameTests/GameEndedTests.cs rename to src/BackEnd/tests/WebApiTests/ATDD/GameTests/GameEndedTests.cs index 586dabd..f026373 100644 --- a/src/BackEnd/test/WebApiTests/ATDD/GameTests/GameEndedTests.cs +++ b/src/BackEnd/tests/WebApiTests/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/src/BackEnd/test/WebApiTests/ATDD/GameTests/GameStartedTests.cs b/src/BackEnd/tests/WebApiTests/ATDD/GameTests/GameStartedTests.cs similarity index 98% rename from src/BackEnd/test/WebApiTests/ATDD/GameTests/GameStartedTests.cs rename to src/BackEnd/tests/WebApiTests/ATDD/GameTests/GameStartedTests.cs index 3adb9d6..8e179ba 100644 --- a/src/BackEnd/test/WebApiTests/ATDD/GameTests/GameStartedTests.cs +++ b/src/BackEnd/tests/WebApiTests/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/src/BackEnd/test/WebApiTests/ATDD/GameTests/GetGameTests.cs b/src/BackEnd/tests/WebApiTests/ATDD/GameTests/GetGameTests.cs similarity index 100% rename from src/BackEnd/test/WebApiTests/ATDD/GameTests/GetGameTests.cs rename to src/BackEnd/tests/WebApiTests/ATDD/GameTests/GetGameTests.cs diff --git a/src/BackEnd/test/WebApiTests/ATDD/GameTests/PlayerRoleConfirmedTests.cs b/src/BackEnd/tests/WebApiTests/ATDD/GameTests/PlayerRoleConfirmedTests.cs similarity index 98% rename from src/BackEnd/test/WebApiTests/ATDD/GameTests/PlayerRoleConfirmedTests.cs rename to src/BackEnd/tests/WebApiTests/ATDD/GameTests/PlayerRoleConfirmedTests.cs index 6bc2d8b..0a9203d 100644 --- a/src/BackEnd/test/WebApiTests/ATDD/GameTests/PlayerRoleConfirmedTests.cs +++ b/src/BackEnd/tests/WebApiTests/ATDD/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/src/BackEnd/test/WebApiTests/ATDD/GameTests/PlayerSpeakingTests.cs b/src/BackEnd/tests/WebApiTests/ATDD/GameTests/PlayerSpeakingTests.cs similarity index 100% rename from src/BackEnd/test/WebApiTests/ATDD/GameTests/PlayerSpeakingTests.cs rename to src/BackEnd/tests/WebApiTests/ATDD/GameTests/PlayerSpeakingTests.cs diff --git a/src/BackEnd/test/WebApiTests/ATDD/GameTests/PlayerTriggerSkillTests.cs b/src/BackEnd/tests/WebApiTests/ATDD/GameTests/PlayerTriggerSkillTests.cs similarity index 100% rename from src/BackEnd/test/WebApiTests/ATDD/GameTests/PlayerTriggerSkillTests.cs rename to src/BackEnd/tests/WebApiTests/ATDD/GameTests/PlayerTriggerSkillTests.cs diff --git a/src/BackEnd/test/WebApiTests/ATDD/GameTests/SeerDiscoverTests.cs b/src/BackEnd/tests/WebApiTests/ATDD/GameTests/SeerDiscoverTests.cs similarity index 99% rename from src/BackEnd/test/WebApiTests/ATDD/GameTests/SeerDiscoverTests.cs rename to src/BackEnd/tests/WebApiTests/ATDD/GameTests/SeerDiscoverTests.cs index a86ec71..bc0cae2 100644 --- a/src/BackEnd/test/WebApiTests/ATDD/GameTests/SeerDiscoverTests.cs +++ b/src/BackEnd/tests/WebApiTests/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/src/BackEnd/test/WebApiTests/ATDD/GameTests/WerewolfVotedTests.cs b/src/BackEnd/tests/WebApiTests/ATDD/GameTests/WerewolfVotedTests.cs similarity index 99% rename from src/BackEnd/test/WebApiTests/ATDD/GameTests/WerewolfVotedTests.cs rename to src/BackEnd/tests/WebApiTests/ATDD/GameTests/WerewolfVotedTests.cs index 66e9cdd..75d1d9b 100644 --- a/src/BackEnd/test/WebApiTests/ATDD/GameTests/WerewolfVotedTests.cs +++ b/src/BackEnd/tests/WebApiTests/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/src/BackEnd/test/WebApiTests/ATDD/GameTests/WitchUseAntidoteTests.cs b/src/BackEnd/tests/WebApiTests/ATDD/GameTests/WitchUseAntidoteTests.cs similarity index 98% rename from src/BackEnd/test/WebApiTests/ATDD/GameTests/WitchUseAntidoteTests.cs rename to src/BackEnd/tests/WebApiTests/ATDD/GameTests/WitchUseAntidoteTests.cs index d5b93ab..c2697b1 100644 --- a/src/BackEnd/test/WebApiTests/ATDD/GameTests/WitchUseAntidoteTests.cs +++ b/src/BackEnd/tests/WebApiTests/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; diff --git a/src/BackEnd/test/WebApiTests/ATDD/GameTests/WitchUsePoisonTests.cs b/src/BackEnd/tests/WebApiTests/ATDD/GameTests/WitchUsePoisonTests.cs similarity index 97% rename from src/BackEnd/test/WebApiTests/ATDD/GameTests/WitchUsePoisonTests.cs rename to src/BackEnd/tests/WebApiTests/ATDD/GameTests/WitchUsePoisonTests.cs index 7737edb..9537417 100644 --- a/src/BackEnd/test/WebApiTests/ATDD/GameTests/WitchUsePoisonTests.cs +++ b/src/BackEnd/tests/WebApiTests/ATDD/GameTests/WitchUsePoisonTests.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; diff --git a/src/BackEnd/test/WebApiTests/Common/GameBuilder.cs b/src/BackEnd/tests/WebApiTests/Common/GameBuilder.cs similarity index 100% rename from src/BackEnd/test/WebApiTests/Common/GameBuilder.cs rename to src/BackEnd/tests/WebApiTests/Common/GameBuilder.cs diff --git a/src/BackEnd/test/WebApiTests/Common/GameFaker.cs b/src/BackEnd/tests/WebApiTests/Common/GameFaker.cs similarity index 100% rename from src/BackEnd/test/WebApiTests/Common/GameFaker.cs rename to src/BackEnd/tests/WebApiTests/Common/GameFaker.cs diff --git a/src/BackEnd/test/WebApiTests/TDD/ApplicationTest/UseCaseTests/ConfirmPlayerRoleUseCaseTests.cs b/src/BackEnd/tests/WebApiTests/TDD/ApplicationTest/UseCaseTests/ConfirmPlayerRoleUseCaseTests.cs similarity index 100% rename from src/BackEnd/test/WebApiTests/TDD/ApplicationTest/UseCaseTests/ConfirmPlayerRoleUseCaseTests.cs rename to src/BackEnd/tests/WebApiTests/TDD/ApplicationTest/UseCaseTests/ConfirmPlayerRoleUseCaseTests.cs diff --git a/src/BackEnd/test/WebApiTests/TDD/ApplicationTest/UseCases/ConfirmPlayerRoleUseCaseTests.cs b/src/BackEnd/tests/WebApiTests/TDD/ApplicationTest/UseCases/ConfirmPlayerRoleUseCaseTests.cs similarity index 97% rename from src/BackEnd/test/WebApiTests/TDD/ApplicationTest/UseCases/ConfirmPlayerRoleUseCaseTests.cs rename to src/BackEnd/tests/WebApiTests/TDD/ApplicationTest/UseCases/ConfirmPlayerRoleUseCaseTests.cs index 63abd4f..1f85032 100644 --- a/src/BackEnd/test/WebApiTests/TDD/ApplicationTest/UseCases/ConfirmPlayerRoleUseCaseTests.cs +++ b/src/BackEnd/tests/WebApiTests/TDD/ApplicationTest/UseCases/ConfirmPlayerRoleUseCaseTests.cs @@ -6,7 +6,7 @@ using Wsa.Gaas.Werewolf.Domain.Exceptions; using Wsa.Gaas.Werewolf.Domain.Objects; -namespace Wsa.Gaas.Werewolf.Application; +namespace Wsa.Gaas.Werewolf.WebApiTests.TDD.ApplicationTest.UseCases; public class ConfirmPlayerRoleUseCaseTests { diff --git a/src/BackEnd/test/WebApiTests/TDD/ApplicationTest/UseCases/StartGameUseCaseTests.cs b/src/BackEnd/tests/WebApiTests/TDD/ApplicationTest/UseCases/StartGameUseCaseTests.cs similarity index 100% rename from src/BackEnd/test/WebApiTests/TDD/ApplicationTest/UseCases/StartGameUseCaseTests.cs rename to src/BackEnd/tests/WebApiTests/TDD/ApplicationTest/UseCases/StartGameUseCaseTests.cs diff --git a/src/BackEnd/test/WebApiTests/TDD/ApplicationTest/UseCases/WerewolfVoteUseCaseTests.cs b/src/BackEnd/tests/WebApiTests/TDD/ApplicationTest/UseCases/WerewolfVoteUseCaseTests.cs similarity index 100% rename from src/BackEnd/test/WebApiTests/TDD/ApplicationTest/UseCases/WerewolfVoteUseCaseTests.cs rename to src/BackEnd/tests/WebApiTests/TDD/ApplicationTest/UseCases/WerewolfVoteUseCaseTests.cs diff --git a/src/BackEnd/test/WebApiTests/TDD/Common/ArrayEqualityComparer.cs b/src/BackEnd/tests/WebApiTests/TDD/Common/ArrayEqualityComparer.cs similarity index 100% rename from src/BackEnd/test/WebApiTests/TDD/Common/ArrayEqualityComparer.cs rename to src/BackEnd/tests/WebApiTests/TDD/Common/ArrayEqualityComparer.cs diff --git a/src/BackEnd/test/WebApiTests/TDD/DomainTest/GameNightVoteTest.cs b/src/BackEnd/tests/WebApiTests/TDD/DomainTest/GameNightVoteTest.cs similarity index 100% rename from src/BackEnd/test/WebApiTests/TDD/DomainTest/GameNightVoteTest.cs rename to src/BackEnd/tests/WebApiTests/TDD/DomainTest/GameNightVoteTest.cs diff --git a/src/BackEnd/test/WebApiTests/TDD/DomainTest/GameTest.cs b/src/BackEnd/tests/WebApiTests/TDD/DomainTest/GameTest.cs similarity index 100% rename from src/BackEnd/test/WebApiTests/TDD/DomainTest/GameTest.cs rename to src/BackEnd/tests/WebApiTests/TDD/DomainTest/GameTest.cs diff --git a/src/BackEnd/test/WebApiTests/TDD/DomainTest/NightEndedTest.cs b/src/BackEnd/tests/WebApiTests/TDD/DomainTest/NightEndedTest.cs similarity index 100% rename from src/BackEnd/test/WebApiTests/TDD/DomainTest/NightEndedTest.cs rename to src/BackEnd/tests/WebApiTests/TDD/DomainTest/NightEndedTest.cs diff --git a/src/BackEnd/test/WebApiTests/TDD/DomainTest/WerewolfVoteTests.cs b/src/BackEnd/tests/WebApiTests/TDD/DomainTest/WerewolfVoteTests.cs similarity index 100% rename from src/BackEnd/test/WebApiTests/TDD/DomainTest/WerewolfVoteTests.cs rename to src/BackEnd/tests/WebApiTests/TDD/DomainTest/WerewolfVoteTests.cs diff --git a/src/BackEnd/test/WebApiTests/TDD/EntityFrameworkCoreTest/RepositoryTest.cs b/src/BackEnd/tests/WebApiTests/TDD/EntityFrameworkCoreTest/RepositoryTest.cs similarity index 98% rename from src/BackEnd/test/WebApiTests/TDD/EntityFrameworkCoreTest/RepositoryTest.cs rename to src/BackEnd/tests/WebApiTests/TDD/EntityFrameworkCoreTest/RepositoryTest.cs index 386f843..cb51146 100644 --- a/src/BackEnd/test/WebApiTests/TDD/EntityFrameworkCoreTest/RepositoryTest.cs +++ b/src/BackEnd/tests/WebApiTests/TDD/EntityFrameworkCoreTest/RepositoryTest.cs @@ -2,7 +2,7 @@ using System.Collections.Immutable; using Wsa.Gaas.Werewolf.Application.Common; using Wsa.Gaas.Werewolf.Domain.Objects; -using Wsa.Gaas.Werewolf.EntityFrameworkCore; +using Wsa.Gaas.Werewolf.SqlServer; namespace Wsa.Gaas.Werewolf.WebApiTests.TDD.EntityFrameworkCoreTest; internal class RepositoryTest diff --git a/src/BackEnd/test/WebApiTests/Usings.cs b/src/BackEnd/tests/WebApiTests/Usings.cs similarity index 100% rename from src/BackEnd/test/WebApiTests/Usings.cs rename to src/BackEnd/tests/WebApiTests/Usings.cs diff --git a/src/BackEnd/test/WebApiTests/Wsa.Gaas.Werewolf.WebApiTests.csproj b/src/BackEnd/tests/WebApiTests/Wsa.Gaas.Werewolf.WebApiTests.csproj similarity index 74% rename from src/BackEnd/test/WebApiTests/Wsa.Gaas.Werewolf.WebApiTests.csproj rename to src/BackEnd/tests/WebApiTests/Wsa.Gaas.Werewolf.WebApiTests.csproj index ba97cf7..3db0ced 100644 --- a/src/BackEnd/test/WebApiTests/Wsa.Gaas.Werewolf.WebApiTests.csproj +++ b/src/BackEnd/tests/WebApiTests/Wsa.Gaas.Werewolf.WebApiTests.csproj @@ -25,15 +25,11 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + diff --git a/src/Directory.Build.props b/src/Directory.Build.props deleted file mode 100644 index 779d7c2..0000000 --- a/src/Directory.Build.props +++ /dev/null @@ -1,44 +0,0 @@ - - - - 1.0.1 - - - 0 - $(VersionPrefix).$(BuildSuffix) - - - - - - - - - - - - - local - $(EnvSuffix).$(BuildSuffix).$(HashSuffix) - $(VersionPrefix)-$(VersionSuffix) - - - - dev - $(EnvSuffix).$(BuildSuffix).$(HashSuffix) - $(VersionPrefix)-$(VersionSuffix) - - - - - - - \ No newline at end of file diff --git a/src/Wsa.Gaas.Werewolf.BackEnd.sln b/src/Wsa.Gaas.Werewolf.BackEnd.sln index fed4ccf..6099b6f 100644 --- a/src/Wsa.Gaas.Werewolf.BackEnd.sln +++ b/src/Wsa.Gaas.Werewolf.BackEnd.sln @@ -4,27 +4,24 @@ Microsoft Visual Studio Solution File, Format Version 12.00 VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7C1C359D-75E0-46EC-B471-F6D5D5FCB20C}" - ProjectSection(SolutionItems) = preProject - Directory.Build.props = Directory.Build.props - EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Domain Layer", "Domain Layer", "{291BD00A-8591-49E0-9653-C886A1F0149F}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Presentation", "Presentation", "{931657A8-F27C-4DEF-8CB3-F3F3C0A58DB4}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Application Layer", "Application Layer", "{2541E229-BCF5-4A62-AA85-203092A3E130}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6DD38477-AD9E-494C-93ED-03F088E825A9}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Interface Adapter Layer", "Interface Adapter Layer", "{931657A8-F27C-4DEF-8CB3-F3F3C0A58DB4}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{603ACA9A-B816-4571-AE21-6A773D1AA1EB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6DD38477-AD9E-494C-93ED-03F088E825A9}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Infrastructure", "Infrastructure", "{AEA04D8A-32C1-4367-9845-8A3D0BD8B335}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wsa.Gaas.Werewolf.Application", "BackEnd\src\Application\Wsa.Gaas.Werewolf.Application.csproj", "{C721992F-43F8-4C3B-A8EE-99FDCECC68FC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wsa.Gaas.Werewolf.Domain", "BackEnd\src\Core\Domain\Wsa.Gaas.Werewolf.Domain.csproj", "{AE8FE8BD-DC01-4AAB-BE70-1F4443A1CA5E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wsa.Gaas.Werewolf.Domain", "BackEnd\src\Domain\Wsa.Gaas.Werewolf.Domain.csproj", "{5A713E49-71B7-4C21-A5A2-7EC30572F744}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wsa.Gaas.Werewolf.Application", "BackEnd\src\Core\Application\Wsa.Gaas.Werewolf.Application.csproj", "{735D9944-0BF0-4DD3-B3CF-D28B2A5CED9B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wsa.Gaas.Werewolf.EntityFrameworkCore", "BackEnd\src\InterfaceAdapter\EntityFrameworkCore\Wsa.Gaas.Werewolf.EntityFrameworkCore.csproj", "{3466D2F2-6351-44FE-8F3B-32F03626767E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wsa.Gaas.Werewolf.SqlServer", "BackEnd\src\Infrastructure\SqlServer\Wsa.Gaas.Werewolf.SqlServer.csproj", "{492186A4-7E80-47CE-892B-347D035D0C03}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wsa.Gaas.Werewolf.WebApi", "BackEnd\src\InterfaceAdapter\WebApi\Wsa.Gaas.Werewolf.WebApi.csproj", "{86F5F3FE-8079-4A22-ACBD-87E22C194116}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wsa.Gaas.Werewolf.WebApi", "BackEnd\src\Presentation\WebApi\Wsa.Gaas.Werewolf.WebApi.csproj", "{D0B7A647-A58B-44CD-9A18-5F5FE67A237E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wsa.Gaas.Werewolf.WebApiTests", "BackEnd\test\WebApiTests\Wsa.Gaas.Werewolf.WebApiTests.csproj", "{8346ED79-E380-451A-8AD4-002C18875E95}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wsa.Gaas.Werewolf.WebApiTests", "BackEnd\tests\WebApiTests\Wsa.Gaas.Werewolf.WebApiTests.csproj", "{D440102E-1AF4-4AF7-BA81-9D634D8B71C7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -32,39 +29,39 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C721992F-43F8-4C3B-A8EE-99FDCECC68FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C721992F-43F8-4C3B-A8EE-99FDCECC68FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C721992F-43F8-4C3B-A8EE-99FDCECC68FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C721992F-43F8-4C3B-A8EE-99FDCECC68FC}.Release|Any CPU.Build.0 = Release|Any CPU - {5A713E49-71B7-4C21-A5A2-7EC30572F744}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A713E49-71B7-4C21-A5A2-7EC30572F744}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A713E49-71B7-4C21-A5A2-7EC30572F744}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A713E49-71B7-4C21-A5A2-7EC30572F744}.Release|Any CPU.Build.0 = Release|Any CPU - {3466D2F2-6351-44FE-8F3B-32F03626767E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3466D2F2-6351-44FE-8F3B-32F03626767E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3466D2F2-6351-44FE-8F3B-32F03626767E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3466D2F2-6351-44FE-8F3B-32F03626767E}.Release|Any CPU.Build.0 = Release|Any CPU - {86F5F3FE-8079-4A22-ACBD-87E22C194116}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {86F5F3FE-8079-4A22-ACBD-87E22C194116}.Debug|Any CPU.Build.0 = Debug|Any CPU - {86F5F3FE-8079-4A22-ACBD-87E22C194116}.Release|Any CPU.ActiveCfg = Release|Any CPU - {86F5F3FE-8079-4A22-ACBD-87E22C194116}.Release|Any CPU.Build.0 = Release|Any CPU - {8346ED79-E380-451A-8AD4-002C18875E95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8346ED79-E380-451A-8AD4-002C18875E95}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8346ED79-E380-451A-8AD4-002C18875E95}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8346ED79-E380-451A-8AD4-002C18875E95}.Release|Any CPU.Build.0 = Release|Any CPU + {AE8FE8BD-DC01-4AAB-BE70-1F4443A1CA5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AE8FE8BD-DC01-4AAB-BE70-1F4443A1CA5E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AE8FE8BD-DC01-4AAB-BE70-1F4443A1CA5E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AE8FE8BD-DC01-4AAB-BE70-1F4443A1CA5E}.Release|Any CPU.Build.0 = Release|Any CPU + {735D9944-0BF0-4DD3-B3CF-D28B2A5CED9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {735D9944-0BF0-4DD3-B3CF-D28B2A5CED9B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {735D9944-0BF0-4DD3-B3CF-D28B2A5CED9B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {735D9944-0BF0-4DD3-B3CF-D28B2A5CED9B}.Release|Any CPU.Build.0 = Release|Any CPU + {492186A4-7E80-47CE-892B-347D035D0C03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {492186A4-7E80-47CE-892B-347D035D0C03}.Debug|Any CPU.Build.0 = Debug|Any CPU + {492186A4-7E80-47CE-892B-347D035D0C03}.Release|Any CPU.ActiveCfg = Release|Any CPU + {492186A4-7E80-47CE-892B-347D035D0C03}.Release|Any CPU.Build.0 = Release|Any CPU + {D0B7A647-A58B-44CD-9A18-5F5FE67A237E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D0B7A647-A58B-44CD-9A18-5F5FE67A237E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D0B7A647-A58B-44CD-9A18-5F5FE67A237E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D0B7A647-A58B-44CD-9A18-5F5FE67A237E}.Release|Any CPU.Build.0 = Release|Any CPU + {D440102E-1AF4-4AF7-BA81-9D634D8B71C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D440102E-1AF4-4AF7-BA81-9D634D8B71C7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D440102E-1AF4-4AF7-BA81-9D634D8B71C7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D440102E-1AF4-4AF7-BA81-9D634D8B71C7}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {291BD00A-8591-49E0-9653-C886A1F0149F} = {7C1C359D-75E0-46EC-B471-F6D5D5FCB20C} - {2541E229-BCF5-4A62-AA85-203092A3E130} = {7C1C359D-75E0-46EC-B471-F6D5D5FCB20C} {931657A8-F27C-4DEF-8CB3-F3F3C0A58DB4} = {7C1C359D-75E0-46EC-B471-F6D5D5FCB20C} - {C721992F-43F8-4C3B-A8EE-99FDCECC68FC} = {2541E229-BCF5-4A62-AA85-203092A3E130} - {5A713E49-71B7-4C21-A5A2-7EC30572F744} = {291BD00A-8591-49E0-9653-C886A1F0149F} - {3466D2F2-6351-44FE-8F3B-32F03626767E} = {931657A8-F27C-4DEF-8CB3-F3F3C0A58DB4} - {86F5F3FE-8079-4A22-ACBD-87E22C194116} = {931657A8-F27C-4DEF-8CB3-F3F3C0A58DB4} - {8346ED79-E380-451A-8AD4-002C18875E95} = {6DD38477-AD9E-494C-93ED-03F088E825A9} + {603ACA9A-B816-4571-AE21-6A773D1AA1EB} = {7C1C359D-75E0-46EC-B471-F6D5D5FCB20C} + {AEA04D8A-32C1-4367-9845-8A3D0BD8B335} = {7C1C359D-75E0-46EC-B471-F6D5D5FCB20C} + {AE8FE8BD-DC01-4AAB-BE70-1F4443A1CA5E} = {603ACA9A-B816-4571-AE21-6A773D1AA1EB} + {735D9944-0BF0-4DD3-B3CF-D28B2A5CED9B} = {603ACA9A-B816-4571-AE21-6A773D1AA1EB} + {492186A4-7E80-47CE-892B-347D035D0C03} = {AEA04D8A-32C1-4367-9845-8A3D0BD8B335} + {D0B7A647-A58B-44CD-9A18-5F5FE67A237E} = {931657A8-F27C-4DEF-8CB3-F3F3C0A58DB4} + {D440102E-1AF4-4AF7-BA81-9D634D8B71C7} = {6DD38477-AD9E-494C-93ED-03F088E825A9} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {33B3EEBE-2969-407B-9B47-3269738B8633} From 3fd4cda1e0c793aa148e24d0f3dcb691d5422dd8 Mon Sep 17 00:00:00 2001 From: Rick Su <35659961+ricksu978@users.noreply.github.com> Date: Sat, 20 Jan 2024 10:51:18 +1100 Subject: [PATCH 2/2] Refactor WebApiEndpoint to use TResponse instead of TViewModel --- .../src/Presentation/WebApi/Common/WebApiEndpoint.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/BackEnd/src/Presentation/WebApi/Common/WebApiEndpoint.cs b/src/BackEnd/src/Presentation/WebApi/Common/WebApiEndpoint.cs index 5d13867..97fdc2c 100644 --- a/src/BackEnd/src/Presentation/WebApi/Common/WebApiEndpoint.cs +++ b/src/BackEnd/src/Presentation/WebApi/Common/WebApiEndpoint.cs @@ -2,12 +2,12 @@ using Wsa.Gaas.Werewolf.Application.Common; namespace Wsa.Gaas.Werewolf.WebApi.Common; -public abstract class WebApiEndpoint : Endpoint +public abstract class WebApiEndpoint : Endpoint where TRequest : notnull, new() - where TViewModel : notnull + where TResponse : notnull { - public required UseCase UseCase { get; set; } + public required UseCase UseCase { get; set; } - public abstract override Task ExecuteAsync(TRequest req, CancellationToken ct); + public abstract override Task ExecuteAsync(TRequest req, CancellationToken ct); }