diff --git a/Application/AssemblyInfo.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/AssemblyInfo.cs similarity index 100% rename from Application/AssemblyInfo.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/AssemblyInfo.cs diff --git a/Application/Common/GameRequest.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Common/GameRequest.cs similarity index 66% rename from Application/Common/GameRequest.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Common/GameRequest.cs index 36aad38..5f9e5d5 100644 --- a/Application/Common/GameRequest.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Common/GameRequest.cs @@ -1,4 +1,4 @@ -namespace Application.Common; +namespace Monopoly.ApplicationLayer.Application.Common; public abstract record BaseRequest; public abstract record GameRequest(string GameId, string PlayerId): BaseRequest; \ No newline at end of file diff --git a/Application/Common/IEventBus.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Common/IEventBus.cs similarity index 78% rename from Application/Common/IEventBus.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Common/IEventBus.cs index 56c7983..3280fec 100644 --- a/Application/Common/IEventBus.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Common/IEventBus.cs @@ -1,6 +1,6 @@ using Monopoly.DomainLayer.Common; -namespace Application.Common; +namespace Monopoly.ApplicationLayer.Application.Common; public interface IEventBus where TEvent : DomainEvent { diff --git a/Application/Common/IPresenter.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Common/IPresenter.cs similarity index 68% rename from Application/Common/IPresenter.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Common/IPresenter.cs index ace63e3..c0f1a9f 100644 --- a/Application/Common/IPresenter.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Common/IPresenter.cs @@ -1,4 +1,4 @@ -namespace Application.Common; +namespace Monopoly.ApplicationLayer.Application.Common; public interface IPresenter { diff --git a/Application/Common/IRepository.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Common/IRepository.cs similarity index 74% rename from Application/Common/IRepository.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Common/IRepository.cs index a03d471..6e904eb 100644 --- a/Application/Common/IRepository.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Common/IRepository.cs @@ -1,7 +1,6 @@ -using Application.DataModels; -using Domain.Maps; +using Monopoly.ApplicationLayer.Application.DataModels; -namespace Application.Common; +namespace Monopoly.ApplicationLayer.Application.Common; public interface IRepository { diff --git a/Application/Common/RepositoryExtensions.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Common/RepositoryExtensions.cs similarity index 61% rename from Application/Common/RepositoryExtensions.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Common/RepositoryExtensions.cs index 3f1bce4..0c20b4f 100644 --- a/Application/Common/RepositoryExtensions.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Common/RepositoryExtensions.cs @@ -1,11 +1,27 @@ -using Application.DataModels; -using Domain.Maps; - -namespace Application.Common; - -internal static class RepositoryExtensions +using Monopoly.ApplicationLayer.Application.DataModels; +using Monopoly.DomainLayer.Domain; +using Monopoly.DomainLayer.Domain.Builders; +using Monopoly.DomainLayer.Domain.Maps; +using Auction = Monopoly.ApplicationLayer.Application.DataModels.Auction; +using Block = Monopoly.ApplicationLayer.Application.DataModels.Block; +using Chess = Monopoly.ApplicationLayer.Application.DataModels.Chess; +using CurrentPlayerState = Monopoly.ApplicationLayer.Application.DataModels.CurrentPlayerState; +using GameStage = Monopoly.DomainLayer.Domain.GameStage; +using Jail = Monopoly.DomainLayer.Domain.Jail; +using Land = Monopoly.DomainLayer.Domain.Land; +using LandContract = Monopoly.ApplicationLayer.Application.DataModels.LandContract; +using Map = Monopoly.ApplicationLayer.Application.DataModels.Map; +using ParkingLot = Monopoly.DomainLayer.Domain.ParkingLot; +using Player = Monopoly.ApplicationLayer.Application.DataModels.Player; +using Road = Monopoly.DomainLayer.Domain.Road; +using StartPoint = Monopoly.DomainLayer.Domain.StartPoint; +using Station = Monopoly.DomainLayer.Domain.Station; + +namespace Monopoly.ApplicationLayer.Application.Common; + +public static class RepositoryExtensions { - internal static string Save(this IRepository repository, Domain.MonopolyAggregate domainMonopolyAggregate) + public static string Save(this IRepository repository, MonopolyAggregate domainMonopolyAggregate) { var monopoly = domainMonopolyAggregate.ToApplication(); return repository.Save(monopoly); @@ -16,7 +32,7 @@ internal static string Save(this IRepository repository, Domain.MonopolyAggregat /// /// /// - private static MonopolyDataModel ToApplication(this Domain.MonopolyAggregate domainMonopolyAggregate) + private static MonopolyDataModel ToApplication(this MonopolyAggregate domainMonopolyAggregate) { var players = domainMonopolyAggregate.Players.Select(player => { @@ -44,11 +60,11 @@ private static MonopolyDataModel ToApplication(this Domain.MonopolyAggregate dom ); var gamestage = domainMonopolyAggregate.GameStage switch { - Domain.GameStage.Ready => GameStage.Preparing, - Domain.GameStage.Gaming => GameStage.Gaming, + GameStage.Ready => DataModels.GameStage.Preparing, + GameStage.Gaming => DataModels.GameStage.Gaming, _ => throw new NotImplementedException(), }; - if (gamestage == GameStage.Preparing) + if (gamestage == DataModels.GameStage.Preparing) { return new MonopolyDataModel(domainMonopolyAggregate.Id, [..players], map, domainMonopolyAggregate.HostId, null!, null!, gamestage); @@ -69,7 +85,7 @@ domainMonopolyAggregate.CurrentPlayerState.Auction is null domainMonopolyAggregate.CurrentPlayerState.RemainingSteps, domainMonopolyAggregate.CurrentPlayerState.HadSelectedDirection ); - var LandHouses = domainMonopolyAggregate.Map.Blocks.SelectMany(block => block).OfType() + var LandHouses = domainMonopolyAggregate.Map.Blocks.SelectMany(block => block).OfType() .Where(land => land.House > 0) .Select(land => new LandHouse(land.Id, land.House)).ToArray(); @@ -78,16 +94,16 @@ domainMonopolyAggregate.CurrentPlayerState.Auction is null currentPlayerState, LandHouses, gamestage); } - private static Block ToApplicationBlock(this Domain.Block domainBlock) + private static Block ToApplicationBlock(this DomainLayer.Domain.Block domainBlock) { return domainBlock switch { - Domain.StartPoint startBlock => new StartPoint(startBlock.Id), - Domain.Station stationBlock => new Station(stationBlock.Id), - Domain.Land landBlock => new Land(landBlock.Id), - Domain.ParkingLot parkingLotBlock => new ParkingLot(parkingLotBlock.Id), - Domain.Jail prisonBlock => new Jail(prisonBlock.Id), - Domain.Road roadBlock => new Road(roadBlock.Id), + StartPoint startBlock => new DataModels.StartPoint(startBlock.Id), + Station stationBlock => new DataModels.Station(stationBlock.Id), + Land landBlock => new DataModels.Land(landBlock.Id), + ParkingLot parkingLotBlock => new DataModels.ParkingLot(parkingLotBlock.Id), + Jail prisonBlock => new DataModels.Jail(prisonBlock.Id), + Road roadBlock => new DataModels.Road(roadBlock.Id), null => new EmptyBlock(), _ => throw new NotImplementedException(), }; @@ -98,7 +114,7 @@ private static Block ToApplicationBlock(this Domain.Block domainBlock) /// /// /// - internal static Domain.MonopolyAggregate ToDomain(this MonopolyDataModel monopolyDataModel) + public static MonopolyAggregate ToDomain(this MonopolyDataModel monopolyDataModel) { //Domain.Map map = new(monopoly.Map.Id, monopoly.Map.Blocks // .Select(row => @@ -106,8 +122,8 @@ internal static Domain.MonopolyAggregate ToDomain(this MonopolyDataModel monopol // return row.Select(block => block?.ToDomainBlock()).ToArray(); // }).ToArray() // ); - Domain.Map map = new SevenXSevenMap(); - var builder = new Domain.Builders.MonopolyBuilder() + DomainLayer.Domain.Map map = new SevenXSevenMap(); + var builder = new MonopolyBuilder() .WithId(monopolyDataModel.Id) .WithHost(monopolyDataModel.HostId) .WithMap(map); @@ -123,11 +139,11 @@ internal static Domain.MonopolyAggregate ToDomain(this MonopolyDataModel monopol )); builder.WithGameStage(monopolyDataModel.GameStage switch { - GameStage.Preparing => Domain.GameStage.Ready, - GameStage.Gaming => Domain.GameStage.Gaming, + DataModels.GameStage.Preparing => GameStage.Ready, + DataModels.GameStage.Gaming => GameStage.Gaming, _ => throw new NotImplementedException(), }); - if (monopolyDataModel.GameStage == GameStage.Preparing) + if (monopolyDataModel.GameStage == DataModels.GameStage.Preparing) { return builder.Build(); } @@ -151,7 +167,7 @@ internal static Domain.MonopolyAggregate ToDomain(this MonopolyDataModel monopol return builder.Build(); } - private static Domain.Builders.PlayerBuilder WithLandContracts(this Domain.Builders.PlayerBuilder builder, + private static PlayerBuilder WithLandContracts(this PlayerBuilder builder, LandContract[] landContracts) { landContracts.ToList().ForEach(landContract => @@ -161,29 +177,29 @@ private static Domain.Builders.PlayerBuilder WithLandContracts(this Domain.Build return builder; } - private static Domain.Block? ToDomainBlock(this Block? block) + private static DomainLayer.Domain.Block? ToDomainBlock(this Block? block) { return block switch { - StartPoint startBlock => new Domain.StartPoint(startBlock.Id), - Station stationBlock => new Domain.Station(stationBlock.Id), - Land landBlock => new Domain.Land(landBlock.Id), - ParkingLot parkingLotBlock => new Domain.ParkingLot(parkingLotBlock.Id), - Jail prisonBlock => new Domain.Jail(prisonBlock.Id), - Road roadBlock => new Domain.Road(roadBlock.Id), + DataModels.StartPoint startBlock => new StartPoint(startBlock.Id), + DataModels.Station stationBlock => new Station(stationBlock.Id), + DataModels.Land landBlock => new Land(landBlock.Id), + DataModels.ParkingLot parkingLotBlock => new ParkingLot(parkingLotBlock.Id), + DataModels.Jail prisonBlock => new Jail(prisonBlock.Id), + DataModels.Road roadBlock => new Road(roadBlock.Id), EmptyBlock => null, _ => throw new NotImplementedException(), }; } - private static Direction ToApplicationDirection(this Domain.Map.Direction direction) + private static Direction ToApplicationDirection(this DomainLayer.Domain.Map.Direction direction) { return direction switch { - Domain.Map.Direction.Up => Direction.Up, - Domain.Map.Direction.Down => Direction.Down, - Domain.Map.Direction.Left => Direction.Left, - Domain.Map.Direction.Right => Direction.Right, + DomainLayer.Domain.Map.Direction.Up => Direction.Up, + DomainLayer.Domain.Map.Direction.Down => Direction.Down, + DomainLayer.Domain.Map.Direction.Left => Direction.Left, + DomainLayer.Domain.Map.Direction.Right => Direction.Right, _ => throw new NotImplementedException(), }; } diff --git a/Application/Common/Response.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Common/Response.cs similarity index 56% rename from Application/Common/Response.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Common/Response.cs index 8443064..ecb95dd 100644 --- a/Application/Common/Response.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Common/Response.cs @@ -1,7 +1,6 @@ -using Domain.Common; -using Monopoly.DomainLayer.Common; +using Monopoly.DomainLayer.Common; -namespace Application.Common; +namespace Monopoly.ApplicationLayer.Application.Common; public abstract record Response(); public abstract record CommandResponse(IReadOnlyList Events) : Response; \ No newline at end of file diff --git a/Application/Common/Usecase.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Common/Usecase.cs similarity index 94% rename from Application/Common/Usecase.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Common/Usecase.cs index 6a05d8a..182975d 100644 --- a/Application/Common/Usecase.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Common/Usecase.cs @@ -1,6 +1,6 @@ using Monopoly.DomainLayer.Common; -namespace Application.Common; +namespace Monopoly.ApplicationLayer.Application.Common; public abstract class Usecase() where TRequest : BaseRequest where TResponse : Response diff --git a/Application/DataModels/MonopolyDataModel.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/DataModels/MonopolyDataModel.cs similarity index 85% rename from Application/DataModels/MonopolyDataModel.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/DataModels/MonopolyDataModel.cs index 1a0c8cb..7c98fc1 100644 --- a/Application/DataModels/MonopolyDataModel.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/DataModels/MonopolyDataModel.cs @@ -1,8 +1,10 @@ -namespace Application.DataModels; +using Monopoly.DomainLayer.Domain; + +namespace Monopoly.ApplicationLayer.Application.DataModels; public record MonopolyDataModel(string Id, Player[] Players, Map Map, string HostId, CurrentPlayerState CurrentPlayerState, LandHouse[] LandHouses, GameStage GameStage); -public record Player(string Id, decimal Money, Chess Chess, LandContract[] LandContracts, Domain.PlayerState PlayerState, int BankruptRounds, int LocationId, string? RoleId); +public record Player(string Id, decimal Money, Chess Chess, LandContract[] LandContracts, PlayerState PlayerState, int BankruptRounds, int LocationId, string? RoleId); public record CurrentPlayerState(string PlayerId, bool IsPayToll, bool IsBoughtLand, bool IsUpgradeLand, Auction? Auction, int RemainingSteps, bool HadSelectedDirection); public record Chess(string CurrentPosition, Direction Direction); public record LandContract(string LandId, bool InMortgage, int Deadline); diff --git a/Application/DependencyInjection.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/DependencyInjection.cs similarity index 88% rename from Application/DependencyInjection.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/DependencyInjection.cs index cc36c23..ed96d6f 100644 --- a/Application/DependencyInjection.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/DependencyInjection.cs @@ -1,7 +1,7 @@ -using Application.Common; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; +using Monopoly.ApplicationLayer.Application.Common; -namespace Application; +namespace Monopoly.ApplicationLayer.Application; public static class DependencyInjection { diff --git a/Application/Application.csproj b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Monopoly.ApplicationLayer.Application.csproj similarity index 60% rename from Application/Application.csproj rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Monopoly.ApplicationLayer.Application.csproj index dbbdc86..c532904 100644 --- a/Application/Application.csproj +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Monopoly.ApplicationLayer.Application.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/Application/Queries/GetReadyRoomInfosUsecase.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Queries/GetReadyRoomInfosUsecase.cs similarity index 81% rename from Application/Queries/GetReadyRoomInfosUsecase.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Queries/GetReadyRoomInfosUsecase.cs index 497794d..8030a2f 100644 --- a/Application/Queries/GetReadyRoomInfosUsecase.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Queries/GetReadyRoomInfosUsecase.cs @@ -1,8 +1,8 @@ -using Application.Common; -using Application.Usecases.ReadyRoom; +using Monopoly.ApplicationLayer.Application.Common; +using Monopoly.ApplicationLayer.Application.Usecases.ReadyRoom; using Monopoly.DomainLayer.ReadyRoom; -namespace Application.Queries; +namespace Monopoly.ApplicationLayer.Application.Queries; public record GetReadyRoomInfosRequest(string GameId, string PlayerId) : GameRequest(GameId, PlayerId); diff --git a/Application/Usecases/BidUsecase.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/BidUsecase.cs similarity index 88% rename from Application/Usecases/BidUsecase.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/BidUsecase.cs index f83b5a8..bdc7de8 100644 --- a/Application/Usecases/BidUsecase.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/BidUsecase.cs @@ -1,7 +1,7 @@ -using Application.Common; +using Monopoly.ApplicationLayer.Application.Common; using Monopoly.DomainLayer.Common; -namespace Application.Usecases; +namespace Monopoly.ApplicationLayer.Application.Usecases; public record BidRequest(string GameId, string PlayerId, decimal BidPrice) : GameRequest(GameId, PlayerId); diff --git a/Application/Usecases/BuildHouseUsecase.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/BuildHouseUsecase.cs similarity index 89% rename from Application/Usecases/BuildHouseUsecase.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/BuildHouseUsecase.cs index 89e6ed7..7834c7b 100644 --- a/Application/Usecases/BuildHouseUsecase.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/BuildHouseUsecase.cs @@ -1,7 +1,7 @@ -using Application.Common; +using Monopoly.ApplicationLayer.Application.Common; using Monopoly.DomainLayer.Common; -namespace Application.Usecases; +namespace Monopoly.ApplicationLayer.Application.Usecases; public record BuildHouseRequest(string GameId, string PlayerId) : GameRequest(GameId, PlayerId); diff --git a/Application/Usecases/ChooseDirectionUsecase.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ChooseDirectionUsecase.cs similarity index 89% rename from Application/Usecases/ChooseDirectionUsecase.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ChooseDirectionUsecase.cs index daa0656..e7aec0d 100644 --- a/Application/Usecases/ChooseDirectionUsecase.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ChooseDirectionUsecase.cs @@ -1,7 +1,7 @@ -using Application.Common; +using Monopoly.ApplicationLayer.Application.Common; using Monopoly.DomainLayer.Common; -namespace Application.Usecases; +namespace Monopoly.ApplicationLayer.Application.Usecases; public record ChooseDirectionRequest(string GameId, string PlayerId, string Direction) : GameRequest(GameId, PlayerId); diff --git a/Application/Usecases/CreateGameUsecase.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/CreateGameUsecase.cs similarity index 84% rename from Application/Usecases/CreateGameUsecase.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/CreateGameUsecase.cs index 6e02607..73b2d58 100644 --- a/Application/Usecases/CreateGameUsecase.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/CreateGameUsecase.cs @@ -1,9 +1,9 @@ -using Application.Common; -using Domain.Builders; -using Domain.Maps; +using Monopoly.ApplicationLayer.Application.Common; using Monopoly.DomainLayer.Common; +using Monopoly.DomainLayer.Domain.Builders; +using Monopoly.DomainLayer.Domain.Maps; -namespace Application.Usecases; +namespace Monopoly.ApplicationLayer.Application.Usecases; public record CreateGameRequest(string HostId, string[] PlayerIds) : GameRequest(null!, HostId); diff --git a/Application/Usecases/EndAuctionUsecase.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/EndAuctionUsecase.cs similarity index 88% rename from Application/Usecases/EndAuctionUsecase.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/EndAuctionUsecase.cs index b810105..3a658ea 100644 --- a/Application/Usecases/EndAuctionUsecase.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/EndAuctionUsecase.cs @@ -1,7 +1,7 @@ -using Application.Common; +using Monopoly.ApplicationLayer.Application.Common; using Monopoly.DomainLayer.Common; -namespace Application.Usecases; +namespace Monopoly.ApplicationLayer.Application.Usecases; public record EndAuctionRequest(string GameId, string PlayerId) : GameRequest(GameId, PlayerId); diff --git a/Application/Usecases/EndRoundUsecase.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/EndRoundUsecase.cs similarity index 88% rename from Application/Usecases/EndRoundUsecase.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/EndRoundUsecase.cs index a0a8149..f9cd778 100644 --- a/Application/Usecases/EndRoundUsecase.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/EndRoundUsecase.cs @@ -1,7 +1,7 @@ -using Application.Common; +using Monopoly.ApplicationLayer.Application.Common; using Monopoly.DomainLayer.Common; -namespace Application.Usecases; +namespace Monopoly.ApplicationLayer.Application.Usecases; public record EndRoundRequest(string GameId, string PlayerId) : GameRequest(GameId, PlayerId); diff --git a/Application/Usecases/MortgageUsecase.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/MortgageUsecase.cs similarity index 89% rename from Application/Usecases/MortgageUsecase.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/MortgageUsecase.cs index 7875b88..0cf6dfe 100644 --- a/Application/Usecases/MortgageUsecase.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/MortgageUsecase.cs @@ -1,7 +1,7 @@ -using Application.Common; +using Monopoly.ApplicationLayer.Application.Common; using Monopoly.DomainLayer.Common; -namespace Application.Usecases; +namespace Monopoly.ApplicationLayer.Application.Usecases; public record MortgageRequest(string GameId, string PlayerId, string BlockId) : GameRequest(GameId, PlayerId); diff --git a/Application/Usecases/PayTollUsecase.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/PayTollUsecase.cs similarity index 88% rename from Application/Usecases/PayTollUsecase.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/PayTollUsecase.cs index ac2bad2..baecf71 100644 --- a/Application/Usecases/PayTollUsecase.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/PayTollUsecase.cs @@ -1,7 +1,7 @@ -using Application.Common; +using Monopoly.ApplicationLayer.Application.Common; using Monopoly.DomainLayer.Common; -namespace Application.Usecases; +namespace Monopoly.ApplicationLayer.Application.Usecases; public record PayTollRequest(string GameId, string PlayerId) : GameRequest(GameId, PlayerId); diff --git a/Application/Usecases/PlayerBuyLandUsecase.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/PlayerBuyLandUsecase.cs similarity index 89% rename from Application/Usecases/PlayerBuyLandUsecase.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/PlayerBuyLandUsecase.cs index f6997fe..9287ad9 100644 --- a/Application/Usecases/PlayerBuyLandUsecase.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/PlayerBuyLandUsecase.cs @@ -1,7 +1,7 @@ -using Application.Common; +using Monopoly.ApplicationLayer.Application.Common; using Monopoly.DomainLayer.Common; -namespace Application.Usecases; +namespace Monopoly.ApplicationLayer.Application.Usecases; public record PlayerBuyLandRequest(string GameId, string PlayerId, string LandID) : GameRequest(GameId, PlayerId); diff --git a/Application/Usecases/PlayerRollDiceUsecase.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/PlayerRollDiceUsecase.cs similarity index 89% rename from Application/Usecases/PlayerRollDiceUsecase.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/PlayerRollDiceUsecase.cs index 1e8bb59..5eaa663 100644 --- a/Application/Usecases/PlayerRollDiceUsecase.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/PlayerRollDiceUsecase.cs @@ -1,7 +1,7 @@ -using Application.Common; +using Monopoly.ApplicationLayer.Application.Common; using Monopoly.DomainLayer.Common; -namespace Application.Usecases; +namespace Monopoly.ApplicationLayer.Application.Usecases; public record PlayerRollDiceRequest(string GameId, string PlayerId) : GameRequest(GameId, PlayerId); diff --git a/Application/Usecases/ReadyRoom/CreateReadyRoomUsecase.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ReadyRoom/CreateReadyRoomUsecase.cs similarity index 86% rename from Application/Usecases/ReadyRoom/CreateReadyRoomUsecase.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ReadyRoom/CreateReadyRoomUsecase.cs index 8df39df..cd48bba 100644 --- a/Application/Usecases/ReadyRoom/CreateReadyRoomUsecase.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ReadyRoom/CreateReadyRoomUsecase.cs @@ -1,7 +1,7 @@ -using Application.Common; +using Monopoly.ApplicationLayer.Application.Common; using Monopoly.DomainLayer.ReadyRoom; -namespace Application.Usecases.ReadyRoom; +namespace Monopoly.ApplicationLayer.Application.Usecases.ReadyRoom; public record CreateReadyRoomRequest(string PlayerId) : BaseRequest; diff --git a/Application/Usecases/ReadyRoom/IReadyRoomRepository.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ReadyRoom/IReadyRoomRepository.cs similarity index 89% rename from Application/Usecases/ReadyRoom/IReadyRoomRepository.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ReadyRoom/IReadyRoomRepository.cs index c6ccbdf..9a4f16f 100644 --- a/Application/Usecases/ReadyRoom/IReadyRoomRepository.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ReadyRoom/IReadyRoomRepository.cs @@ -1,6 +1,6 @@ using Monopoly.DomainLayer.ReadyRoom; -namespace Application.Usecases.ReadyRoom; +namespace Monopoly.ApplicationLayer.Application.Usecases.ReadyRoom; public interface IReadyRoomRepository { diff --git a/Application/Usecases/ReadyRoom/PlayerJoinReadyRoomUsecase.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ReadyRoom/PlayerJoinReadyRoomUsecase.cs similarity index 88% rename from Application/Usecases/ReadyRoom/PlayerJoinReadyRoomUsecase.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ReadyRoom/PlayerJoinReadyRoomUsecase.cs index 6b953a6..c824067 100644 --- a/Application/Usecases/ReadyRoom/PlayerJoinReadyRoomUsecase.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ReadyRoom/PlayerJoinReadyRoomUsecase.cs @@ -1,7 +1,7 @@ -using Application.Common; +using Monopoly.ApplicationLayer.Application.Common; using Monopoly.DomainLayer.Common; -namespace Application.Usecases.ReadyRoom; +namespace Monopoly.ApplicationLayer.Application.Usecases.ReadyRoom; public record PlayerJoinReadyRoomRequest(string RoomId, string PlayerId) : BaseRequest; diff --git a/Application/Usecases/ReadyRoom/PlayerReadyUsecase.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ReadyRoom/PlayerReadyUsecase.cs similarity index 88% rename from Application/Usecases/ReadyRoom/PlayerReadyUsecase.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ReadyRoom/PlayerReadyUsecase.cs index 7b495b6..0c72af4 100644 --- a/Application/Usecases/ReadyRoom/PlayerReadyUsecase.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ReadyRoom/PlayerReadyUsecase.cs @@ -1,7 +1,7 @@ -using Application.Common; +using Monopoly.ApplicationLayer.Application.Common; using Monopoly.DomainLayer.Common; -namespace Application.Usecases.ReadyRoom; +namespace Monopoly.ApplicationLayer.Application.Usecases.ReadyRoom; public record PlayerReadyRequest(string GameId, string PlayerId) : GameRequest(GameId, PlayerId); diff --git a/Application/Usecases/ReadyRoom/SelectRoleUsecase.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ReadyRoom/SelectRoleUsecase.cs similarity index 88% rename from Application/Usecases/ReadyRoom/SelectRoleUsecase.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ReadyRoom/SelectRoleUsecase.cs index 834bc6e..5e6a85f 100644 --- a/Application/Usecases/ReadyRoom/SelectRoleUsecase.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ReadyRoom/SelectRoleUsecase.cs @@ -1,7 +1,7 @@ -using Application.Common; +using Monopoly.ApplicationLayer.Application.Common; using Monopoly.DomainLayer.Common; -namespace Application.Usecases.ReadyRoom; +namespace Monopoly.ApplicationLayer.Application.Usecases.ReadyRoom; public record SelectRoleRequest(string GameId, string PlayerId, string Role) : GameRequest(GameId, PlayerId); diff --git a/Application/Usecases/ReadyRoom/SelectRoomLocationUsecase.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ReadyRoom/SelectRoomLocationUsecase.cs similarity index 89% rename from Application/Usecases/ReadyRoom/SelectRoomLocationUsecase.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ReadyRoom/SelectRoomLocationUsecase.cs index e322472..9990164 100644 --- a/Application/Usecases/ReadyRoom/SelectRoomLocationUsecase.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ReadyRoom/SelectRoomLocationUsecase.cs @@ -1,8 +1,8 @@ -using Application.Common; +using Monopoly.ApplicationLayer.Application.Common; using Monopoly.DomainLayer.Common; using Monopoly.DomainLayer.ReadyRoom.Enums; -namespace Application.Usecases.ReadyRoom; +namespace Monopoly.ApplicationLayer.Application.Usecases.ReadyRoom; public record SelectLocationRequest(string GameId, string PlayerId, LocationEnum Location) : GameRequest(GameId, PlayerId); diff --git a/Application/Usecases/ReadyRoom/StartGameUsecase.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ReadyRoom/StartGameUsecase.cs similarity index 89% rename from Application/Usecases/ReadyRoom/StartGameUsecase.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ReadyRoom/StartGameUsecase.cs index 7c3890a..d10b277 100644 --- a/Application/Usecases/ReadyRoom/StartGameUsecase.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/ReadyRoom/StartGameUsecase.cs @@ -1,7 +1,7 @@ -using Application.Common; +using Monopoly.ApplicationLayer.Application.Common; using Monopoly.DomainLayer.Common; -namespace Application.Usecases.ReadyRoom; +namespace Monopoly.ApplicationLayer.Application.Usecases.ReadyRoom; public record StartGameRequest(string GameId, string PlayerId) : GameRequest(GameId, PlayerId); diff --git a/Application/Usecases/RedeemUsecase.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/RedeemUsecase.cs similarity index 89% rename from Application/Usecases/RedeemUsecase.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/RedeemUsecase.cs index 25cfb13..824e7fb 100644 --- a/Application/Usecases/RedeemUsecase.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/RedeemUsecase.cs @@ -1,7 +1,7 @@ -using Application.Common; +using Monopoly.ApplicationLayer.Application.Common; using Monopoly.DomainLayer.Common; -namespace Application.Usecases; +namespace Monopoly.ApplicationLayer.Application.Usecases; public record RedeemRequest(string GameId, string PlayerId, string BlockId) : GameRequest(GameId, PlayerId); diff --git a/Application/Usecases/SettlementUsecase.cs b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/SettlementUsecase.cs similarity index 88% rename from Application/Usecases/SettlementUsecase.cs rename to ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/SettlementUsecase.cs index a2aedac..f1efd69 100644 --- a/Application/Usecases/SettlementUsecase.cs +++ b/ApplicationLayer/Monopoly.ApplicationLayer.Application/Usecases/SettlementUsecase.cs @@ -1,7 +1,7 @@ -using Application.Common; +using Monopoly.ApplicationLayer.Application.Common; using Monopoly.DomainLayer.Common; -namespace Application.Usecases; +namespace Monopoly.ApplicationLayer.Application.Usecases; public record SettlementRequest(string GameId, string PlayerId) : GameRequest(GameId, PlayerId); diff --git a/Monopoly.Web.Generators/Monopoly.Web.Generators.csproj b/Clients/Monopoly.Clients.Web.Generators/Monopoly.Clients.Web.Generators.csproj similarity index 100% rename from Monopoly.Web.Generators/Monopoly.Web.Generators.csproj rename to Clients/Monopoly.Clients.Web.Generators/Monopoly.Clients.Web.Generators.csproj diff --git a/Monopoly.Web.Generators/Properties/launchSettings.json b/Clients/Monopoly.Clients.Web.Generators/Properties/launchSettings.json similarity index 100% rename from Monopoly.Web.Generators/Properties/launchSettings.json rename to Clients/Monopoly.Clients.Web.Generators/Properties/launchSettings.json diff --git a/Monopoly.Web.Generators/TransformationResult.cs b/Clients/Monopoly.Clients.Web.Generators/TransformationResult.cs similarity index 98% rename from Monopoly.Web.Generators/TransformationResult.cs rename to Clients/Monopoly.Clients.Web.Generators/TransformationResult.cs index 7138af8..bca9293 100644 --- a/Monopoly.Web.Generators/TransformationResult.cs +++ b/Clients/Monopoly.Clients.Web.Generators/TransformationResult.cs @@ -1,6 +1,6 @@ using Microsoft.CodeAnalysis; -namespace Monopoly.Web.Generators; +namespace Monopoly.Clients.Web.Generators; public class TransformationResult( string name, diff --git a/Monopoly.Web.Generators/TypeClientGenerator.cs b/Clients/Monopoly.Clients.Web.Generators/TypeClientGenerator.cs similarity index 99% rename from Monopoly.Web.Generators/TypeClientGenerator.cs rename to Clients/Monopoly.Clients.Web.Generators/TypeClientGenerator.cs index 24e63b3..45473c8 100644 --- a/Monopoly.Web.Generators/TypeClientGenerator.cs +++ b/Clients/Monopoly.Clients.Web.Generators/TypeClientGenerator.cs @@ -3,7 +3,7 @@ using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.Text; -namespace Monopoly.Web.Generators; +namespace Monopoly.Clients.Web.Generators; [Generator(LanguageNames.CSharp)] public class TypedSignalrClientGenerator : IIncrementalGenerator diff --git a/Monopoly.Web/App.razor b/Clients/Monopoly.Clients.Web/App.razor similarity index 100% rename from Monopoly.Web/App.razor rename to Clients/Monopoly.Clients.Web/App.razor diff --git a/Monopoly.Web/Components/BlazorMap.cs b/Clients/Monopoly.Clients.Web/Components/BlazorMap.cs similarity index 100% rename from Monopoly.Web/Components/BlazorMap.cs rename to Clients/Monopoly.Clients.Web/Components/BlazorMap.cs diff --git a/Monopoly.Web/Components/Map.razor b/Clients/Monopoly.Clients.Web/Components/Map.razor similarity index 100% rename from Monopoly.Web/Components/Map.razor rename to Clients/Monopoly.Clients.Web/Components/Map.razor diff --git a/Monopoly.Web/Components/Map.razor.cs b/Clients/Monopoly.Clients.Web/Components/Map.razor.cs similarity index 100% rename from Monopoly.Web/Components/Map.razor.cs rename to Clients/Monopoly.Clients.Web/Components/Map.razor.cs diff --git a/Monopoly.Web/Components/SvgBlock.razor b/Clients/Monopoly.Clients.Web/Components/SvgBlock.razor similarity index 100% rename from Monopoly.Web/Components/SvgBlock.razor rename to Clients/Monopoly.Clients.Web/Components/SvgBlock.razor diff --git a/Monopoly.Web/HttpClients/MonopolyDevelopmentApiClient.cs b/Clients/Monopoly.Clients.Web/HttpClients/MonopolyDevelopmentApiClient.cs similarity index 100% rename from Monopoly.Web/HttpClients/MonopolyDevelopmentApiClient.cs rename to Clients/Monopoly.Clients.Web/HttpClients/MonopolyDevelopmentApiClient.cs diff --git a/Monopoly.Web/MainLayout.razor b/Clients/Monopoly.Clients.Web/MainLayout.razor similarity index 100% rename from Monopoly.Web/MainLayout.razor rename to Clients/Monopoly.Clients.Web/MainLayout.razor diff --git a/Clients/Monopoly.Clients.Web/Monopoly.Clients.Web.csproj b/Clients/Monopoly.Clients.Web/Monopoly.Clients.Web.csproj new file mode 100644 index 0000000..f34a788 --- /dev/null +++ b/Clients/Monopoly.Clients.Web/Monopoly.Clients.Web.csproj @@ -0,0 +1,28 @@ + + + + net8.0 + enable + enable + Client + + + + + + + + + + + + + + + + + + + + + diff --git a/Monopoly.Web/Options/MonopolyApiOptions.cs b/Clients/Monopoly.Clients.Web/Options/MonopolyApiOptions.cs similarity index 100% rename from Monopoly.Web/Options/MonopolyApiOptions.cs rename to Clients/Monopoly.Clients.Web/Options/MonopolyApiOptions.cs diff --git a/Monopoly.Web/Pages/DevPage.razor b/Clients/Monopoly.Clients.Web/Pages/DevPage.razor similarity index 100% rename from Monopoly.Web/Pages/DevPage.razor rename to Clients/Monopoly.Clients.Web/Pages/DevPage.razor diff --git a/Monopoly.Web/Pages/DevPage.razor.cs b/Clients/Monopoly.Clients.Web/Pages/DevPage.razor.cs similarity index 100% rename from Monopoly.Web/Pages/DevPage.razor.cs rename to Clients/Monopoly.Clients.Web/Pages/DevPage.razor.cs diff --git a/Monopoly.Web/Pages/DevPage.razor.css b/Clients/Monopoly.Clients.Web/Pages/DevPage.razor.css similarity index 100% rename from Monopoly.Web/Pages/DevPage.razor.css rename to Clients/Monopoly.Clients.Web/Pages/DevPage.razor.css diff --git a/Monopoly.Web/Pages/Enums/ColorEnum.cs b/Clients/Monopoly.Clients.Web/Pages/Enums/ColorEnum.cs similarity index 100% rename from Monopoly.Web/Pages/Enums/ColorEnum.cs rename to Clients/Monopoly.Clients.Web/Pages/Enums/ColorEnum.cs diff --git a/Monopoly.Web/Pages/Enums/GamingStatusEnum.cs b/Clients/Monopoly.Clients.Web/Pages/Enums/GamingStatusEnum.cs similarity index 100% rename from Monopoly.Web/Pages/Enums/GamingStatusEnum.cs rename to Clients/Monopoly.Clients.Web/Pages/Enums/GamingStatusEnum.cs diff --git a/Monopoly.Web/Pages/Enums/RoleEnum.cs b/Clients/Monopoly.Clients.Web/Pages/Enums/RoleEnum.cs similarity index 100% rename from Monopoly.Web/Pages/Enums/RoleEnum.cs rename to Clients/Monopoly.Clients.Web/Pages/Enums/RoleEnum.cs diff --git a/Monopoly.Web/Pages/Gaming/Components/ChatBox.razor b/Clients/Monopoly.Clients.Web/Pages/Gaming/Components/ChatBox.razor similarity index 100% rename from Monopoly.Web/Pages/Gaming/Components/ChatBox.razor rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Components/ChatBox.razor diff --git a/Monopoly.Web/Pages/Gaming/Components/ChatBox.razor.cs b/Clients/Monopoly.Clients.Web/Pages/Gaming/Components/ChatBox.razor.cs similarity index 100% rename from Monopoly.Web/Pages/Gaming/Components/ChatBox.razor.cs rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Components/ChatBox.razor.cs diff --git a/Monopoly.Web/Pages/Gaming/Components/ChatBox.razor.css b/Clients/Monopoly.Clients.Web/Pages/Gaming/Components/ChatBox.razor.css similarity index 100% rename from Monopoly.Web/Pages/Gaming/Components/ChatBox.razor.css rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Components/ChatBox.razor.css diff --git a/Monopoly.Web/Pages/Gaming/Components/GameRound.razor b/Clients/Monopoly.Clients.Web/Pages/Gaming/Components/GameRound.razor similarity index 100% rename from Monopoly.Web/Pages/Gaming/Components/GameRound.razor rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Components/GameRound.razor diff --git a/Monopoly.Web/Pages/Gaming/Components/GameRound.razor.cs b/Clients/Monopoly.Clients.Web/Pages/Gaming/Components/GameRound.razor.cs similarity index 100% rename from Monopoly.Web/Pages/Gaming/Components/GameRound.razor.cs rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Components/GameRound.razor.cs diff --git a/Monopoly.Web/Pages/Gaming/Components/GameRound.razor.css b/Clients/Monopoly.Clients.Web/Pages/Gaming/Components/GameRound.razor.css similarity index 100% rename from Monopoly.Web/Pages/Gaming/Components/GameRound.razor.css rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Components/GameRound.razor.css diff --git a/Monopoly.Web/Pages/Gaming/Components/Go.razor b/Clients/Monopoly.Clients.Web/Pages/Gaming/Components/Go.razor similarity index 100% rename from Monopoly.Web/Pages/Gaming/Components/Go.razor rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Components/Go.razor diff --git a/Monopoly.Web/Pages/Gaming/Components/Go.razor.cs b/Clients/Monopoly.Clients.Web/Pages/Gaming/Components/Go.razor.cs similarity index 100% rename from Monopoly.Web/Pages/Gaming/Components/Go.razor.cs rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Components/Go.razor.cs diff --git a/Monopoly.Web/Pages/Gaming/Components/Go.razor.css b/Clients/Monopoly.Clients.Web/Pages/Gaming/Components/Go.razor.css similarity index 100% rename from Monopoly.Web/Pages/Gaming/Components/Go.razor.css rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Components/Go.razor.css diff --git a/Monopoly.Web/Pages/Gaming/Components/MapPanel.razor b/Clients/Monopoly.Clients.Web/Pages/Gaming/Components/MapPanel.razor similarity index 100% rename from Monopoly.Web/Pages/Gaming/Components/MapPanel.razor rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Components/MapPanel.razor diff --git a/Monopoly.Web/Pages/Gaming/Components/MapPanel.razor.cs b/Clients/Monopoly.Clients.Web/Pages/Gaming/Components/MapPanel.razor.cs similarity index 100% rename from Monopoly.Web/Pages/Gaming/Components/MapPanel.razor.cs rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Components/MapPanel.razor.cs diff --git a/Monopoly.Web/Pages/Gaming/Components/MapPanel.razor.css b/Clients/Monopoly.Clients.Web/Pages/Gaming/Components/MapPanel.razor.css similarity index 100% rename from Monopoly.Web/Pages/Gaming/Components/MapPanel.razor.css rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Components/MapPanel.razor.css diff --git a/Monopoly.Web/Pages/Gaming/Components/PlayerInfo.razor b/Clients/Monopoly.Clients.Web/Pages/Gaming/Components/PlayerInfo.razor similarity index 100% rename from Monopoly.Web/Pages/Gaming/Components/PlayerInfo.razor rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Components/PlayerInfo.razor diff --git a/Monopoly.Web/Pages/Gaming/Components/PlayerInfo.razor.cs b/Clients/Monopoly.Clients.Web/Pages/Gaming/Components/PlayerInfo.razor.cs similarity index 100% rename from Monopoly.Web/Pages/Gaming/Components/PlayerInfo.razor.cs rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Components/PlayerInfo.razor.cs diff --git a/Monopoly.Web/Pages/Gaming/Components/PlayerInfo.razor.css b/Clients/Monopoly.Clients.Web/Pages/Gaming/Components/PlayerInfo.razor.css similarity index 100% rename from Monopoly.Web/Pages/Gaming/Components/PlayerInfo.razor.css rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Components/PlayerInfo.razor.css diff --git a/Monopoly.Web/Pages/Gaming/Components/PlayerRankList.razor b/Clients/Monopoly.Clients.Web/Pages/Gaming/Components/PlayerRankList.razor similarity index 100% rename from Monopoly.Web/Pages/Gaming/Components/PlayerRankList.razor rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Components/PlayerRankList.razor diff --git a/Monopoly.Web/Pages/Gaming/Components/PlayerRankList.razor.cs b/Clients/Monopoly.Clients.Web/Pages/Gaming/Components/PlayerRankList.razor.cs similarity index 100% rename from Monopoly.Web/Pages/Gaming/Components/PlayerRankList.razor.cs rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Components/PlayerRankList.razor.cs diff --git a/Monopoly.Web/Pages/Gaming/Components/PlayerRankList.razor.css b/Clients/Monopoly.Clients.Web/Pages/Gaming/Components/PlayerRankList.razor.css similarity index 100% rename from Monopoly.Web/Pages/Gaming/Components/PlayerRankList.razor.css rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Components/PlayerRankList.razor.css diff --git a/Monopoly.Web/Pages/Gaming/Components/Settings.razor b/Clients/Monopoly.Clients.Web/Pages/Gaming/Components/Settings.razor similarity index 100% rename from Monopoly.Web/Pages/Gaming/Components/Settings.razor rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Components/Settings.razor diff --git a/Monopoly.Web/Pages/Gaming/Components/Settings.razor.cs b/Clients/Monopoly.Clients.Web/Pages/Gaming/Components/Settings.razor.cs similarity index 100% rename from Monopoly.Web/Pages/Gaming/Components/Settings.razor.cs rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Components/Settings.razor.cs diff --git a/Monopoly.Web/Pages/Gaming/Components/Settings.razor.css b/Clients/Monopoly.Clients.Web/Pages/Gaming/Components/Settings.razor.css similarity index 100% rename from Monopoly.Web/Pages/Gaming/Components/Settings.razor.css rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Components/Settings.razor.css diff --git a/Monopoly.Web/Pages/Gaming/Entities/Block.cs b/Clients/Monopoly.Clients.Web/Pages/Gaming/Entities/Block.cs similarity index 100% rename from Monopoly.Web/Pages/Gaming/Entities/Block.cs rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Entities/Block.cs diff --git a/Monopoly.Web/Pages/Gaming/Entities/ILandContract.cs b/Clients/Monopoly.Clients.Web/Pages/Gaming/Entities/ILandContract.cs similarity index 100% rename from Monopoly.Web/Pages/Gaming/Entities/ILandContract.cs rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Entities/ILandContract.cs diff --git a/Monopoly.Web/Pages/Gaming/Entities/Map.cs b/Clients/Monopoly.Clients.Web/Pages/Gaming/Entities/Map.cs similarity index 100% rename from Monopoly.Web/Pages/Gaming/Entities/Map.cs rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Entities/Map.cs diff --git a/Monopoly.Web/Pages/Gaming/Entities/Player.cs b/Clients/Monopoly.Clients.Web/Pages/Gaming/Entities/Player.cs similarity index 100% rename from Monopoly.Web/Pages/Gaming/Entities/Player.cs rename to Clients/Monopoly.Clients.Web/Pages/Gaming/Entities/Player.cs diff --git a/Monopoly.Web/Pages/Gaming/GamingPage.razor b/Clients/Monopoly.Clients.Web/Pages/Gaming/GamingPage.razor similarity index 100% rename from Monopoly.Web/Pages/Gaming/GamingPage.razor rename to Clients/Monopoly.Clients.Web/Pages/Gaming/GamingPage.razor diff --git a/Monopoly.Web/Pages/Gaming/GamingPage.razor.cs b/Clients/Monopoly.Clients.Web/Pages/Gaming/GamingPage.razor.cs similarity index 100% rename from Monopoly.Web/Pages/Gaming/GamingPage.razor.cs rename to Clients/Monopoly.Clients.Web/Pages/Gaming/GamingPage.razor.cs diff --git a/Monopoly.Web/Pages/Gaming/GamingPage.razor.cs.bak b/Clients/Monopoly.Clients.Web/Pages/Gaming/GamingPage.razor.cs.bak similarity index 100% rename from Monopoly.Web/Pages/Gaming/GamingPage.razor.cs.bak rename to Clients/Monopoly.Clients.Web/Pages/Gaming/GamingPage.razor.cs.bak diff --git a/Monopoly.Web/Pages/Gaming/GamingPage.razor.css b/Clients/Monopoly.Clients.Web/Pages/Gaming/GamingPage.razor.css similarity index 100% rename from Monopoly.Web/Pages/Gaming/GamingPage.razor.css rename to Clients/Monopoly.Clients.Web/Pages/Gaming/GamingPage.razor.css diff --git a/Monopoly.Web/Pages/Index.razor b/Clients/Monopoly.Clients.Web/Pages/Index.razor similarity index 100% rename from Monopoly.Web/Pages/Index.razor rename to Clients/Monopoly.Clients.Web/Pages/Index.razor diff --git a/Monopoly.Web/Pages/Index.razor.cs b/Clients/Monopoly.Clients.Web/Pages/Index.razor.cs similarity index 100% rename from Monopoly.Web/Pages/Index.razor.cs rename to Clients/Monopoly.Clients.Web/Pages/Index.razor.cs diff --git a/Monopoly.Web/Pages/Ready/Components/ColorChoicePanel.razor b/Clients/Monopoly.Clients.Web/Pages/Ready/Components/ColorChoicePanel.razor similarity index 100% rename from Monopoly.Web/Pages/Ready/Components/ColorChoicePanel.razor rename to Clients/Monopoly.Clients.Web/Pages/Ready/Components/ColorChoicePanel.razor diff --git a/Monopoly.Web/Pages/Ready/Components/ColorChoicePanel.razor.cs b/Clients/Monopoly.Clients.Web/Pages/Ready/Components/ColorChoicePanel.razor.cs similarity index 100% rename from Monopoly.Web/Pages/Ready/Components/ColorChoicePanel.razor.cs rename to Clients/Monopoly.Clients.Web/Pages/Ready/Components/ColorChoicePanel.razor.cs diff --git a/Monopoly.Web/Pages/Ready/Components/ColorChoicePanel.razor.css b/Clients/Monopoly.Clients.Web/Pages/Ready/Components/ColorChoicePanel.razor.css similarity index 100% rename from Monopoly.Web/Pages/Ready/Components/ColorChoicePanel.razor.css rename to Clients/Monopoly.Clients.Web/Pages/Ready/Components/ColorChoicePanel.razor.css diff --git a/Monopoly.Web/Pages/Ready/Components/Popup.razor b/Clients/Monopoly.Clients.Web/Pages/Ready/Components/Popup.razor similarity index 100% rename from Monopoly.Web/Pages/Ready/Components/Popup.razor rename to Clients/Monopoly.Clients.Web/Pages/Ready/Components/Popup.razor diff --git a/Monopoly.Web/Pages/Ready/Components/Popup.razor.cs b/Clients/Monopoly.Clients.Web/Pages/Ready/Components/Popup.razor.cs similarity index 100% rename from Monopoly.Web/Pages/Ready/Components/Popup.razor.cs rename to Clients/Monopoly.Clients.Web/Pages/Ready/Components/Popup.razor.cs diff --git a/Monopoly.Web/Pages/Ready/Components/Popup.razor.css b/Clients/Monopoly.Clients.Web/Pages/Ready/Components/Popup.razor.css similarity index 100% rename from Monopoly.Web/Pages/Ready/Components/Popup.razor.css rename to Clients/Monopoly.Clients.Web/Pages/Ready/Components/Popup.razor.css diff --git a/Monopoly.Web/Pages/Ready/Components/ReadyButton.razor b/Clients/Monopoly.Clients.Web/Pages/Ready/Components/ReadyButton.razor similarity index 100% rename from Monopoly.Web/Pages/Ready/Components/ReadyButton.razor rename to Clients/Monopoly.Clients.Web/Pages/Ready/Components/ReadyButton.razor diff --git a/Monopoly.Web/Pages/Ready/Components/ReadyButton.razor.cs b/Clients/Monopoly.Clients.Web/Pages/Ready/Components/ReadyButton.razor.cs similarity index 100% rename from Monopoly.Web/Pages/Ready/Components/ReadyButton.razor.cs rename to Clients/Monopoly.Clients.Web/Pages/Ready/Components/ReadyButton.razor.cs diff --git a/Monopoly.Web/Pages/Ready/Components/ReadyButton.razor.css b/Clients/Monopoly.Clients.Web/Pages/Ready/Components/ReadyButton.razor.css similarity index 100% rename from Monopoly.Web/Pages/Ready/Components/ReadyButton.razor.css rename to Clients/Monopoly.Clients.Web/Pages/Ready/Components/ReadyButton.razor.css diff --git a/Monopoly.Web/Pages/Ready/Components/RoleChoicePanel.razor b/Clients/Monopoly.Clients.Web/Pages/Ready/Components/RoleChoicePanel.razor similarity index 100% rename from Monopoly.Web/Pages/Ready/Components/RoleChoicePanel.razor rename to Clients/Monopoly.Clients.Web/Pages/Ready/Components/RoleChoicePanel.razor diff --git a/Monopoly.Web/Pages/Ready/Components/RoleChoicePanel.razor.cs b/Clients/Monopoly.Clients.Web/Pages/Ready/Components/RoleChoicePanel.razor.cs similarity index 100% rename from Monopoly.Web/Pages/Ready/Components/RoleChoicePanel.razor.cs rename to Clients/Monopoly.Clients.Web/Pages/Ready/Components/RoleChoicePanel.razor.cs diff --git a/Monopoly.Web/Pages/Ready/Components/RoleChoicePanel.razor.css b/Clients/Monopoly.Clients.Web/Pages/Ready/Components/RoleChoicePanel.razor.css similarity index 100% rename from Monopoly.Web/Pages/Ready/Components/RoleChoicePanel.razor.css rename to Clients/Monopoly.Clients.Web/Pages/Ready/Components/RoleChoicePanel.razor.css diff --git a/Monopoly.Web/Pages/Ready/Entities/Player.cs b/Clients/Monopoly.Clients.Web/Pages/Ready/Entities/Player.cs similarity index 100% rename from Monopoly.Web/Pages/Ready/Entities/Player.cs rename to Clients/Monopoly.Clients.Web/Pages/Ready/Entities/Player.cs diff --git a/Monopoly.Web/Pages/Ready/ReadyPage.razor b/Clients/Monopoly.Clients.Web/Pages/Ready/ReadyPage.razor similarity index 100% rename from Monopoly.Web/Pages/Ready/ReadyPage.razor rename to Clients/Monopoly.Clients.Web/Pages/Ready/ReadyPage.razor diff --git a/Monopoly.Web/Pages/Ready/ReadyPage.razor.cs b/Clients/Monopoly.Clients.Web/Pages/Ready/ReadyPage.razor.cs similarity index 100% rename from Monopoly.Web/Pages/Ready/ReadyPage.razor.cs rename to Clients/Monopoly.Clients.Web/Pages/Ready/ReadyPage.razor.cs diff --git a/Monopoly.Web/Pages/Ready/ReadyPage.razor.css b/Clients/Monopoly.Clients.Web/Pages/Ready/ReadyPage.razor.css similarity index 100% rename from Monopoly.Web/Pages/Ready/ReadyPage.razor.css rename to Clients/Monopoly.Clients.Web/Pages/Ready/ReadyPage.razor.css diff --git a/Monopoly.Web/Pages/Ready/ReadyRoomHubConnection.cs b/Clients/Monopoly.Clients.Web/Pages/Ready/ReadyRoomHubConnection.cs similarity index 100% rename from Monopoly.Web/Pages/Ready/ReadyRoomHubConnection.cs rename to Clients/Monopoly.Clients.Web/Pages/Ready/ReadyRoomHubConnection.cs diff --git a/Monopoly.Web/Pages/TypedHubConnection.cs b/Clients/Monopoly.Clients.Web/Pages/TypedHubConnection.cs similarity index 100% rename from Monopoly.Web/Pages/TypedHubConnection.cs rename to Clients/Monopoly.Clients.Web/Pages/TypedHubConnection.cs diff --git a/Monopoly.Web/Program.cs b/Clients/Monopoly.Clients.Web/Program.cs similarity index 100% rename from Monopoly.Web/Program.cs rename to Clients/Monopoly.Clients.Web/Program.cs diff --git a/Monopoly.Web/Properties/launchSettings.json b/Clients/Monopoly.Clients.Web/Properties/launchSettings.json similarity index 100% rename from Monopoly.Web/Properties/launchSettings.json rename to Clients/Monopoly.Clients.Web/Properties/launchSettings.json diff --git a/Monopoly.Web/_Imports.razor b/Clients/Monopoly.Clients.Web/_Imports.razor similarity index 100% rename from Monopoly.Web/_Imports.razor rename to Clients/Monopoly.Clients.Web/_Imports.razor diff --git a/Monopoly.Web/wwwroot/appsettings.Development.json b/Clients/Monopoly.Clients.Web/wwwroot/appsettings.Development.json similarity index 100% rename from Monopoly.Web/wwwroot/appsettings.Development.json rename to Clients/Monopoly.Clients.Web/wwwroot/appsettings.Development.json diff --git a/Monopoly.Web/wwwroot/appsettings.json b/Clients/Monopoly.Clients.Web/wwwroot/appsettings.json similarity index 100% rename from Monopoly.Web/wwwroot/appsettings.json rename to Clients/Monopoly.Clients.Web/wwwroot/appsettings.json diff --git a/Monopoly.Web/wwwroot/css/app.css b/Clients/Monopoly.Clients.Web/wwwroot/css/app.css similarity index 100% rename from Monopoly.Web/wwwroot/css/app.css rename to Clients/Monopoly.Clients.Web/wwwroot/css/app.css diff --git a/Monopoly.Web/wwwroot/images/Loading.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/Loading.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/Loading.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/Loading.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/AutoButtun_Off.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/AutoButtun_Off.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/AutoButtun_Off.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/AutoButtun_Off.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/AutoButtun_On.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/AutoButtun_On.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/AutoButtun_On.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/AutoButtun_On.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/GO Default.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/GO Default.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/GO Default.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/GO Default.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/Go_Default.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/Go_Default.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/Go_Default.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/Go_Default.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/Go_Pressed.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/Go_Pressed.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/Go_Pressed.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/Go_Pressed.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/Icon_Host.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/Icon_Host.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/Icon_Host.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/Icon_Host.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/Icon_Information.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/Icon_Information.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/Icon_Information.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/Icon_Information.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/Icon_Leave.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/Icon_Leave.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/Icon_Leave.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/Icon_Leave.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/Icon_Setting.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/Icon_Setting.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/Icon_Setting.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/Icon_Setting.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/Ranking_Host.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/Ranking_Host.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/Ranking_Host.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/Ranking_Host.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/Ranking_Item.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/Ranking_Item.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/Ranking_Item.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/Ranking_Item.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/alarm_clock.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/alarm_clock.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/alarm_clock.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/alarm_clock.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/arrow_blue.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/arrow_blue.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/arrow_blue.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/arrow_blue.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/arrow_green.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/arrow_green.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/arrow_green.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/arrow_green.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/arrow_red.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/arrow_red.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/arrow_red.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/arrow_red.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/arrow_yellow.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/arrow_yellow.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/arrow_yellow.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/arrow_yellow.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/background.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/background.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/background.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/background.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/blue.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/blue.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/blue.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/blue.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/empty.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/empty.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/empty.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/empty.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/green.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/green.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/green.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/green.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/icon_mini_home.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/icon_mini_home.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/icon_mini_home.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/icon_mini_home.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/icon_mini_money.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/icon_mini_money.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/icon_mini_money.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/icon_mini_money.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/land_horizontal.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/land_horizontal.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/land_horizontal.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/land_horizontal.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/land_vertical.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/land_vertical.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/land_vertical.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/land_vertical.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/list pause.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/list pause.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/list pause.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/list pause.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/list.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/list.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/list.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/list.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/parkinglot.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/parkinglot.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/parkinglot.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/parkinglot.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/prison.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/prison.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/prison.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/prison.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/railway_horizontal.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/railway_horizontal.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/railway_horizontal.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/railway_horizontal.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/railway_vertical.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/railway_vertical.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/railway_vertical.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/railway_vertical.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/red.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/red.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/red.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/red.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/road_bottom_left.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/road_bottom_left.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/road_bottom_left.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/road_bottom_left.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/road_bottom_right.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/road_bottom_right.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/road_bottom_right.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/road_bottom_right.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/road_horizontal.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/road_horizontal.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/road_horizontal.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/road_horizontal.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/road_top_left.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/road_top_left.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/road_top_left.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/road_top_left.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/road_top_right.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/road_top_right.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/road_top_right.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/road_top_right.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/road_vertical.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/road_vertical.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/road_vertical.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/road_vertical.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/round.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/round.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/round.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/round.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/startpoint.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/startpoint.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/startpoint.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/startpoint.svg diff --git a/Monopoly.Web/wwwroot/images/gamepage/yellow.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/yellow.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/gamepage/yellow.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/gamepage/yellow.svg diff --git a/Monopoly.Web/wwwroot/images/logo.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/logo.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/logo.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/logo.svg diff --git a/Monopoly.Web/wwwroot/images/preparing/background.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/preparing/background.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/preparing/background.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/preparing/background.svg diff --git a/Monopoly.Web/wwwroot/images/preparing/choice_arrow_blue.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/preparing/choice_arrow_blue.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/preparing/choice_arrow_blue.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/preparing/choice_arrow_blue.svg diff --git a/Monopoly.Web/wwwroot/images/preparing/choice_arrow_green.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/preparing/choice_arrow_green.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/preparing/choice_arrow_green.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/preparing/choice_arrow_green.svg diff --git a/Monopoly.Web/wwwroot/images/preparing/choice_arrow_red.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/preparing/choice_arrow_red.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/preparing/choice_arrow_red.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/preparing/choice_arrow_red.svg diff --git a/Monopoly.Web/wwwroot/images/preparing/choice_arrow_yellow.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/preparing/choice_arrow_yellow.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/preparing/choice_arrow_yellow.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/preparing/choice_arrow_yellow.svg diff --git a/Monopoly.Web/wwwroot/images/preparing/choice_blue.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/preparing/choice_blue.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/preparing/choice_blue.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/preparing/choice_blue.svg diff --git a/Monopoly.Web/wwwroot/images/preparing/choice_green.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/preparing/choice_green.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/preparing/choice_green.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/preparing/choice_green.svg diff --git a/Monopoly.Web/wwwroot/images/preparing/choice_red.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/preparing/choice_red.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/preparing/choice_red.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/preparing/choice_red.svg diff --git a/Monopoly.Web/wwwroot/images/preparing/choice_yellow.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/preparing/choice_yellow.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/preparing/choice_yellow.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/preparing/choice_yellow.svg diff --git a/Monopoly.Web/wwwroot/images/preparing/host-icon.svg b/Clients/Monopoly.Clients.Web/wwwroot/images/preparing/host-icon.svg similarity index 100% rename from Monopoly.Web/wwwroot/images/preparing/host-icon.svg rename to Clients/Monopoly.Clients.Web/wwwroot/images/preparing/host-icon.svg diff --git "a/Monopoly.Web/wwwroot/images/roles/avatars/\345\257\266\345\257\266\351\240\255.svg" "b/Clients/Monopoly.Clients.Web/wwwroot/images/roles/avatars/\345\257\266\345\257\266\351\240\255.svg" similarity index 100% rename from "Monopoly.Web/wwwroot/images/roles/avatars/\345\257\266\345\257\266\351\240\255.svg" rename to "Clients/Monopoly.Clients.Web/wwwroot/images/roles/avatars/\345\257\266\345\257\266\351\240\255.svg" diff --git "a/Monopoly.Web/wwwroot/images/roles/avatars/\345\260\217\347\276\216\351\240\255.svg" "b/Clients/Monopoly.Clients.Web/wwwroot/images/roles/avatars/\345\260\217\347\276\216\351\240\255.svg" similarity index 100% rename from "Monopoly.Web/wwwroot/images/roles/avatars/\345\260\217\347\276\216\351\240\255.svg" rename to "Clients/Monopoly.Clients.Web/wwwroot/images/roles/avatars/\345\260\217\347\276\216\351\240\255.svg" diff --git "a/Monopoly.Web/wwwroot/images/roles/avatars/\350\200\201\344\272\272\351\240\255.svg" "b/Clients/Monopoly.Clients.Web/wwwroot/images/roles/avatars/\350\200\201\344\272\272\351\240\255.svg" similarity index 100% rename from "Monopoly.Web/wwwroot/images/roles/avatars/\350\200\201\344\272\272\351\240\255.svg" rename to "Clients/Monopoly.Clients.Web/wwwroot/images/roles/avatars/\350\200\201\344\272\272\351\240\255.svg" diff --git "a/Monopoly.Web/wwwroot/images/roles/avatars/\351\230\277\345\221\206\351\240\255.svg" "b/Clients/Monopoly.Clients.Web/wwwroot/images/roles/avatars/\351\230\277\345\221\206\351\240\255.svg" similarity index 100% rename from "Monopoly.Web/wwwroot/images/roles/avatars/\351\230\277\345\221\206\351\240\255.svg" rename to "Clients/Monopoly.Clients.Web/wwwroot/images/roles/avatars/\351\230\277\345\221\206\351\240\255.svg" diff --git "a/Monopoly.Web/wwwroot/images/roles/chesses/\345\257\266\345\257\266.svg" "b/Clients/Monopoly.Clients.Web/wwwroot/images/roles/chesses/\345\257\266\345\257\266.svg" similarity index 100% rename from "Monopoly.Web/wwwroot/images/roles/chesses/\345\257\266\345\257\266.svg" rename to "Clients/Monopoly.Clients.Web/wwwroot/images/roles/chesses/\345\257\266\345\257\266.svg" diff --git "a/Monopoly.Web/wwwroot/images/roles/chesses/\345\260\217\347\276\216.svg" "b/Clients/Monopoly.Clients.Web/wwwroot/images/roles/chesses/\345\260\217\347\276\216.svg" similarity index 100% rename from "Monopoly.Web/wwwroot/images/roles/chesses/\345\260\217\347\276\216.svg" rename to "Clients/Monopoly.Clients.Web/wwwroot/images/roles/chesses/\345\260\217\347\276\216.svg" diff --git "a/Monopoly.Web/wwwroot/images/roles/chesses/\346\225\231\346\216\210.svg" "b/Clients/Monopoly.Clients.Web/wwwroot/images/roles/chesses/\346\225\231\346\216\210.svg" similarity index 100% rename from "Monopoly.Web/wwwroot/images/roles/chesses/\346\225\231\346\216\210.svg" rename to "Clients/Monopoly.Clients.Web/wwwroot/images/roles/chesses/\346\225\231\346\216\210.svg" diff --git "a/Monopoly.Web/wwwroot/images/roles/chesses/\351\230\277\345\221\206.svg" "b/Clients/Monopoly.Clients.Web/wwwroot/images/roles/chesses/\351\230\277\345\221\206.svg" similarity index 100% rename from "Monopoly.Web/wwwroot/images/roles/chesses/\351\230\277\345\221\206.svg" rename to "Clients/Monopoly.Clients.Web/wwwroot/images/roles/chesses/\351\230\277\345\221\206.svg" diff --git "a/Monopoly.Web/wwwroot/images/roles/modals/\345\257\266\345\257\266.svg" "b/Clients/Monopoly.Clients.Web/wwwroot/images/roles/modals/\345\257\266\345\257\266.svg" similarity index 100% rename from "Monopoly.Web/wwwroot/images/roles/modals/\345\257\266\345\257\266.svg" rename to "Clients/Monopoly.Clients.Web/wwwroot/images/roles/modals/\345\257\266\345\257\266.svg" diff --git "a/Monopoly.Web/wwwroot/images/roles/modals/\345\260\217\347\276\216.svg" "b/Clients/Monopoly.Clients.Web/wwwroot/images/roles/modals/\345\260\217\347\276\216.svg" similarity index 100% rename from "Monopoly.Web/wwwroot/images/roles/modals/\345\260\217\347\276\216.svg" rename to "Clients/Monopoly.Clients.Web/wwwroot/images/roles/modals/\345\260\217\347\276\216.svg" diff --git "a/Monopoly.Web/wwwroot/images/roles/modals/\346\225\231\346\216\210.svg" "b/Clients/Monopoly.Clients.Web/wwwroot/images/roles/modals/\346\225\231\346\216\210.svg" similarity index 100% rename from "Monopoly.Web/wwwroot/images/roles/modals/\346\225\231\346\216\210.svg" rename to "Clients/Monopoly.Clients.Web/wwwroot/images/roles/modals/\346\225\231\346\216\210.svg" diff --git "a/Monopoly.Web/wwwroot/images/roles/modals/\351\230\277\345\221\206.svg" "b/Clients/Monopoly.Clients.Web/wwwroot/images/roles/modals/\351\230\277\345\221\206.svg" similarity index 100% rename from "Monopoly.Web/wwwroot/images/roles/modals/\351\230\277\345\221\206.svg" rename to "Clients/Monopoly.Clients.Web/wwwroot/images/roles/modals/\351\230\277\345\221\206.svg" diff --git a/Monopoly.Web/wwwroot/index.html b/Clients/Monopoly.Clients.Web/wwwroot/index.html similarity index 100% rename from Monopoly.Web/wwwroot/index.html rename to Clients/Monopoly.Clients.Web/wwwroot/index.html diff --git a/Domain/Auction.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Auction.cs similarity index 95% rename from Domain/Auction.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Auction.cs index e1348ca..a0e6ab4 100644 --- a/Domain/Auction.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Auction.cs @@ -1,7 +1,7 @@ -using Domain.Events; -using Monopoly.DomainLayer.Common; +using Monopoly.DomainLayer.Common; +using Monopoly.DomainLayer.Domain.Events; -namespace Domain; +namespace Monopoly.DomainLayer.Domain; public class Auction { diff --git a/Domain/Block.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Block.cs similarity index 99% rename from Domain/Block.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Block.cs index 24dd3f6..016805d 100644 --- a/Domain/Block.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Block.cs @@ -1,7 +1,7 @@ -using Domain.Events; using Monopoly.DomainLayer.Common; +using Monopoly.DomainLayer.Domain.Events; -namespace Domain; +namespace Monopoly.DomainLayer.Domain; public abstract class Block { diff --git a/Domain/Builders/CurrentPlayerStateBuilder.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Builders/CurrentPlayerStateBuilder.cs similarity index 97% rename from Domain/Builders/CurrentPlayerStateBuilder.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Builders/CurrentPlayerStateBuilder.cs index e934b09..922324a 100644 --- a/Domain/Builders/CurrentPlayerStateBuilder.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Builders/CurrentPlayerStateBuilder.cs @@ -1,4 +1,4 @@ -namespace Domain.Builders; +namespace Monopoly.DomainLayer.Domain.Builders; public class CurrentPlayerStateBuilder { diff --git a/Domain/Builders/MonopolyBuilder.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Builders/MonopolyBuilder.cs similarity index 97% rename from Domain/Builders/MonopolyBuilder.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Builders/MonopolyBuilder.cs index 854da7a..ac6f071 100644 --- a/Domain/Builders/MonopolyBuilder.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Builders/MonopolyBuilder.cs @@ -1,8 +1,8 @@ #pragma warning disable CS8618 // 退出建構函式時，不可為 Null 的欄位必須包含非 Null 值。請考慮宣告為可為 Null。 -using Domain.Interfaces; using System.Linq.Expressions; +using Monopoly.DomainLayer.Domain.Interfaces; -namespace Domain.Builders; +namespace Monopoly.DomainLayer.Domain.Builders; public class MonopolyBuilder { diff --git a/Domain/Builders/PlayerBuilder.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Builders/PlayerBuilder.cs similarity index 98% rename from Domain/Builders/PlayerBuilder.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Builders/PlayerBuilder.cs index 286b2a2..b7ad735 100644 --- a/Domain/Builders/PlayerBuilder.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Builders/PlayerBuilder.cs @@ -1,4 +1,4 @@ -namespace Domain.Builders; +namespace Monopoly.DomainLayer.Domain.Builders; public class PlayerBuilder { diff --git a/Domain/Chess.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Chess.cs similarity index 96% rename from Domain/Chess.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Chess.cs index b482677..18190a2 100644 --- a/Domain/Chess.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Chess.cs @@ -1,8 +1,8 @@ -using Domain.Events; using Monopoly.DomainLayer.Common; -using static Domain.Map; +using Monopoly.DomainLayer.Domain.Events; +using static Monopoly.DomainLayer.Domain.Map; -namespace Domain; +namespace Monopoly.DomainLayer.Domain; public class Chess { diff --git a/Domain/Common/AbstractAggregateRoot.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Common/AbstractAggregateRoot.cs similarity index 93% rename from Domain/Common/AbstractAggregateRoot.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Common/AbstractAggregateRoot.cs index b72a7e6..d33a7f2 100644 --- a/Domain/Common/AbstractAggregateRoot.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Common/AbstractAggregateRoot.cs @@ -1,6 +1,6 @@ using Monopoly.DomainLayer.Common; -namespace Domain.Common; +namespace Monopoly.DomainLayer.Domain.Common; public abstract class AbstractAggregateRoot { diff --git a/Domain/CurrentPlayerState.cs b/DomainLayer/Monopoly.DomainLayer.Domain/CurrentPlayerState.cs similarity index 90% rename from Domain/CurrentPlayerState.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/CurrentPlayerState.cs index 21efe08..340e023 100644 --- a/Domain/CurrentPlayerState.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/CurrentPlayerState.cs @@ -1,4 +1,4 @@ -namespace Domain; +namespace Monopoly.DomainLayer.Domain; public record CurrentPlayerState(string PlayerId, bool IsPayToll, diff --git a/Domain/Dice.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Dice.cs similarity index 74% rename from Domain/Dice.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Dice.cs index c1f73bf..99b3caf 100644 --- a/Domain/Dice.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Dice.cs @@ -1,6 +1,6 @@ -using Domain.Interfaces; +using Monopoly.DomainLayer.Domain.Interfaces; -namespace Domain; +namespace Monopoly.DomainLayer.Domain; public class Dice : IDice { diff --git a/Domain/Events/CannotGetRewardBecauseStandOnStartEvent.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Events/CannotGetRewardBecauseStandOnStartEvent.cs similarity index 76% rename from Domain/Events/CannotGetRewardBecauseStandOnStartEvent.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Events/CannotGetRewardBecauseStandOnStartEvent.cs index 63a99c4..48d1495 100644 --- a/Domain/Events/CannotGetRewardBecauseStandOnStartEvent.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Events/CannotGetRewardBecauseStandOnStartEvent.cs @@ -1,5 +1,5 @@ using Monopoly.DomainLayer.Common; -namespace Domain.Events; +namespace Monopoly.DomainLayer.Domain.Events; public record CannotGetRewardBecauseStandOnStartEvent(string PlayerId, decimal PlayerMoney) : DomainEvent; \ No newline at end of file diff --git a/Domain/Events/ChessMovedEvent.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Events/ChessMovedEvent.cs similarity index 77% rename from Domain/Events/ChessMovedEvent.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Events/ChessMovedEvent.cs index 1a1bcdb..f1603a4 100644 --- a/Domain/Events/ChessMovedEvent.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Events/ChessMovedEvent.cs @@ -1,5 +1,5 @@ using Monopoly.DomainLayer.Common; -namespace Domain.Events; +namespace Monopoly.DomainLayer.Domain.Events; public record ChessMovedEvent(string PlayerId, string BlockId, string Direction, int RemainingSteps) : DomainEvent; \ No newline at end of file diff --git a/Domain/Events/EndAuctionEvent.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Events/EndAuctionEvent.cs similarity index 79% rename from Domain/Events/EndAuctionEvent.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Events/EndAuctionEvent.cs index d314d0a..3eaaf7a 100644 --- a/Domain/Events/EndAuctionEvent.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Events/EndAuctionEvent.cs @@ -1,6 +1,6 @@ using Monopoly.DomainLayer.Common; -namespace Domain.Events; +namespace Monopoly.DomainLayer.Domain.Events; public record EndAuctionEvent(string PlayerId, decimal PlayerMoney, string LandId, string? OwnerId, decimal OwnerMoney) : DomainEvent; \ No newline at end of file diff --git a/Domain/Events/EndRoundEvent.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Events/EndRoundEvent.cs similarity index 85% rename from Domain/Events/EndRoundEvent.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Events/EndRoundEvent.cs index a4055b0..3b406c1 100644 --- a/Domain/Events/EndRoundEvent.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Events/EndRoundEvent.cs @@ -1,6 +1,6 @@ using Monopoly.DomainLayer.Common; -namespace Domain.Events; +namespace Monopoly.DomainLayer.Domain.Events; public record EndRoundEvent(string PlayerId, string NextPlayerId) : DomainEvent; diff --git a/Domain/Events/GameCreatedEvent.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Events/GameCreatedEvent.cs similarity index 65% rename from Domain/Events/GameCreatedEvent.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Events/GameCreatedEvent.cs index c40e39d..63fb396 100644 --- a/Domain/Events/GameCreatedEvent.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Events/GameCreatedEvent.cs @@ -1,5 +1,5 @@ using Monopoly.DomainLayer.Common; -namespace Domain.Events; +namespace Monopoly.DomainLayer.Domain.Events; public record GameCreatedEvent() : DomainEvent; \ No newline at end of file diff --git a/Domain/Events/GameSettlementEvent.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Events/GameSettlementEvent.cs similarity index 73% rename from Domain/Events/GameSettlementEvent.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Events/GameSettlementEvent.cs index 4396fc3..1e2c544 100644 --- a/Domain/Events/GameSettlementEvent.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Events/GameSettlementEvent.cs @@ -1,5 +1,5 @@ using Monopoly.DomainLayer.Common; -namespace Domain.Events; +namespace Monopoly.DomainLayer.Domain.Events; public record GameSettlementEvent(int Rounds, params Player[] Players) : DomainEvent; diff --git a/Domain/Events/GameStartEvent.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Events/GameStartEvent.cs similarity index 86% rename from Domain/Events/GameStartEvent.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Events/GameStartEvent.cs index 27ae5f0..1f25684 100644 --- a/Domain/Events/GameStartEvent.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Events/GameStartEvent.cs @@ -1,6 +1,6 @@ using Monopoly.DomainLayer.Common; -namespace Domain.Events; +namespace Monopoly.DomainLayer.Domain.Events; public record GameStartEvent(string GameStage, string CurrentPlayerId) : DomainEvent; diff --git a/Domain/Events/PlayerBankruptEvent.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerBankruptEvent.cs similarity index 68% rename from Domain/Events/PlayerBankruptEvent.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerBankruptEvent.cs index 3b41e9c..d6c95ce 100644 --- a/Domain/Events/PlayerBankruptEvent.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerBankruptEvent.cs @@ -1,5 +1,5 @@ using Monopoly.DomainLayer.Common; -namespace Domain.Events; +namespace Monopoly.DomainLayer.Domain.Events; public record PlayerBankruptEvent(string PlayerId) : DomainEvent; \ No newline at end of file diff --git a/Domain/Events/PlayerBidEvent.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerBidEvent.cs similarity index 90% rename from Domain/Events/PlayerBidEvent.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerBidEvent.cs index 94668c9..90de5dc 100644 --- a/Domain/Events/PlayerBidEvent.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerBidEvent.cs @@ -1,6 +1,6 @@ using Monopoly.DomainLayer.Common; -namespace Domain.Events; +namespace Monopoly.DomainLayer.Domain.Events; public record PlayerBidEvent(string PlayerId, string LandId, decimal HighestPrice) : DomainEvent; diff --git a/Domain/Events/PlayerBuildHouseEvent.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerBuildHouseEvent.cs similarity index 89% rename from Domain/Events/PlayerBuildHouseEvent.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerBuildHouseEvent.cs index 44b21d9..7f7f044 100644 --- a/Domain/Events/PlayerBuildHouseEvent.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerBuildHouseEvent.cs @@ -1,6 +1,6 @@ using Monopoly.DomainLayer.Common; -namespace Domain.Events; +namespace Monopoly.DomainLayer.Domain.Events; public record PlayerBuildHouseEvent(string PlayerId, string LandId, decimal PlayerMoney, int HouseCount) : DomainEvent; diff --git a/Domain/Events/PlayerBuyBlockEvent.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerBuyBlockEvent.cs similarity index 92% rename from Domain/Events/PlayerBuyBlockEvent.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerBuyBlockEvent.cs index faf63ed..c7d8b69 100644 --- a/Domain/Events/PlayerBuyBlockEvent.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerBuyBlockEvent.cs @@ -1,6 +1,6 @@ using Monopoly.DomainLayer.Common; -namespace Domain.Events; +namespace Monopoly.DomainLayer.Domain.Events; public record PlayerBuyBlockEvent(string PlayerId, string LandId) : DomainEvent; diff --git a/Domain/Events/PlayerCanBuildHouseEvent.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerCanBuildHouseEvent.cs similarity index 77% rename from Domain/Events/PlayerCanBuildHouseEvent.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerCanBuildHouseEvent.cs index 7d634d9..d13ad6a 100644 --- a/Domain/Events/PlayerCanBuildHouseEvent.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerCanBuildHouseEvent.cs @@ -1,5 +1,5 @@ using Monopoly.DomainLayer.Common; -namespace Domain.Events; +namespace Monopoly.DomainLayer.Domain.Events; public record PlayerCanBuildHouseEvent(string PlayerId, string LandId, int HouseCount, decimal UpgradePrice) : DomainEvent; \ No newline at end of file diff --git a/Domain/Events/PlayerCanBuyLandEvent.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerCanBuyLandEvent.cs similarity index 75% rename from Domain/Events/PlayerCanBuyLandEvent.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerCanBuyLandEvent.cs index d9691a7..345dd87 100644 --- a/Domain/Events/PlayerCanBuyLandEvent.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerCanBuyLandEvent.cs @@ -1,6 +1,6 @@ using Monopoly.DomainLayer.Common; -namespace Domain.Events; +namespace Monopoly.DomainLayer.Domain.Events; public record PlayerCanBuyLandEvent(string PlayerId, string LandId, decimal Price) : DomainEvent; \ No newline at end of file diff --git a/Domain/Events/PlayerChooseDirectionEvent.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerChooseDirectionEvent.cs similarity index 73% rename from Domain/Events/PlayerChooseDirectionEvent.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerChooseDirectionEvent.cs index 26b2513..68f3ef5 100644 --- a/Domain/Events/PlayerChooseDirectionEvent.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerChooseDirectionEvent.cs @@ -1,5 +1,5 @@ using Monopoly.DomainLayer.Common; -namespace Domain.Events; +namespace Monopoly.DomainLayer.Domain.Events; public record PlayerChooseDirectionEvent(string PlayerId, string Direction) : DomainEvent; \ No newline at end of file diff --git a/Domain/Events/PlayerChooseInvalidDirectionEvent.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerChooseInvalidDirectionEvent.cs similarity index 75% rename from Domain/Events/PlayerChooseInvalidDirectionEvent.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerChooseInvalidDirectionEvent.cs index e967794..731a630 100644 --- a/Domain/Events/PlayerChooseInvalidDirectionEvent.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerChooseInvalidDirectionEvent.cs @@ -1,5 +1,5 @@ using Monopoly.DomainLayer.Common; -namespace Domain.Events; +namespace Monopoly.DomainLayer.Domain.Events; public record PlayerChooseInvalidDirectionEvent(string PlayerId, string Direction) : DomainEvent; diff --git a/Domain/Events/PlayerHadSelectedDirectionEvent.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerHadSelectedDirectionEvent.cs similarity index 71% rename from Domain/Events/PlayerHadSelectedDirectionEvent.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerHadSelectedDirectionEvent.cs index bd6e412..7aca2db 100644 --- a/Domain/Events/PlayerHadSelectedDirectionEvent.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerHadSelectedDirectionEvent.cs @@ -1,5 +1,5 @@ using Monopoly.DomainLayer.Common; -namespace Domain.Events; +namespace Monopoly.DomainLayer.Domain.Events; public record PlayerHadSelectedDirectionEvent(string PlayerId) : DomainEvent; diff --git a/Domain/Events/PlayerMortgageEvent.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerMortgageEvent.cs similarity index 90% rename from Domain/Events/PlayerMortgageEvent.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerMortgageEvent.cs index 7aefb70..ab98d98 100644 --- a/Domain/Events/PlayerMortgageEvent.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerMortgageEvent.cs @@ -1,6 +1,6 @@ using Monopoly.DomainLayer.Common; -namespace Domain.Events; +namespace Monopoly.DomainLayer.Domain.Events; public record PlayerMortgageEvent(string PlayerId, decimal PlayerMoney, string BlockId, int DeadLine) : DomainEvent; diff --git a/Domain/Events/PlayerNeedToChooseDirectionEvent.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerNeedToChooseDirectionEvent.cs similarity index 76% rename from Domain/Events/PlayerNeedToChooseDirectionEvent.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerNeedToChooseDirectionEvent.cs index e68095e..7280b6a 100644 --- a/Domain/Events/PlayerNeedToChooseDirectionEvent.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerNeedToChooseDirectionEvent.cs @@ -1,5 +1,5 @@ using Monopoly.DomainLayer.Common; -namespace Domain.Events; +namespace Monopoly.DomainLayer.Domain.Events; public record PlayerNeedToChooseDirectionEvent(string PlayerId, params string[] Directions) : DomainEvent; \ No newline at end of file diff --git a/Domain/Events/PlayerPayTollEvent.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerPayTollEvent.cs similarity index 91% rename from Domain/Events/PlayerPayTollEvent.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerPayTollEvent.cs index fab3e51..d5685c3 100644 --- a/Domain/Events/PlayerPayTollEvent.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerPayTollEvent.cs @@ -1,6 +1,6 @@ using Monopoly.DomainLayer.Common; -namespace Domain.Events; +namespace Monopoly.DomainLayer.Domain.Events; public record PlayerNeedsToPayTollEvent(string PlayerId, string OwnerId, decimal Toll) : DomainEvent; diff --git a/Domain/Events/PlayerRedeemEvent.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerRedeemEvent.cs similarity index 88% rename from Domain/Events/PlayerRedeemEvent.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerRedeemEvent.cs index a088795..08868b5 100644 --- a/Domain/Events/PlayerRedeemEvent.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerRedeemEvent.cs @@ -1,6 +1,6 @@ using Monopoly.DomainLayer.Common; -namespace Domain.Events; +namespace Monopoly.DomainLayer.Domain.Events; public record PlayerRedeemEvent(string PlayerId, decimal PlayerMoney, string LandId) : DomainEvent; diff --git a/Domain/Events/PlayerRolledDiceEvent.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerRolledDiceEvent.cs similarity index 72% rename from Domain/Events/PlayerRolledDiceEvent.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerRolledDiceEvent.cs index 4b94720..b087400 100644 --- a/Domain/Events/PlayerRolledDiceEvent.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Events/PlayerRolledDiceEvent.cs @@ -1,5 +1,5 @@ using Monopoly.DomainLayer.Common; -namespace Domain.Events; +namespace Monopoly.DomainLayer.Domain.Events; public record PlayerRolledDiceEvent(string PlayerId, int DiceCount) : DomainEvent; \ No newline at end of file diff --git a/Domain/Events/ThroughStartEvent.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Events/ThroughStartEvent.cs similarity index 75% rename from Domain/Events/ThroughStartEvent.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Events/ThroughStartEvent.cs index 9066450..7ee6cbc 100644 --- a/Domain/Events/ThroughStartEvent.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Events/ThroughStartEvent.cs @@ -1,5 +1,5 @@ using Monopoly.DomainLayer.Common; -namespace Domain.Events; +namespace Monopoly.DomainLayer.Domain.Events; public record ThroughStartEvent(string PlayerId, decimal GainMoney, decimal TotalMoney) : DomainEvent; \ No newline at end of file diff --git a/Domain/Exceptions/BidException.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Exceptions/BidException.cs similarity index 91% rename from Domain/Exceptions/BidException.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Exceptions/BidException.cs index db99968..47c9e96 100644 --- a/Domain/Exceptions/BidException.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Exceptions/BidException.cs @@ -1,6 +1,6 @@ using System.Runtime.Serialization; -namespace Domain.Exceptions +namespace Monopoly.DomainLayer.Domain.Exceptions { [Serializable] public class BidException : Exception diff --git a/Domain/GameStage.cs b/DomainLayer/Monopoly.DomainLayer.Domain/GameStage.cs similarity index 53% rename from Domain/GameStage.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/GameStage.cs index d0e40a7..6839f14 100644 --- a/Domain/GameStage.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/GameStage.cs @@ -1,4 +1,4 @@ -namespace Domain; +namespace Monopoly.DomainLayer.Domain; public enum GameStage { Ready, diff --git a/Domain/Interfaces/IDice.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Interfaces/IDice.cs similarity index 60% rename from Domain/Interfaces/IDice.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Interfaces/IDice.cs index eca7465..72ca973 100644 --- a/Domain/Interfaces/IDice.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Interfaces/IDice.cs @@ -1,4 +1,4 @@ -namespace Domain.Interfaces; +namespace Monopoly.DomainLayer.Domain.Interfaces; public interface IDice { diff --git a/Domain/LandContract.cs b/DomainLayer/Monopoly.DomainLayer.Domain/LandContract.cs similarity index 93% rename from Domain/LandContract.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/LandContract.cs index e3d41d2..39e961a 100644 --- a/Domain/LandContract.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/LandContract.cs @@ -1,7 +1,7 @@ -using Domain.Events; using Monopoly.DomainLayer.Common; +using Monopoly.DomainLayer.Domain.Events; -namespace Domain; +namespace Monopoly.DomainLayer.Domain; public class LandContract { diff --git a/Domain/Map.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Map.cs similarity index 98% rename from Domain/Map.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Map.cs index a79932b..a7ef385 100644 --- a/Domain/Map.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Map.cs @@ -1,4 +1,4 @@ -namespace Domain; +namespace Monopoly.DomainLayer.Domain; public class Map { diff --git a/Domain/Maps/SevenXSevenMap.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Maps/SevenXSevenMap.cs similarity index 97% rename from Domain/Maps/SevenXSevenMap.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Maps/SevenXSevenMap.cs index a8f878d..a781765 100644 --- a/Domain/Maps/SevenXSevenMap.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Maps/SevenXSevenMap.cs @@ -1,4 +1,4 @@ -namespace Domain.Maps; +namespace Monopoly.DomainLayer.Domain.Maps; public class SevenXSevenMap : Map { diff --git a/Domain/Domain.csproj b/DomainLayer/Monopoly.DomainLayer.Domain/Monopoly.DomainLayer.Domain.csproj similarity index 67% rename from Domain/Domain.csproj rename to DomainLayer/Monopoly.DomainLayer.Domain/Monopoly.DomainLayer.Domain.csproj index 3c9857d..8b4a464 100644 --- a/Domain/Domain.csproj +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Monopoly.DomainLayer.Domain.csproj @@ -7,7 +7,7 @@ - + diff --git a/Domain/MonopolyAggregate.cs b/DomainLayer/Monopoly.DomainLayer.Domain/MonopolyAggregate.cs similarity index 96% rename from Domain/MonopolyAggregate.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/MonopolyAggregate.cs index e4a6def..389cf8c 100644 --- a/Domain/MonopolyAggregate.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/MonopolyAggregate.cs @@ -1,10 +1,10 @@ -using Domain.Builders; -using Domain.Common; -using Domain.Events; -using Domain.Interfaces; -using static Domain.Map; +using Monopoly.DomainLayer.Domain.Builders; +using Monopoly.DomainLayer.Domain.Common; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.DomainLayer.Domain.Interfaces; +using static Monopoly.DomainLayer.Domain.Map; -namespace Domain; +namespace Monopoly.DomainLayer.Domain; public class MonopolyAggregate : AbstractAggregateRoot { diff --git a/Domain/Player.cs b/DomainLayer/Monopoly.DomainLayer.Domain/Player.cs similarity index 98% rename from Domain/Player.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/Player.cs index 3265860..1eb9ab8 100644 --- a/Domain/Player.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/Player.cs @@ -1,8 +1,8 @@ -using Domain.Events; -using Domain.Interfaces; using Monopoly.DomainLayer.Common; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.DomainLayer.Domain.Interfaces; -namespace Domain; +namespace Monopoly.DomainLayer.Domain; public class Player { diff --git a/Domain/PlayerState.cs b/DomainLayer/Monopoly.DomainLayer.Domain/PlayerState.cs similarity index 58% rename from Domain/PlayerState.cs rename to DomainLayer/Monopoly.DomainLayer.Domain/PlayerState.cs index 7de4bab..772f094 100644 --- a/Domain/PlayerState.cs +++ b/DomainLayer/Monopoly.DomainLayer.Domain/PlayerState.cs @@ -1,4 +1,4 @@ -namespace Domain; +namespace Monopoly.DomainLayer.Domain; public enum PlayerState { diff --git a/Server/Common/IMonopolyEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Common/IMonopolyEventHandler.cs similarity index 73% rename from Server/Common/IMonopolyEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Common/IMonopolyEventHandler.cs index e50bc11..00f9139 100644 --- a/Server/Common/IMonopolyEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Common/IMonopolyEventHandler.cs @@ -1,6 +1,6 @@ using Monopoly.DomainLayer.Common; -namespace Server.Common; +namespace Monopoly.InterfaceAdapterLayer.Server.Common; internal interface IMonopolyEventHandler { diff --git a/Server/Common/MonopolyEventHandlerBase.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Common/MonopolyEventHandlerBase.cs similarity index 90% rename from Server/Common/MonopolyEventHandlerBase.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Common/MonopolyEventHandlerBase.cs index c38448f..9883d69 100644 --- a/Server/Common/MonopolyEventHandlerBase.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Common/MonopolyEventHandlerBase.cs @@ -1,6 +1,6 @@ using Monopoly.DomainLayer.Common; -namespace Server.Common; +namespace Monopoly.InterfaceAdapterLayer.Server.Common; public abstract class MonopolyEventHandlerBase : IMonopolyEventHandler where TEvent : DomainEvent { diff --git a/Server/Configurations/JwtSettings.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Configurations/JwtSettings.cs similarity index 84% rename from Server/Configurations/JwtSettings.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Configurations/JwtSettings.cs index 4b18f50..41888e6 100644 --- a/Server/Configurations/JwtSettings.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Configurations/JwtSettings.cs @@ -1,4 +1,4 @@ -namespace Server.Configurations; +namespace Monopoly.InterfaceAdapterLayer.Server.Configurations; public class JwtSettings { diff --git a/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/DataModels/CreateGameBodyPayload.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/DataModels/CreateGameBodyPayload.cs new file mode 100644 index 0000000..077236d --- /dev/null +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/DataModels/CreateGameBodyPayload.cs @@ -0,0 +1,3 @@ +namespace Monopoly.InterfaceAdapterLayer.Server.DataModels; + +public record CreateGameBodyPayload(string[] PlayerIds); diff --git a/Server/DataModels/UserInfo.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/DataModels/UserInfo.cs similarity index 51% rename from Server/DataModels/UserInfo.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/DataModels/UserInfo.cs index 5367dae..897e8f4 100644 --- a/Server/DataModels/UserInfo.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/DataModels/UserInfo.cs @@ -1,3 +1,3 @@ -namespace Server.DataModels; +namespace Monopoly.InterfaceAdapterLayer.Server.DataModels; public record UserInfo(string Id, string Email, string Nickname); \ No newline at end of file diff --git a/Server/DependencyInjection.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/DependencyInjection.cs similarity index 76% rename from Server/DependencyInjection.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/DependencyInjection.cs index a7a2013..6381e9c 100644 --- a/Server/DependencyInjection.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/DependencyInjection.cs @@ -1,12 +1,12 @@ -using Application.Common; -using Server.Common; -using Server.Presenters; -using Server.Repositories; -using System.Reflection; -using Application.Usecases.ReadyRoom; +using System.Reflection; +using Monopoly.ApplicationLayer.Application.Common; +using Monopoly.ApplicationLayer.Application.Usecases.ReadyRoom; using Monopoly.DomainLayer.Common; +using Monopoly.InterfaceAdapterLayer.Server.Common; +using Monopoly.InterfaceAdapterLayer.Server.Presenters; +using Monopoly.InterfaceAdapterLayer.Server.Repositories; -namespace Server; +namespace Monopoly.InterfaceAdapterLayer.Server; public static class DependencyInjection { diff --git a/Server/Hubs/Monopoly/EventHandlers/CannotGetRewardBecauseStandOnStartEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/CannotGetRewardBecauseStandOnStartEventHandler.cs similarity index 73% rename from Server/Hubs/Monopoly/EventHandlers/CannotGetRewardBecauseStandOnStartEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/CannotGetRewardBecauseStandOnStartEventHandler.cs index 99855df..91cf32c 100644 --- a/Server/Hubs/Monopoly/EventHandlers/CannotGetRewardBecauseStandOnStartEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/CannotGetRewardBecauseStandOnStartEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class CannotGetRewardBecauseStandOnStartEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/ChessMovedEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/ChessMovedEventHandler.cs similarity index 71% rename from Server/Hubs/Monopoly/EventHandlers/ChessMovedEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/ChessMovedEventHandler.cs index 2de0c2f..facd12e 100644 --- a/Server/Hubs/Monopoly/EventHandlers/ChessMovedEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/ChessMovedEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class ChessMovedEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase { diff --git a/Server/Hubs/Monopoly/EventHandlers/CurrentPlayerCannotBidEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/CurrentPlayerCannotBidEventHandler.cs similarity index 70% rename from Server/Hubs/Monopoly/EventHandlers/CurrentPlayerCannotBidEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/CurrentPlayerCannotBidEventHandler.cs index 537dc68..bff8b3c 100644 --- a/Server/Hubs/Monopoly/EventHandlers/CurrentPlayerCannotBidEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/CurrentPlayerCannotBidEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class CurrentPlayerCannotBidEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/EndAuctionEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/EndAuctionEventHandler.cs similarity index 74% rename from Server/Hubs/Monopoly/EventHandlers/EndAuctionEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/EndAuctionEventHandler.cs index 9199e29..81f6fb4 100644 --- a/Server/Hubs/Monopoly/EventHandlers/EndAuctionEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/EndAuctionEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class EndAuctionEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/EndRoundEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/EndRoundEventHandler.cs similarity index 68% rename from Server/Hubs/Monopoly/EventHandlers/EndRoundEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/EndRoundEventHandler.cs index 9a2dbdf..6bd3579 100644 --- a/Server/Hubs/Monopoly/EventHandlers/EndRoundEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/EndRoundEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class EndRoundEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/EndRoundFailEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/EndRoundFailEventHandler.cs similarity index 67% rename from Server/Hubs/Monopoly/EventHandlers/EndRoundFailEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/EndRoundFailEventHandler.cs index ade1e24..4424385 100644 --- a/Server/Hubs/Monopoly/EventHandlers/EndRoundFailEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/EndRoundFailEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class EndRoundFailEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/GameStartEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/GameStartEventHandler.cs similarity index 69% rename from Server/Hubs/Monopoly/EventHandlers/GameStartEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/GameStartEventHandler.cs index d11f0b3..05658bf 100644 --- a/Server/Hubs/Monopoly/EventHandlers/GameStartEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/GameStartEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class GameStartEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/HouseMaxEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/HouseMaxEventHandler.cs similarity index 71% rename from Server/Hubs/Monopoly/EventHandlers/HouseMaxEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/HouseMaxEventHandler.cs index 9a7bae2..04b271d 100644 --- a/Server/Hubs/Monopoly/EventHandlers/HouseMaxEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/HouseMaxEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class HouseMaxEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/MortgageDueEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/MortgageDueEventHandler.cs similarity index 69% rename from Server/Hubs/Monopoly/EventHandlers/MortgageDueEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/MortgageDueEventHandler.cs index 0bfd0a6..741a1aa 100644 --- a/Server/Hubs/Monopoly/EventHandlers/MortgageDueEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/MortgageDueEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class MortgageDueEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/OnlyOnePersonEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/OnlyOnePersonEventHandler.cs similarity index 67% rename from Server/Hubs/Monopoly/EventHandlers/OnlyOnePersonEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/OnlyOnePersonEventHandler.cs index da1393d..c1595c2 100644 --- a/Server/Hubs/Monopoly/EventHandlers/OnlyOnePersonEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/OnlyOnePersonEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class OnlyOnePersonEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/PlayerBidEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerBidEventHandler.cs similarity index 71% rename from Server/Hubs/Monopoly/EventHandlers/PlayerBidEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerBidEventHandler.cs index 64c3c21..70b7ee9 100644 --- a/Server/Hubs/Monopoly/EventHandlers/PlayerBidEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerBidEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class PlayerBidEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/PlayerBidFailEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerBidFailEventHandler.cs similarity index 73% rename from Server/Hubs/Monopoly/EventHandlers/PlayerBidFailEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerBidFailEventHandler.cs index f72b840..2eb2220 100644 --- a/Server/Hubs/Monopoly/EventHandlers/PlayerBidFailEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerBidFailEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class PlayerBidFailEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/PlayerBuildHouseEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerBuildHouseEventHandler.cs similarity index 74% rename from Server/Hubs/Monopoly/EventHandlers/PlayerBuildHouseEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerBuildHouseEventHandler.cs index 5fc6dc4..955e203 100644 --- a/Server/Hubs/Monopoly/EventHandlers/PlayerBuildHouseEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerBuildHouseEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class PlayerBuildHouseEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/PlayerBuyBlockEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerBuyBlockEventHandler.cs similarity index 70% rename from Server/Hubs/Monopoly/EventHandlers/PlayerBuyBlockEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerBuyBlockEventHandler.cs index 18eb596..dd11567 100644 --- a/Server/Hubs/Monopoly/EventHandlers/PlayerBuyBlockEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerBuyBlockEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class PlayerBuyBlockEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/PlayerBuyBlockInsufficientFundsEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerBuyBlockInsufficientFundsEventHandler.cs similarity index 75% rename from Server/Hubs/Monopoly/EventHandlers/PlayerBuyBlockInsufficientFundsEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerBuyBlockInsufficientFundsEventHandler.cs index af7a5fe..dabb703 100644 --- a/Server/Hubs/Monopoly/EventHandlers/PlayerBuyBlockInsufficientFundsEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerBuyBlockInsufficientFundsEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class PlayerBuyBlockInsufficientFundsEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/PlayerBuyBlockOccupiedByOtherPlayerEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerBuyBlockOccupiedByOtherPlayerEventHandler.cs similarity index 74% rename from Server/Hubs/Monopoly/EventHandlers/PlayerBuyBlockOccupiedByOtherPlayerEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerBuyBlockOccupiedByOtherPlayerEventHandler.cs index c777ec4..a90369d 100644 --- a/Server/Hubs/Monopoly/EventHandlers/PlayerBuyBlockOccupiedByOtherPlayerEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerBuyBlockOccupiedByOtherPlayerEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class PlayerBuyBlockOccupiedByOtherPlayerEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/PlayerCanBuildHouseEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerCanBuildHouseEventHandler.cs similarity index 73% rename from Server/Hubs/Monopoly/EventHandlers/PlayerCanBuildHouseEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerCanBuildHouseEventHandler.cs index 0c10ff7..acc24cc 100644 --- a/Server/Hubs/Monopoly/EventHandlers/PlayerCanBuildHouseEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerCanBuildHouseEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class PlayerCanBuildHouseEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/PlayerCanBuyLandEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerCanBuyLandEventHandler.cs similarity index 70% rename from Server/Hubs/Monopoly/EventHandlers/PlayerCanBuyLandEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerCanBuyLandEventHandler.cs index d5a2950..448ff6b 100644 --- a/Server/Hubs/Monopoly/EventHandlers/PlayerCanBuyLandEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerCanBuyLandEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class PlayerCanBuyLandEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase { diff --git a/Server/Hubs/Monopoly/EventHandlers/PlayerCannotBuildHouseEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerCannotBuildHouseEventHandler.cs similarity index 72% rename from Server/Hubs/Monopoly/EventHandlers/PlayerCannotBuildHouseEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerCannotBuildHouseEventHandler.cs index d82cea4..bef73d7 100644 --- a/Server/Hubs/Monopoly/EventHandlers/PlayerCannotBuildHouseEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerCannotBuildHouseEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class PlayerCannotBuildHouseEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/PlayerCannotMortgageEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerCannotMortgageEventHandler.cs similarity index 72% rename from Server/Hubs/Monopoly/EventHandlers/PlayerCannotMortgageEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerCannotMortgageEventHandler.cs index 5e9cb9f..ecc556b 100644 --- a/Server/Hubs/Monopoly/EventHandlers/PlayerCannotMortgageEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerCannotMortgageEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class PlayerCannotMortgageEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/PlayerChooseDirectionEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerChooseDirectionEventHandler.cs similarity index 71% rename from Server/Hubs/Monopoly/EventHandlers/PlayerChooseDirectionEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerChooseDirectionEventHandler.cs index 5fd5f86..c38d59b 100644 --- a/Server/Hubs/Monopoly/EventHandlers/PlayerChooseDirectionEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerChooseDirectionEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class PlayerChooseDirectionEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/PlayerDoesntNeedToPayTollEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerDoesntNeedToPayTollEventHandler.cs similarity index 71% rename from Server/Hubs/Monopoly/EventHandlers/PlayerDoesntNeedToPayTollEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerDoesntNeedToPayTollEventHandler.cs index d97b9c3..70193b3 100644 --- a/Server/Hubs/Monopoly/EventHandlers/PlayerDoesntNeedToPayTollEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerDoesntNeedToPayTollEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class PlayerDoesntNeedToPayTollEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/PlayerMortgageEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerMortgageEventHandler.cs similarity index 72% rename from Server/Hubs/Monopoly/EventHandlers/PlayerMortgageEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerMortgageEventHandler.cs index a33c73a..feaafe0 100644 --- a/Server/Hubs/Monopoly/EventHandlers/PlayerMortgageEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerMortgageEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class PlayerMortgageEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/PlayerNeedToChooseDirectionEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerNeedToChooseDirectionEventHandler.cs similarity index 73% rename from Server/Hubs/Monopoly/EventHandlers/PlayerNeedToChooseDirectionEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerNeedToChooseDirectionEventHandler.cs index 2bbbb8a..2375899 100644 --- a/Server/Hubs/Monopoly/EventHandlers/PlayerNeedToChooseDirectionEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerNeedToChooseDirectionEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class PlayerNeedToChooseDirectionEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/PlayerNeedsToPayTollEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerNeedsToPayTollEventHandler.cs similarity index 65% rename from Server/Hubs/Monopoly/EventHandlers/PlayerNeedsToPayTollEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerNeedsToPayTollEventHandler.cs index c390e1a..f7ceefe 100644 --- a/Server/Hubs/Monopoly/EventHandlers/PlayerNeedsToPayTollEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerNeedsToPayTollEventHandler.cs @@ -1,9 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; +using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class PlayerNeedsToPayTollEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/PlayerPayTollEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerPayTollEventHandler.cs similarity index 72% rename from Server/Hubs/Monopoly/EventHandlers/PlayerPayTollEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerPayTollEventHandler.cs index 14b0957..2932d95 100644 --- a/Server/Hubs/Monopoly/EventHandlers/PlayerPayTollEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerPayTollEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class PlayerPayTollEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/PlayerRedeemEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerRedeemEventHandler.cs similarity index 70% rename from Server/Hubs/Monopoly/EventHandlers/PlayerRedeemEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerRedeemEventHandler.cs index 51ca9ec..35e6c09 100644 --- a/Server/Hubs/Monopoly/EventHandlers/PlayerRedeemEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerRedeemEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class PlayerRedeemEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/PlayerRollDiceEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerRollDiceEventHandler.cs similarity index 72% rename from Server/Hubs/Monopoly/EventHandlers/PlayerRollDiceEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerRollDiceEventHandler.cs index 8f8a8d8..7899823 100644 --- a/Server/Hubs/Monopoly/EventHandlers/PlayerRollDiceEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerRollDiceEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using PlayerRolledDiceEventArgs = SharedLibrary.ResponseArgs.Monopoly.PlayerRolledDiceEventArgs; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class PlayerRollDiceEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/PlayerTooPoorToBidEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerTooPoorToBidEventHandler.cs similarity index 74% rename from Server/Hubs/Monopoly/EventHandlers/PlayerTooPoorToBidEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerTooPoorToBidEventHandler.cs index 448307a..ac1aec0 100644 --- a/Server/Hubs/Monopoly/EventHandlers/PlayerTooPoorToBidEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerTooPoorToBidEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class PlayerTooPoorToBidEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/PlayerTooPoorToPayTollEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerTooPoorToPayTollEventHandler.cs similarity index 72% rename from Server/Hubs/Monopoly/EventHandlers/PlayerTooPoorToPayTollEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerTooPoorToPayTollEventHandler.cs index 4a5d369..d0868f1 100644 --- a/Server/Hubs/Monopoly/EventHandlers/PlayerTooPoorToPayTollEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerTooPoorToPayTollEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class PlayerTooPoorToPayTollEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/PlayerTooPoorToRedeemEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerTooPoorToRedeemEventHandler.cs similarity index 73% rename from Server/Hubs/Monopoly/EventHandlers/PlayerTooPoorToRedeemEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerTooPoorToRedeemEventHandler.cs index a649a72..44ff1a5 100644 --- a/Server/Hubs/Monopoly/EventHandlers/PlayerTooPoorToRedeemEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/PlayerTooPoorToRedeemEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class PlayerTooPoorToRedeemEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/SomePlayersPreparingEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/SomePlayersPreparingEventHandler.cs similarity index 70% rename from Server/Hubs/Monopoly/EventHandlers/SomePlayersPreparingEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/SomePlayersPreparingEventHandler.cs index b722fbe..ad2b7d5 100644 --- a/Server/Hubs/Monopoly/EventHandlers/SomePlayersPreparingEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/SomePlayersPreparingEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class SomePlayersPreparingEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/SuspendRoundEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/SuspendRoundEventHandler.cs similarity index 69% rename from Server/Hubs/Monopoly/EventHandlers/SuspendRoundEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/SuspendRoundEventHandler.cs index 65c0133..7c9917f 100644 --- a/Server/Hubs/Monopoly/EventHandlers/SuspendRoundEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/SuspendRoundEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class SuspendRoundEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/Monopoly/EventHandlers/ThroughStartEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/ThroughStartEventHandler.cs similarity index 70% rename from Server/Hubs/Monopoly/EventHandlers/ThroughStartEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/ThroughStartEventHandler.cs index 7f96ba9..782890b 100644 --- a/Server/Hubs/Monopoly/EventHandlers/ThroughStartEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/EventHandlers/ThroughStartEventHandler.cs @@ -1,10 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; -using Server.Common; +using Microsoft.AspNetCore.SignalR; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -namespace Server.Hubs.Monopoly.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly.EventHandlers; public class ThroughStartEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase { diff --git a/Server/Hubs/Monopoly/MonopolyHub.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/MonopolyHub.cs similarity index 95% rename from Server/Hubs/Monopoly/MonopolyHub.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/MonopolyHub.cs index cb33476..d8c76a7 100644 --- a/Server/Hubs/Monopoly/MonopolyHub.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/Monopoly/MonopolyHub.cs @@ -1,14 +1,13 @@ -using System.Security.Claims; -using Application.Common; -using Application.Usecases; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; -using Server.Presenters; +using Monopoly.ApplicationLayer.Application.Common; +using Monopoly.ApplicationLayer.Application.Usecases; +using Monopoly.InterfaceAdapterLayer.Server.Presenters; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; using SharedLibrary.ResponseArgs.ReadyRoom; -namespace Server.Hubs.Monopoly; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly; [Authorize] public class MonopolyHub(ICommandRepository repository) : Hub diff --git a/Server/Hubs/ReadyRoom/EventHandlers/GameStartedEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/ReadyRoom/EventHandlers/GameStartedEventHandler.cs similarity index 78% rename from Server/Hubs/ReadyRoom/EventHandlers/GameStartedEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/ReadyRoom/EventHandlers/GameStartedEventHandler.cs index ea23cbf..cd4bfdf 100644 --- a/Server/Hubs/ReadyRoom/EventHandlers/GameStartedEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/ReadyRoom/EventHandlers/GameStartedEventHandler.cs @@ -1,10 +1,10 @@ using Microsoft.AspNetCore.SignalR; using Monopoly.DomainLayer.ReadyRoom.Events; -using Server.Common; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.ReadyRoom; -namespace Server.Hubs.ReadyRoom.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.ReadyRoom.EventHandlers; public sealed class GameStartedEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/ReadyRoom/EventHandlers/PlayerJoinReadyRoomEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/ReadyRoom/EventHandlers/PlayerJoinReadyRoomEventHandler.cs similarity index 79% rename from Server/Hubs/ReadyRoom/EventHandlers/PlayerJoinReadyRoomEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/ReadyRoom/EventHandlers/PlayerJoinReadyRoomEventHandler.cs index 85e5dec..b8665f5 100644 --- a/Server/Hubs/ReadyRoom/EventHandlers/PlayerJoinReadyRoomEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/ReadyRoom/EventHandlers/PlayerJoinReadyRoomEventHandler.cs @@ -1,10 +1,10 @@ using Microsoft.AspNetCore.SignalR; using Monopoly.DomainLayer.ReadyRoom.Events; -using Server.Common; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.ReadyRoom; -namespace Server.Hubs.ReadyRoom.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.ReadyRoom.EventHandlers; public sealed class PlayerJoinReadyRoomEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase { diff --git a/Server/Hubs/ReadyRoom/EventHandlers/PlayerReadyEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/ReadyRoom/EventHandlers/PlayerReadyEventHandler.cs similarity index 79% rename from Server/Hubs/ReadyRoom/EventHandlers/PlayerReadyEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/ReadyRoom/EventHandlers/PlayerReadyEventHandler.cs index 647be7b..8d4c777 100644 --- a/Server/Hubs/ReadyRoom/EventHandlers/PlayerReadyEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/ReadyRoom/EventHandlers/PlayerReadyEventHandler.cs @@ -1,10 +1,10 @@ using Microsoft.AspNetCore.SignalR; using Monopoly.DomainLayer.ReadyRoom.Events; -using Server.Common; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.ReadyRoom; -namespace Server.Hubs.ReadyRoom.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.ReadyRoom.EventHandlers; public sealed class PlayerReadyEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/ReadyRoom/EventHandlers/PlayerSelectLocationEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/ReadyRoom/EventHandlers/PlayerSelectLocationEventHandler.cs similarity index 80% rename from Server/Hubs/ReadyRoom/EventHandlers/PlayerSelectLocationEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/ReadyRoom/EventHandlers/PlayerSelectLocationEventHandler.cs index d99e142..47de8f6 100644 --- a/Server/Hubs/ReadyRoom/EventHandlers/PlayerSelectLocationEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/ReadyRoom/EventHandlers/PlayerSelectLocationEventHandler.cs @@ -1,10 +1,10 @@ using Microsoft.AspNetCore.SignalR; using Monopoly.DomainLayer.ReadyRoom.Events; -using Server.Common; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.ReadyRoom; -namespace Server.Hubs.ReadyRoom.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.ReadyRoom.EventHandlers; public class PlayerSelectLocationEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/ReadyRoom/EventHandlers/PlayerSelectRoleEventHandler.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/ReadyRoom/EventHandlers/PlayerSelectRoleEventHandler.cs similarity index 73% rename from Server/Hubs/ReadyRoom/EventHandlers/PlayerSelectRoleEventHandler.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/ReadyRoom/EventHandlers/PlayerSelectRoleEventHandler.cs index 7b8ffdf..4372ff1 100644 --- a/Server/Hubs/ReadyRoom/EventHandlers/PlayerSelectRoleEventHandler.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/ReadyRoom/EventHandlers/PlayerSelectRoleEventHandler.cs @@ -1,11 +1,10 @@ -using Domain.Events; -using Microsoft.AspNetCore.SignalR; +using Microsoft.AspNetCore.SignalR; using Monopoly.DomainLayer.ReadyRoom.Events; -using Server.Common; +using Monopoly.InterfaceAdapterLayer.Server.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.ReadyRoom; -namespace Server.Hubs.ReadyRoom.EventHandlers; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.ReadyRoom.EventHandlers; public class PlayerSelectRoleEventHandler(IHubContext hubContext) : MonopolyEventHandlerBase diff --git a/Server/Hubs/ReadyRoom/ReadyRoomHub.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/ReadyRoom/ReadyRoomHub.cs similarity index 89% rename from Server/Hubs/ReadyRoom/ReadyRoomHub.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/ReadyRoom/ReadyRoomHub.cs index 3f3d784..cc6ec24 100644 --- a/Server/Hubs/ReadyRoom/ReadyRoomHub.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Hubs/ReadyRoom/ReadyRoomHub.cs @@ -1,13 +1,12 @@ -using System.Security.Claims; -using Application.Queries; -using Application.Usecases.ReadyRoom; -using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; -using Server.Presenters; +using Monopoly.ApplicationLayer.Application.Queries; +using Monopoly.ApplicationLayer.Application.Usecases.ReadyRoom; +using Monopoly.InterfaceAdapterLayer.Server.Presenters; using SharedLibrary; using SharedLibrary.ResponseArgs.ReadyRoom.Models; -namespace Server.Hubs.ReadyRoom; +namespace Monopoly.InterfaceAdapterLayer.Server.Hubs.ReadyRoom; [Authorize] public sealed class ReadyRoomHub : Hub diff --git a/Server/Maps/1.json b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Maps/1.json similarity index 100% rename from Server/Maps/1.json rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Maps/1.json diff --git a/Server/Server.csproj b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Monopoly.InterfaceAdapterLayer.Server.csproj similarity index 72% rename from Server/Server.csproj rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Monopoly.InterfaceAdapterLayer.Server.csproj index a9a4b7e..68873b2 100644 --- a/Server/Server.csproj +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Monopoly.InterfaceAdapterLayer.Server.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/Server/MonopolyEventBus.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/MonopolyEventBus.cs similarity index 83% rename from Server/MonopolyEventBus.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/MonopolyEventBus.cs index 082579d..295d559 100644 --- a/Server/MonopolyEventBus.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/MonopolyEventBus.cs @@ -1,8 +1,8 @@ -using Application.Common; +using Monopoly.ApplicationLayer.Application.Common; using Monopoly.DomainLayer.Common; -using Server.Common; +using Monopoly.InterfaceAdapterLayer.Server.Common; -namespace Server; +namespace Monopoly.InterfaceAdapterLayer.Server; internal class MonopolyEventBus(IEnumerable handlers) : IEventBus { diff --git a/Server/PlatformJwtEvents.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/PlatformJwtEvents.cs similarity index 85% rename from Server/PlatformJwtEvents.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/PlatformJwtEvents.cs index 19538c8..aef4ad5 100644 --- a/Server/PlatformJwtEvents.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/PlatformJwtEvents.cs @@ -1,9 +1,9 @@ -using Microsoft.AspNetCore.Authentication.JwtBearer; +using System.Security.Claims; +using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.IdentityModel.JsonWebTokens; -using Server.Services; -using System.Security.Claims; +using Monopoly.InterfaceAdapterLayer.Server.Services; -namespace Server; +namespace Monopoly.InterfaceAdapterLayer.Server; public class PlatformJwtEvents : JwtBearerEvents { diff --git a/Server/Presenters/DefaultPresenter.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Presenters/DefaultPresenter.cs similarity index 69% rename from Server/Presenters/DefaultPresenter.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Presenters/DefaultPresenter.cs index 3349386..2ab29cb 100644 --- a/Server/Presenters/DefaultPresenter.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Presenters/DefaultPresenter.cs @@ -1,6 +1,6 @@ -using Application.Common; +using Monopoly.ApplicationLayer.Application.Common; -namespace Server.Presenters; +namespace Monopoly.InterfaceAdapterLayer.Server.Presenters; public class DefaultPresenter : IPresenter where T : class { diff --git a/Server/Presenters/NullPresenter.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Presenters/NullPresenter.cs similarity index 70% rename from Server/Presenters/NullPresenter.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Presenters/NullPresenter.cs index 454fdad..1e22980 100644 --- a/Server/Presenters/NullPresenter.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Presenters/NullPresenter.cs @@ -1,6 +1,6 @@ -using Application.Common; +using Monopoly.ApplicationLayer.Application.Common; -namespace Server.Presenters; +namespace Monopoly.InterfaceAdapterLayer.Server.Presenters; public sealed class NullPresenter : IPresenter where T : Response { diff --git a/Server/Presenters/ReadyRoomInfosValueReturningPresenter.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Presenters/ReadyRoomInfosValueReturningPresenter.cs similarity index 95% rename from Server/Presenters/ReadyRoomInfosValueReturningPresenter.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Presenters/ReadyRoomInfosValueReturningPresenter.cs index cbbcdaf..364b1e3 100644 --- a/Server/Presenters/ReadyRoomInfosValueReturningPresenter.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Presenters/ReadyRoomInfosValueReturningPresenter.cs @@ -1,6 +1,4 @@ -using System.Collections.Immutable; -using Application.Queries; -using Monopoly.DomainLayer.ReadyRoom; +using Monopoly.ApplicationLayer.Application.Queries; using SharedLibrary.ResponseArgs.ReadyRoom.Models; using Player = SharedLibrary.ResponseArgs.ReadyRoom.Models.Player; @@ -9,7 +7,7 @@ using ServerRoleEnum = SharedLibrary.ResponseArgs.ReadyRoom.Models.RoleEnum; -namespace Server.Presenters; +namespace Monopoly.InterfaceAdapterLayer.Server.Presenters; public class ReadyRoomInfosValueReturningPresenter : ValueReturningPresenter { diff --git a/Server/Presenters/SignalrDefaultPresenter.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Presenters/SignalrDefaultPresenter.cs similarity index 75% rename from Server/Presenters/SignalrDefaultPresenter.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Presenters/SignalrDefaultPresenter.cs index e6d6991..b2ba520 100644 --- a/Server/Presenters/SignalrDefaultPresenter.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Presenters/SignalrDefaultPresenter.cs @@ -1,7 +1,7 @@ -using Application.Common; +using Monopoly.ApplicationLayer.Application.Common; using Monopoly.DomainLayer.Common; -namespace Server.Presenters; +namespace Monopoly.InterfaceAdapterLayer.Server.Presenters; public class SignalrDefaultPresenter(IEventBus eventBus) : IPresenter where TResponse : CommandResponse diff --git a/Server/Presenters/ValueReturningPresenter.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Presenters/ValueReturningPresenter.cs similarity index 90% rename from Server/Presenters/ValueReturningPresenter.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Presenters/ValueReturningPresenter.cs index 7c58d4a..ea63484 100644 --- a/Server/Presenters/ValueReturningPresenter.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Presenters/ValueReturningPresenter.cs @@ -1,6 +1,6 @@ -using Application.Common; +using Monopoly.ApplicationLayer.Application.Common; -namespace Server.Presenters; +namespace Monopoly.InterfaceAdapterLayer.Server.Presenters; public abstract class ValueReturningPresenter : IPresenter { diff --git a/Server/Program.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Program.cs similarity index 92% rename from Server/Program.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Program.cs index eddcfaf..4c18991 100644 --- a/Server/Program.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Program.cs @@ -1,21 +1,21 @@ using System.IdentityModel.Tokens.Jwt; -using Application; -using Application.Common; using Microsoft.AspNetCore.Authentication.JwtBearer; -using Server; -using Server.Services; using SharedLibrary.MonopolyMap; using System.Security.Claims; using System.Text; -using Application.Usecases.ReadyRoom; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; using Microsoft.IdentityModel.Tokens; -using Server.Configurations; -using Server.DataModels; -using Server.Hubs.Monopoly; -using Server.Hubs.ReadyRoom; -using Server.Presenters; +using Monopoly.ApplicationLayer.Application; +using Monopoly.ApplicationLayer.Application.Common; +using Monopoly.ApplicationLayer.Application.Usecases.ReadyRoom; +using Monopoly.InterfaceAdapterLayer.Server; +using Monopoly.InterfaceAdapterLayer.Server.Configurations; +using Monopoly.InterfaceAdapterLayer.Server.DataModels; +using Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly; +using Monopoly.InterfaceAdapterLayer.Server.Hubs.ReadyRoom; +using Monopoly.InterfaceAdapterLayer.Server.Presenters; +using Monopoly.InterfaceAdapterLayer.Server.Services; var builder = WebApplication.CreateBuilder(args); diff --git a/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Properties/AssemblyInfos.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Properties/AssemblyInfos.cs new file mode 100644 index 0000000..360e485 --- /dev/null +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Properties/AssemblyInfos.cs @@ -0,0 +1,3 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Monopoly.InterfaceAdapterLayer.Server.Tests")] \ No newline at end of file diff --git a/Server/Properties/launchSettings.json b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Properties/launchSettings.json similarity index 100% rename from Server/Properties/launchSettings.json rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Properties/launchSettings.json diff --git a/Server/Repositories/GameNotFoundException.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Repositories/GameNotFoundException.cs similarity index 75% rename from Server/Repositories/GameNotFoundException.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Repositories/GameNotFoundException.cs index 5d3e92a..c5c7ad9 100644 --- a/Server/Repositories/GameNotFoundException.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Repositories/GameNotFoundException.cs @@ -1,4 +1,4 @@ -namespace Server.Repositories +namespace Monopoly.InterfaceAdapterLayer.Server.Repositories { [Serializable] internal class GameNotFoundException : Exception diff --git a/Server/Repositories/InMemoryReadyRoomRepository.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Repositories/InMemoryReadyRoomRepository.cs similarity index 81% rename from Server/Repositories/InMemoryReadyRoomRepository.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Repositories/InMemoryReadyRoomRepository.cs index afb9233..05ad577 100644 --- a/Server/Repositories/InMemoryReadyRoomRepository.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Repositories/InMemoryReadyRoomRepository.cs @@ -1,7 +1,7 @@ -using Application.Usecases.ReadyRoom; +using Monopoly.ApplicationLayer.Application.Usecases.ReadyRoom; using Monopoly.DomainLayer.ReadyRoom; -namespace Server.Repositories; +namespace Monopoly.InterfaceAdapterLayer.Server.Repositories; public class InMemoryReadyRoomRepository : IReadyRoomRepository { diff --git a/Server/Repositories/InMemoryRepository.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Repositories/InMemoryRepository.cs similarity index 67% rename from Server/Repositories/InMemoryRepository.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Repositories/InMemoryRepository.cs index b71985e..07a2ac9 100644 --- a/Server/Repositories/InMemoryRepository.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Repositories/InMemoryRepository.cs @@ -1,12 +1,13 @@ -using Application.Common; +using Monopoly.ApplicationLayer.Application.Common; +using Monopoly.ApplicationLayer.Application.DataModels; -namespace Server.Repositories; +namespace Monopoly.InterfaceAdapterLayer.Server.Repositories; public class InMemoryRepository : ICommandRepository, IQueryRepository { - private readonly Dictionary games = new(); + private readonly Dictionary games = new(); - public Application.DataModels.MonopolyDataModel FindGameById(string id) + public MonopolyDataModel FindGameById(string id) { games.TryGetValue(id, out var game); if (game == null) @@ -27,7 +28,7 @@ public bool IsExist(string id) return games.ContainsKey(id); } - public string Save(Application.DataModels.MonopolyDataModel monopolyDataModel) + public string Save(MonopolyDataModel monopolyDataModel) { var id = GetGameId(monopolyDataModel.Id); var game = monopolyDataModel with { Id = id }; diff --git a/Server/Services/DevelopmentPlatformService.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Services/DevelopmentPlatformService.cs similarity index 91% rename from Server/Services/DevelopmentPlatformService.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Services/DevelopmentPlatformService.cs index 4c06d93..24fbe43 100644 --- a/Server/Services/DevelopmentPlatformService.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Services/DevelopmentPlatformService.cs @@ -1,6 +1,6 @@ -using Server.DataModels; +using Monopoly.InterfaceAdapterLayer.Server.DataModels; -namespace Server.Services; +namespace Monopoly.InterfaceAdapterLayer.Server.Services; public class DevelopmentPlatformService(IConfiguration configuration) : IPlatformService { diff --git a/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Services/IPlatformService.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Services/IPlatformService.cs new file mode 100644 index 0000000..5fb4ea0 --- /dev/null +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Services/IPlatformService.cs @@ -0,0 +1,8 @@ +using Monopoly.InterfaceAdapterLayer.Server.DataModels; + +namespace Monopoly.InterfaceAdapterLayer.Server.Services; + +public interface IPlatformService +{ + public Task GetUserInfo(string tokenString); +} \ No newline at end of file diff --git a/Server/Services/PlatformService.cs b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Services/PlatformService.cs similarity index 82% rename from Server/Services/PlatformService.cs rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Services/PlatformService.cs index d13da06..6d62794 100644 --- a/Server/Services/PlatformService.cs +++ b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/Services/PlatformService.cs @@ -1,10 +1,10 @@ -using Microsoft.AspNetCore.Authentication.JwtBearer; -using Microsoft.Extensions.Options; -using Server.DataModels; -using System.Net; +using System.Net; using System.Net.Http.Headers; +using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.Extensions.Options; +using Monopoly.InterfaceAdapterLayer.Server.DataModels; -namespace Server.Services; +namespace Monopoly.InterfaceAdapterLayer.Server.Services; public class PlatformService(IOptionsMonitor options) : IPlatformService { diff --git a/Server/appsettings.Development.json b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/appsettings.Development.json similarity index 100% rename from Server/appsettings.Development.json rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/appsettings.Development.json diff --git a/Server/appsettings.json b/InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/appsettings.json similarity index 100% rename from Server/appsettings.json rename to InterfaceAdapterLayer/Monopoly.InterfaceAdapterLayer.Server/appsettings.json diff --git a/Monopoly.Web/Monopoly.Web.csproj b/Monopoly.Web/Monopoly.Web.csproj deleted file mode 100644 index abf4ff6..0000000 --- a/Monopoly.Web/Monopoly.Web.csproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - net8.0 - enable - enable - Client - - - - - - - - - - - - - - - - - - - - diff --git a/Monopoly.sln b/Monopoly.sln index b3024be..254d970 100644 --- a/Monopoly.sln +++ b/Monopoly.sln @@ -3,40 +3,41 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Domain", "Domain\Domain.csproj", "{928580F2-D3C6-421A-AD82-1835536FD353}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{7DC91B93-4273-41C6-B504-B72DA0617ACC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "Server\Server.csproj", "{E5C927B5-EE0B-4EE4-8A30-D5B9871EE4A3}" - ProjectSection(ProjectDependencies) = postProject - {4BBE8D55-D8DD-4A8B-B6D7-F26626CB33F1} = {4BBE8D55-D8DD-4A8B-B6D7-F26626CB33F1} - EndProjectSection +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedLibrary", "SharedLibrary\SharedLibrary.csproj", "{4BBE8D55-D8DD-4A8B-B6D7-F26626CB33F1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Application", "Application\Application.csproj", "{DA87B014-FE7F-412E-A2B3-1EEF89731F71}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Clients", "Clients", "{95BDEC7B-E156-4D7B-914E-D4E1E7B3A35B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DomainTests", "Test\DomainTests\DomainTests.csproj", "{99A640BE-CB0B-4822-BF61-B2FAE2FFB4D7}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DomainLayer", "DomainLayer", "{00742C60-221D-43D5-AF9F-AE7F74B5C051}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerTests", "Test\ServerTests\ServerTests.csproj", "{0E459B0A-840A-4C8E-A8CC-B6225D8C4F3F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monopoly.DomainLayer.ReadyRoom", "DomainLayer\Monopoly.DomainLayer.ReadyRoom\Monopoly.DomainLayer.ReadyRoom.csproj", "{0E053218-D0CE-4A4B-8944-9BFF9AC686A4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monopoly.Web", "Monopoly.Web\Monopoly.Web.csproj", "{0542FC09-B1F6-47DD-B99B-1DA85285CA16}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monopoly.DomainLayer.ReadyRoom.Tests", "tests\Monopoly.DomainLayer.ReadyRoom.Tests\Monopoly.DomainLayer.ReadyRoom.Tests.csproj", "{23BDDFD4-4D5C-4027-9F82-34AA64307451}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedLibrary", "SharedLibrary\SharedLibrary.csproj", "{4BBE8D55-D8DD-4A8B-B6D7-F26626CB33F1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monopoly.DomainLayer.Common", "DomainLayer\Monopoly.DomainLayer.Common\Monopoly.DomainLayer.Common.csproj", "{3E987E8E-07AB-4EFF-8E90-C27908DE5467}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Clients", "Clients", "{95BDEC7B-E156-4D7B-914E-D4E1E7B3A35B}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApplicationLayer", "ApplicationLayer", "{1DFB92FC-0E7E-449B-B1F4-D41031759A75}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monopoly.Web.Generators", "Monopoly.Web.Generators\Monopoly.Web.Generators.csproj", "{71F9F361-833F-4483-B179-E10851D12069}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "InterfaceAdapterLayer", "InterfaceAdapterLayer", "{AFEEDDF7-54D1-4D17-AF95-1E8F7DE82B8F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monopoly.Web.Tests", "Test\Monopoly.Web.Tests\Monopoly.Web.Tests.csproj", "{9C16112D-07EB-4E4D-A926-0E737899E6A6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monopoly.InterfaceAdapterLayer.Server", "InterfaceAdapterLayer\Monopoly.InterfaceAdapterLayer.Server\Monopoly.InterfaceAdapterLayer.Server.csproj", "{86AC12CD-F665-434A-8AEF-77E05A74D63D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DomainLayer", "DomainLayer", "{00742C60-221D-43D5-AF9F-AE7F74B5C051}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monopoly.ApplicationLayer.Application", "ApplicationLayer\Monopoly.ApplicationLayer.Application\Monopoly.ApplicationLayer.Application.csproj", "{00AD9007-D3AD-4805-A871-DFCB55475E5A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monopoly.DomainLayer.ReadyRoom", "DomainLayer\Monopoly.DomainLayer.ReadyRoom\Monopoly.DomainLayer.ReadyRoom.csproj", "{0E053218-D0CE-4A4B-8944-9BFF9AC686A4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monopoly.Clients.Web", "Clients\Monopoly.Clients.Web\Monopoly.Clients.Web.csproj", "{916494E7-0AE4-4128-B8B6-3525AEBDC871}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monopoly.DomainLayer.ReadyRoom.Tests", "tests\Monopoly.DomainLayer.ReadyRoom.Tests\Monopoly.DomainLayer.ReadyRoom.Tests.csproj", "{23BDDFD4-4D5C-4027-9F82-34AA64307451}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monopoly.Clients.Web.Generators", "Clients\Monopoly.Clients.Web.Generators\Monopoly.Clients.Web.Generators.csproj", "{3C92B49D-444D-4254-ACB1-1FCB9805C221}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monopoly.DomainLayer.Common", "DomainLayer\Monopoly.DomainLayer.Common\Monopoly.DomainLayer.Common.csproj", "{3E987E8E-07AB-4EFF-8E90-C27908DE5467}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monopoly.DomainLayer.Domain", "DomainLayer\Monopoly.DomainLayer.Domain\Monopoly.DomainLayer.Domain.csproj", "{4806E56C-85E9-499D-8D5F-5C217E02C61A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monopoly.Clients.Web.Tests", "tests\Monopoly.Clients.Web.Tests\Monopoly.Clients.Web.Tests.csproj", "{6B625556-5588-4380-B5DA-7C4B1E4C7674}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monopoly.DomainLayer.Domain.Tests", "tests\Monopoly.DomainLayer.Domain.Tests\Monopoly.DomainLayer.Domain.Tests.csproj", "{FFC3A334-9F16-4E2E-B904-0E34641283FA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monopoly.InterfaceAdapterLayer.Server.Tests", "tests\Monopoly.InterfaceAdapterLayer.Server.Tests\Monopoly.InterfaceAdapterLayer.Server.Tests.csproj", "{45ACED5F-BC77-4775-8C45-98F0BD56A1F1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monopoly.InterfaceAdapters.Server.Tests.Generators", "tests\Monopoly.InterfaceAdapters.Server.Tests.Generators\Monopoly.InterfaceAdapters.Server.Tests.Generators.csproj", "{961AF1B5-BC7C-4935-BDB0-111058445EA9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monopoly.InterfaceAdapterLayer.Server.Tests.Generators", "tests\Monopoly.InterfaceAdapterLayer.Server.Tests.Generators\Monopoly.InterfaceAdapterLayer.Server.Tests.Generators.csproj", "{5C3DE988-43FB-40E2-AD6F-935BEF5BD7C5}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -44,42 +45,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {928580F2-D3C6-421A-AD82-1835536FD353}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {928580F2-D3C6-421A-AD82-1835536FD353}.Debug|Any CPU.Build.0 = Debug|Any CPU - {928580F2-D3C6-421A-AD82-1835536FD353}.Release|Any CPU.ActiveCfg = Release|Any CPU - {928580F2-D3C6-421A-AD82-1835536FD353}.Release|Any CPU.Build.0 = Release|Any CPU - {E5C927B5-EE0B-4EE4-8A30-D5B9871EE4A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5C927B5-EE0B-4EE4-8A30-D5B9871EE4A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5C927B5-EE0B-4EE4-8A30-D5B9871EE4A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5C927B5-EE0B-4EE4-8A30-D5B9871EE4A3}.Release|Any CPU.Build.0 = Release|Any CPU - {DA87B014-FE7F-412E-A2B3-1EEF89731F71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA87B014-FE7F-412E-A2B3-1EEF89731F71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA87B014-FE7F-412E-A2B3-1EEF89731F71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA87B014-FE7F-412E-A2B3-1EEF89731F71}.Release|Any CPU.Build.0 = Release|Any CPU - {99A640BE-CB0B-4822-BF61-B2FAE2FFB4D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99A640BE-CB0B-4822-BF61-B2FAE2FFB4D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99A640BE-CB0B-4822-BF61-B2FAE2FFB4D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99A640BE-CB0B-4822-BF61-B2FAE2FFB4D7}.Release|Any CPU.Build.0 = Release|Any CPU - {0E459B0A-840A-4C8E-A8CC-B6225D8C4F3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E459B0A-840A-4C8E-A8CC-B6225D8C4F3F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E459B0A-840A-4C8E-A8CC-B6225D8C4F3F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E459B0A-840A-4C8E-A8CC-B6225D8C4F3F}.Release|Any CPU.Build.0 = Release|Any CPU - {0542FC09-B1F6-47DD-B99B-1DA85285CA16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0542FC09-B1F6-47DD-B99B-1DA85285CA16}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0542FC09-B1F6-47DD-B99B-1DA85285CA16}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0542FC09-B1F6-47DD-B99B-1DA85285CA16}.Release|Any CPU.Build.0 = Release|Any CPU {4BBE8D55-D8DD-4A8B-B6D7-F26626CB33F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4BBE8D55-D8DD-4A8B-B6D7-F26626CB33F1}.Debug|Any CPU.Build.0 = Debug|Any CPU {4BBE8D55-D8DD-4A8B-B6D7-F26626CB33F1}.Release|Any CPU.ActiveCfg = Release|Any CPU {4BBE8D55-D8DD-4A8B-B6D7-F26626CB33F1}.Release|Any CPU.Build.0 = Release|Any CPU - {71F9F361-833F-4483-B179-E10851D12069}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71F9F361-833F-4483-B179-E10851D12069}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71F9F361-833F-4483-B179-E10851D12069}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71F9F361-833F-4483-B179-E10851D12069}.Release|Any CPU.Build.0 = Release|Any CPU - {9C16112D-07EB-4E4D-A926-0E737899E6A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C16112D-07EB-4E4D-A926-0E737899E6A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C16112D-07EB-4E4D-A926-0E737899E6A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C16112D-07EB-4E4D-A926-0E737899E6A6}.Release|Any CPU.Build.0 = Release|Any CPU {0E053218-D0CE-4A4B-8944-9BFF9AC686A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0E053218-D0CE-4A4B-8944-9BFF9AC686A4}.Debug|Any CPU.Build.0 = Debug|Any CPU {0E053218-D0CE-4A4B-8944-9BFF9AC686A4}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -92,24 +61,59 @@ Global {3E987E8E-07AB-4EFF-8E90-C27908DE5467}.Debug|Any CPU.Build.0 = Debug|Any CPU {3E987E8E-07AB-4EFF-8E90-C27908DE5467}.Release|Any CPU.ActiveCfg = Release|Any CPU {3E987E8E-07AB-4EFF-8E90-C27908DE5467}.Release|Any CPU.Build.0 = Release|Any CPU - {961AF1B5-BC7C-4935-BDB0-111058445EA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {961AF1B5-BC7C-4935-BDB0-111058445EA9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {961AF1B5-BC7C-4935-BDB0-111058445EA9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {961AF1B5-BC7C-4935-BDB0-111058445EA9}.Release|Any CPU.Build.0 = Release|Any CPU + {86AC12CD-F665-434A-8AEF-77E05A74D63D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {86AC12CD-F665-434A-8AEF-77E05A74D63D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {86AC12CD-F665-434A-8AEF-77E05A74D63D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {86AC12CD-F665-434A-8AEF-77E05A74D63D}.Release|Any CPU.Build.0 = Release|Any CPU + {00AD9007-D3AD-4805-A871-DFCB55475E5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {00AD9007-D3AD-4805-A871-DFCB55475E5A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {00AD9007-D3AD-4805-A871-DFCB55475E5A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {00AD9007-D3AD-4805-A871-DFCB55475E5A}.Release|Any CPU.Build.0 = Release|Any CPU + {916494E7-0AE4-4128-B8B6-3525AEBDC871}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {916494E7-0AE4-4128-B8B6-3525AEBDC871}.Debug|Any CPU.Build.0 = Debug|Any CPU + {916494E7-0AE4-4128-B8B6-3525AEBDC871}.Release|Any CPU.ActiveCfg = Release|Any CPU + {916494E7-0AE4-4128-B8B6-3525AEBDC871}.Release|Any CPU.Build.0 = Release|Any CPU + {3C92B49D-444D-4254-ACB1-1FCB9805C221}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3C92B49D-444D-4254-ACB1-1FCB9805C221}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3C92B49D-444D-4254-ACB1-1FCB9805C221}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3C92B49D-444D-4254-ACB1-1FCB9805C221}.Release|Any CPU.Build.0 = Release|Any CPU + {4806E56C-85E9-499D-8D5F-5C217E02C61A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4806E56C-85E9-499D-8D5F-5C217E02C61A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4806E56C-85E9-499D-8D5F-5C217E02C61A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4806E56C-85E9-499D-8D5F-5C217E02C61A}.Release|Any CPU.Build.0 = Release|Any CPU + {6B625556-5588-4380-B5DA-7C4B1E4C7674}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6B625556-5588-4380-B5DA-7C4B1E4C7674}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6B625556-5588-4380-B5DA-7C4B1E4C7674}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6B625556-5588-4380-B5DA-7C4B1E4C7674}.Release|Any CPU.Build.0 = Release|Any CPU + {FFC3A334-9F16-4E2E-B904-0E34641283FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FFC3A334-9F16-4E2E-B904-0E34641283FA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FFC3A334-9F16-4E2E-B904-0E34641283FA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FFC3A334-9F16-4E2E-B904-0E34641283FA}.Release|Any CPU.Build.0 = Release|Any CPU + {45ACED5F-BC77-4775-8C45-98F0BD56A1F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {45ACED5F-BC77-4775-8C45-98F0BD56A1F1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {45ACED5F-BC77-4775-8C45-98F0BD56A1F1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {45ACED5F-BC77-4775-8C45-98F0BD56A1F1}.Release|Any CPU.Build.0 = Release|Any CPU + {5C3DE988-43FB-40E2-AD6F-935BEF5BD7C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5C3DE988-43FB-40E2-AD6F-935BEF5BD7C5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5C3DE988-43FB-40E2-AD6F-935BEF5BD7C5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5C3DE988-43FB-40E2-AD6F-935BEF5BD7C5}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {99A640BE-CB0B-4822-BF61-B2FAE2FFB4D7} = {7DC91B93-4273-41C6-B504-B72DA0617ACC} - {0E459B0A-840A-4C8E-A8CC-B6225D8C4F3F} = {7DC91B93-4273-41C6-B504-B72DA0617ACC} - {0542FC09-B1F6-47DD-B99B-1DA85285CA16} = {95BDEC7B-E156-4D7B-914E-D4E1E7B3A35B} - {71F9F361-833F-4483-B179-E10851D12069} = {95BDEC7B-E156-4D7B-914E-D4E1E7B3A35B} - {9C16112D-07EB-4E4D-A926-0E737899E6A6} = {7DC91B93-4273-41C6-B504-B72DA0617ACC} {0E053218-D0CE-4A4B-8944-9BFF9AC686A4} = {00742C60-221D-43D5-AF9F-AE7F74B5C051} {23BDDFD4-4D5C-4027-9F82-34AA64307451} = {7DC91B93-4273-41C6-B504-B72DA0617ACC} {3E987E8E-07AB-4EFF-8E90-C27908DE5467} = {00742C60-221D-43D5-AF9F-AE7F74B5C051} - {961AF1B5-BC7C-4935-BDB0-111058445EA9} = {7DC91B93-4273-41C6-B504-B72DA0617ACC} + {86AC12CD-F665-434A-8AEF-77E05A74D63D} = {AFEEDDF7-54D1-4D17-AF95-1E8F7DE82B8F} + {00AD9007-D3AD-4805-A871-DFCB55475E5A} = {1DFB92FC-0E7E-449B-B1F4-D41031759A75} + {916494E7-0AE4-4128-B8B6-3525AEBDC871} = {95BDEC7B-E156-4D7B-914E-D4E1E7B3A35B} + {3C92B49D-444D-4254-ACB1-1FCB9805C221} = {95BDEC7B-E156-4D7B-914E-D4E1E7B3A35B} + {4806E56C-85E9-499D-8D5F-5C217E02C61A} = {00742C60-221D-43D5-AF9F-AE7F74B5C051} + {6B625556-5588-4380-B5DA-7C4B1E4C7674} = {7DC91B93-4273-41C6-B504-B72DA0617ACC} + {FFC3A334-9F16-4E2E-B904-0E34641283FA} = {7DC91B93-4273-41C6-B504-B72DA0617ACC} + {45ACED5F-BC77-4775-8C45-98F0BD56A1F1} = {7DC91B93-4273-41C6-B504-B72DA0617ACC} + {5C3DE988-43FB-40E2-AD6F-935BEF5BD7C5} = {7DC91B93-4273-41C6-B504-B72DA0617ACC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6585E240-3235-4BD7-BDF5-456A83B85D9F} diff --git a/Server/DataModels/CreateGameBodyPayload.cs b/Server/DataModels/CreateGameBodyPayload.cs deleted file mode 100644 index 56d5632..0000000 --- a/Server/DataModels/CreateGameBodyPayload.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace Server.DataModels; - -public record CreateGameBodyPayload(string[] PlayerIds); diff --git a/Server/Services/IPlatformService.cs b/Server/Services/IPlatformService.cs deleted file mode 100644 index 4acdc3a..0000000 --- a/Server/Services/IPlatformService.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Server.DataModels; - -namespace Server.Services; - -public interface IPlatformService -{ - public Task GetUserInfo(string tokenString); -} \ No newline at end of file diff --git a/SharedLibrary/ResponseArgs/Monopoly/PlayerNeedsToPayTollEventArgs.cs b/SharedLibrary/ResponseArgs/Monopoly/PlayerNeedsToPayTollEventArgs.cs index 69ad8f9..7d1fc29 100644 --- a/SharedLibrary/ResponseArgs/Monopoly/PlayerNeedsToPayTollEventArgs.cs +++ b/SharedLibrary/ResponseArgs/Monopoly/PlayerNeedsToPayTollEventArgs.cs @@ -1,4 +1,4 @@ -namespace SharedLibrary; +namespace SharedLibrary.ResponseArgs.Monopoly; public class PlayerNeedsToPayTollEventArgs { diff --git a/Test/DomainTests/Usings.cs b/Test/DomainTests/Usings.cs deleted file mode 100644 index a546999..0000000 --- a/Test/DomainTests/Usings.cs +++ /dev/null @@ -1,4 +0,0 @@ -global using Domain; -global using Domain.Exceptions; -global using Domain.Interfaces; -global using Microsoft.VisualStudio.TestTools.UnitTesting; \ No newline at end of file diff --git a/Test/Monopoly.Web.Tests/Monopoly.Web.Tests.csproj b/tests/Monopoly.Clients.Web.Tests/Monopoly.Clients.Web.Tests.csproj similarity index 79% rename from Test/Monopoly.Web.Tests/Monopoly.Web.Tests.csproj rename to tests/Monopoly.Clients.Web.Tests/Monopoly.Clients.Web.Tests.csproj index 3f7e5ba..b3a4571 100644 --- a/Test/Monopoly.Web.Tests/Monopoly.Web.Tests.csproj +++ b/tests/Monopoly.Clients.Web.Tests/Monopoly.Clients.Web.Tests.csproj @@ -22,7 +22,8 @@ - + + diff --git a/Test/Monopoly.Web.Tests/TypeClientGeneratorTests.cs b/tests/Monopoly.Clients.Web.Tests/TypeClientGeneratorTests.cs similarity index 99% rename from Test/Monopoly.Web.Tests/TypeClientGeneratorTests.cs rename to tests/Monopoly.Clients.Web.Tests/TypeClientGeneratorTests.cs index 260de71..57612e8 100644 --- a/Test/Monopoly.Web.Tests/TypeClientGeneratorTests.cs +++ b/tests/Monopoly.Clients.Web.Tests/TypeClientGeneratorTests.cs @@ -1,8 +1,8 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; -using Monopoly.Web.Generators; +using Monopoly.Clients.Web.Generators; -namespace Monopoly.Web.Tests; +namespace Monopoly.Clients.Web.Tests; [TestClass] public class TypeClientGeneratorTests diff --git a/Test/DomainTests/DomainTests.csproj b/tests/Monopoly.DomainLayer.Domain.Tests/Monopoly.DomainLayer.Domain.Tests.csproj similarity index 87% rename from Test/DomainTests/DomainTests.csproj rename to tests/Monopoly.DomainLayer.Domain.Tests/Monopoly.DomainLayer.Domain.Tests.csproj index 872e241..759c60d 100644 --- a/Test/DomainTests/DomainTests.csproj +++ b/tests/Monopoly.DomainLayer.Domain.Tests/Monopoly.DomainLayer.Domain.Tests.csproj @@ -20,7 +20,7 @@ - + diff --git a/Test/DomainTests/Testcases/AuctionTest.cs b/tests/Monopoly.DomainLayer.Domain.Tests/Testcases/AuctionTest.cs similarity index 96% rename from Test/DomainTests/Testcases/AuctionTest.cs rename to tests/Monopoly.DomainLayer.Domain.Tests/Testcases/AuctionTest.cs index a3a00ed..33c3e01 100644 --- a/Test/DomainTests/Testcases/AuctionTest.cs +++ b/tests/Monopoly.DomainLayer.Domain.Tests/Testcases/AuctionTest.cs @@ -1,8 +1,8 @@ -using Domain.Builders; -using Domain.Events; -using Domain.Maps; +using Monopoly.DomainLayer.Domain.Builders; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.DomainLayer.Domain.Maps; -namespace DomainTests.Testcases; +namespace Monopoly.DomainLayer.Domain.Tests.Testcases; [TestClass] public class AuctionTest diff --git a/Test/DomainTests/Testcases/BankruptTest.cs b/tests/Monopoly.DomainLayer.Domain.Tests/Testcases/BankruptTest.cs similarity index 84% rename from Test/DomainTests/Testcases/BankruptTest.cs rename to tests/Monopoly.DomainLayer.Domain.Tests/Testcases/BankruptTest.cs index fc34046..11a2bf2 100644 --- a/Test/DomainTests/Testcases/BankruptTest.cs +++ b/tests/Monopoly.DomainLayer.Domain.Tests/Testcases/BankruptTest.cs @@ -1,7 +1,7 @@ -using Domain.Builders; -using Domain.Maps; +using Monopoly.DomainLayer.Domain.Builders; +using Monopoly.DomainLayer.Domain.Maps; -namespace DomainTests.Testcases; +namespace Monopoly.DomainLayer.Domain.Tests.Testcases; [TestClass] public class BankruptTest diff --git a/Test/DomainTests/Testcases/BuyLandTest.cs b/tests/Monopoly.DomainLayer.Domain.Tests/Testcases/BuyLandTest.cs similarity index 97% rename from Test/DomainTests/Testcases/BuyLandTest.cs rename to tests/Monopoly.DomainLayer.Domain.Tests/Testcases/BuyLandTest.cs index ce1f747..ff4d80b 100644 --- a/Test/DomainTests/Testcases/BuyLandTest.cs +++ b/tests/Monopoly.DomainLayer.Domain.Tests/Testcases/BuyLandTest.cs @@ -1,8 +1,8 @@ -using Domain.Builders; -using Domain.Events; -using Domain.Maps; +using Monopoly.DomainLayer.Domain.Builders; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.DomainLayer.Domain.Maps; -namespace DomainTests.Testcases; +namespace Monopoly.DomainLayer.Domain.Tests.Testcases; [TestClass] public class BuyLandTest diff --git a/Test/DomainTests/Testcases/GameInitialTest.cs b/tests/Monopoly.DomainLayer.Domain.Tests/Testcases/GameInitialTest.cs similarity index 91% rename from Test/DomainTests/Testcases/GameInitialTest.cs rename to tests/Monopoly.DomainLayer.Domain.Tests/Testcases/GameInitialTest.cs index a7870e1..98dce04 100644 --- a/Test/DomainTests/Testcases/GameInitialTest.cs +++ b/tests/Monopoly.DomainLayer.Domain.Tests/Testcases/GameInitialTest.cs @@ -1,7 +1,7 @@ -using Domain.Builders; -using Domain.Maps; +using Monopoly.DomainLayer.Domain.Builders; +using Monopoly.DomainLayer.Domain.Maps; -namespace DomainTests.Testcases; +namespace Monopoly.DomainLayer.Domain.Tests.Testcases; [TestClass] public class GameInitialTest diff --git a/Test/DomainTests/Testcases/MortgageTest.cs b/tests/Monopoly.DomainLayer.Domain.Tests/Testcases/MortgageTest.cs similarity index 95% rename from Test/DomainTests/Testcases/MortgageTest.cs rename to tests/Monopoly.DomainLayer.Domain.Tests/Testcases/MortgageTest.cs index 49b6ef2..556cf95 100644 --- a/Test/DomainTests/Testcases/MortgageTest.cs +++ b/tests/Monopoly.DomainLayer.Domain.Tests/Testcases/MortgageTest.cs @@ -1,8 +1,8 @@ -using Domain.Builders; -using Domain.Events; -using Domain.Maps; +using Monopoly.DomainLayer.Domain.Builders; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.DomainLayer.Domain.Maps; -namespace DomainTests.Testcases; +namespace Monopoly.DomainLayer.Domain.Tests.Testcases; [TestClass] public class MortgageTest diff --git a/Test/DomainTests/Testcases/PayTollTest.cs b/tests/Monopoly.DomainLayer.Domain.Tests/Testcases/PayTollTest.cs similarity index 97% rename from Test/DomainTests/Testcases/PayTollTest.cs rename to tests/Monopoly.DomainLayer.Domain.Tests/Testcases/PayTollTest.cs index c83b9ff..90c9c1e 100644 --- a/Test/DomainTests/Testcases/PayTollTest.cs +++ b/tests/Monopoly.DomainLayer.Domain.Tests/Testcases/PayTollTest.cs @@ -1,8 +1,8 @@ -using Domain.Builders; -using Domain.Events; -using Domain.Maps; +using Monopoly.DomainLayer.Domain.Builders; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.DomainLayer.Domain.Maps; -namespace DomainTests.Testcases; +namespace Monopoly.DomainLayer.Domain.Tests.Testcases; [TestClass] public class PayTollTest diff --git a/Test/DomainTests/Testcases/RollDiceTest.cs b/tests/Monopoly.DomainLayer.Domain.Tests/Testcases/RollDiceTest.cs similarity index 98% rename from Test/DomainTests/Testcases/RollDiceTest.cs rename to tests/Monopoly.DomainLayer.Domain.Tests/Testcases/RollDiceTest.cs index 97b3cce..64fbae8 100644 --- a/Test/DomainTests/Testcases/RollDiceTest.cs +++ b/tests/Monopoly.DomainLayer.Domain.Tests/Testcases/RollDiceTest.cs @@ -1,7 +1,7 @@ -using Domain.Builders; -using Domain.Events; +using Monopoly.DomainLayer.Domain.Builders; +using Monopoly.DomainLayer.Domain.Events; -namespace DomainTests.Testcases; +namespace Monopoly.DomainLayer.Domain.Tests.Testcases; [TestClass] public class RollDiceTest diff --git a/Test/DomainTests/Testcases/SelectDirectionTest.cs b/tests/Monopoly.DomainLayer.Domain.Tests/Testcases/SelectDirectionTest.cs similarity index 98% rename from Test/DomainTests/Testcases/SelectDirectionTest.cs rename to tests/Monopoly.DomainLayer.Domain.Tests/Testcases/SelectDirectionTest.cs index e63b4e7..e59134e 100644 --- a/Test/DomainTests/Testcases/SelectDirectionTest.cs +++ b/tests/Monopoly.DomainLayer.Domain.Tests/Testcases/SelectDirectionTest.cs @@ -1,8 +1,7 @@ -using Domain.Builders; -using Domain.Events; -using Domain.Maps; +using Monopoly.DomainLayer.Domain.Builders; +using Monopoly.DomainLayer.Domain.Events; -namespace DomainTests.Testcases; +namespace Monopoly.DomainLayer.Domain.Tests.Testcases; [TestClass] public class SelectDirectionTest diff --git a/Test/DomainTests/Testcases/SettlementTest.cs b/tests/Monopoly.DomainLayer.Domain.Tests/Testcases/SettlementTest.cs similarity index 92% rename from Test/DomainTests/Testcases/SettlementTest.cs rename to tests/Monopoly.DomainLayer.Domain.Tests/Testcases/SettlementTest.cs index df2a57f..d14a45f 100644 --- a/Test/DomainTests/Testcases/SettlementTest.cs +++ b/tests/Monopoly.DomainLayer.Domain.Tests/Testcases/SettlementTest.cs @@ -1,7 +1,7 @@ -using Domain.Builders; -using Domain.Events; +using Monopoly.DomainLayer.Domain.Builders; +using Monopoly.DomainLayer.Domain.Events; -namespace DomainTests.Testcases; +namespace Monopoly.DomainLayer.Domain.Tests.Testcases; [TestClass] public class SettlementTest diff --git a/Test/ServerTests/Usings.cs b/tests/Monopoly.DomainLayer.Domain.Tests/Usings.cs similarity index 100% rename from Test/ServerTests/Usings.cs rename to tests/Monopoly.DomainLayer.Domain.Tests/Usings.cs diff --git a/Test/DomainTests/Utils.cs b/tests/Monopoly.DomainLayer.Domain.Tests/Utils.cs similarity index 94% rename from Test/DomainTests/Utils.cs rename to tests/Monopoly.DomainLayer.Domain.Tests/Utils.cs index 80c55ad..413cd84 100644 --- a/Test/DomainTests/Utils.cs +++ b/tests/Monopoly.DomainLayer.Domain.Tests/Utils.cs @@ -1,9 +1,9 @@ -using Domain.Common; -using Domain.Events; using Monopoly.DomainLayer.Common; +using Monopoly.DomainLayer.Domain.Events; +using Monopoly.DomainLayer.Domain.Interfaces; using Moq; -namespace DomainTests; +namespace Monopoly.DomainLayer.Domain.Tests; public class Utils { diff --git a/tests/Monopoly.InterfaceAdapters.Server.Tests.Generators/AssertionHubGenerator.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests.Generators/AssertionHubGenerator.cs similarity index 99% rename from tests/Monopoly.InterfaceAdapters.Server.Tests.Generators/AssertionHubGenerator.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests.Generators/AssertionHubGenerator.cs index 9f7617e..a0d2de9 100644 --- a/tests/Monopoly.InterfaceAdapters.Server.Tests.Generators/AssertionHubGenerator.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests.Generators/AssertionHubGenerator.cs @@ -3,7 +3,7 @@ using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.Text; -namespace Monopoly.InterfaceAdapters.Server.Tests.Generators; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.Generators; [Generator(LanguageNames.CSharp)] public class AssertionHubGenerator : IIncrementalGenerator diff --git a/tests/Monopoly.InterfaceAdapters.Server.Tests.Generators/Monopoly.InterfaceAdapters.Server.Tests.Generators.csproj b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests.Generators/Monopoly.InterfaceAdapterLayer.Server.Tests.Generators.csproj similarity index 100% rename from tests/Monopoly.InterfaceAdapters.Server.Tests.Generators/Monopoly.InterfaceAdapters.Server.Tests.Generators.csproj rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests.Generators/Monopoly.InterfaceAdapterLayer.Server.Tests.Generators.csproj diff --git a/tests/Monopoly.InterfaceAdapters.Server.Tests.Generators/Properties/launchSettings.json b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests.Generators/Properties/launchSettings.json similarity index 100% rename from tests/Monopoly.InterfaceAdapters.Server.Tests.Generators/Properties/launchSettings.json rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests.Generators/Properties/launchSettings.json diff --git a/tests/Monopoly.InterfaceAdapters.Server.Tests.Generators/TransformationResult.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests.Generators/TransformationResult.cs similarity index 97% rename from tests/Monopoly.InterfaceAdapters.Server.Tests.Generators/TransformationResult.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests.Generators/TransformationResult.cs index d7bd421..8115cce 100644 --- a/tests/Monopoly.InterfaceAdapters.Server.Tests.Generators/TransformationResult.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests.Generators/TransformationResult.cs @@ -1,6 +1,6 @@ using Microsoft.CodeAnalysis; -namespace Monopoly.InterfaceAdapters.Server.Tests.Generators; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.Generators; public class TransformationResult( string name, diff --git a/Test/ServerTests/AcceptanceTests/AuctionTest.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/AuctionTest.cs similarity index 98% rename from Test/ServerTests/AcceptanceTests/AuctionTest.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/AuctionTest.cs index ff585ec..49c95fc 100644 --- a/Test/ServerTests/AcceptanceTests/AuctionTest.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/AuctionTest.cs @@ -1,9 +1,9 @@ -using Server.Hubs.Monopoly; +using Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -using static ServerTests.Utils; +using static Monopoly.InterfaceAdapterLayer.Server.Tests.Utils; -namespace ServerTests.AcceptanceTests; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.AcceptanceTests; [TestClass] public class AuctionTest diff --git a/Test/ServerTests/AcceptanceTests/BuildHouseTest.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/BuildHouseTest.cs similarity index 97% rename from Test/ServerTests/AcceptanceTests/BuildHouseTest.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/BuildHouseTest.cs index 40288bd..39c100a 100644 --- a/Test/ServerTests/AcceptanceTests/BuildHouseTest.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/BuildHouseTest.cs @@ -1,9 +1,9 @@ -using Server.Hubs.Monopoly; +using Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -using static ServerTests.Utils; +using static Monopoly.InterfaceAdapterLayer.Server.Tests.Utils; -namespace ServerTests.AcceptanceTests; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.AcceptanceTests; [TestClass] public class BuildHouseTest diff --git a/Test/ServerTests/AcceptanceTests/BuyBlockTest.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/BuyBlockTest.cs similarity index 97% rename from Test/ServerTests/AcceptanceTests/BuyBlockTest.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/BuyBlockTest.cs index d7444b5..3f003f7 100644 --- a/Test/ServerTests/AcceptanceTests/BuyBlockTest.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/BuyBlockTest.cs @@ -1,9 +1,9 @@ -using Server.Hubs.Monopoly; +using Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -using static ServerTests.Utils; +using static Monopoly.InterfaceAdapterLayer.Server.Tests.Utils; -namespace ServerTests.AcceptanceTests; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.AcceptanceTests; [TestClass] public class BuyBlockTest diff --git a/Test/ServerTests/AcceptanceTests/CreateGameTest.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/CreateGameTest.cs similarity index 92% rename from Test/ServerTests/AcceptanceTests/CreateGameTest.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/CreateGameTest.cs index e68f0b6..b6a8544 100644 --- a/Test/ServerTests/AcceptanceTests/CreateGameTest.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/CreateGameTest.cs @@ -1,13 +1,9 @@ -using Application.Common; -using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.Extensions.Options; -using Server.DataModels; -using System.Net; -using System.Net.Http.Headers; -using System.Net.Http.Json; -using ServerTests.Common; +using Monopoly.ApplicationLayer.Application.Common; +using Monopoly.InterfaceAdapterLayer.Server.Tests.Common; -namespace ServerTests.AcceptanceTests; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.AcceptanceTests; [TestClass] public class CreateGameTest diff --git a/Test/ServerTests/AcceptanceTests/EndRoundTest.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/EndRoundTest.cs similarity index 97% rename from Test/ServerTests/AcceptanceTests/EndRoundTest.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/EndRoundTest.cs index 7f6b7cb..b1eb8c4 100644 --- a/Test/ServerTests/AcceptanceTests/EndRoundTest.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/EndRoundTest.cs @@ -1,9 +1,9 @@ -using Server.Hubs.Monopoly; +using Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -using static ServerTests.Utils; +using static Monopoly.InterfaceAdapterLayer.Server.Tests.Utils; -namespace ServerTests.AcceptanceTests; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.AcceptanceTests; [TestClass] public class EndRoundTest diff --git a/Test/ServerTests/AcceptanceTests/MortgageTest.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/MortgageTest.cs similarity index 95% rename from Test/ServerTests/AcceptanceTests/MortgageTest.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/MortgageTest.cs index 76270ea..c95f80d 100644 --- a/Test/ServerTests/AcceptanceTests/MortgageTest.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/MortgageTest.cs @@ -1,9 +1,9 @@ -using Server.Hubs.Monopoly; +using Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -using static ServerTests.Utils; +using static Monopoly.InterfaceAdapterLayer.Server.Tests.Utils; -namespace ServerTests.AcceptanceTests; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.AcceptanceTests; [TestClass] public class MortgageTest diff --git a/Test/ServerTests/AcceptanceTests/PayTollTest.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/PayTollTest.cs similarity index 98% rename from Test/ServerTests/AcceptanceTests/PayTollTest.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/PayTollTest.cs index eeed84c..555d894 100644 --- a/Test/ServerTests/AcceptanceTests/PayTollTest.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/PayTollTest.cs @@ -1,9 +1,9 @@ -using Server.Hubs.Monopoly; +using Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -using static ServerTests.Utils; +using static Monopoly.InterfaceAdapterLayer.Server.Tests.Utils; -namespace ServerTests.AcceptanceTests; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.AcceptanceTests; [TestClass] public class PayTollTest diff --git a/Test/ServerTests/AcceptanceTests/PlayerJoinGameTest.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/PlayerJoinGameTest.cs similarity index 91% rename from Test/ServerTests/AcceptanceTests/PlayerJoinGameTest.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/PlayerJoinGameTest.cs index fa922fa..82fc485 100644 --- a/Test/ServerTests/AcceptanceTests/PlayerJoinGameTest.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/PlayerJoinGameTest.cs @@ -1,14 +1,11 @@ -using Application.Common; -using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.Extensions.Options; -using Server.DataModels; +using Monopoly.ApplicationLayer.Application.Common; +using Monopoly.InterfaceAdapterLayer.Server.Tests.Common; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -using System.Net.Http.Headers; -using System.Net.Http.Json; -using ServerTests.Common; -namespace ServerTests.AcceptanceTests; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.AcceptanceTests; [TestClass] public class PlayerJoinGameTest diff --git a/Test/ServerTests/AcceptanceTests/ReadyRoom/AbstractReadyRoomTestBase.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/AbstractReadyRoomTestBase.cs similarity index 90% rename from Test/ServerTests/AcceptanceTests/ReadyRoom/AbstractReadyRoomTestBase.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/AbstractReadyRoomTestBase.cs index cf1a7aa..7f22f4e 100644 --- a/Test/ServerTests/AcceptanceTests/ReadyRoom/AbstractReadyRoomTestBase.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/AbstractReadyRoomTestBase.cs @@ -1,9 +1,8 @@ using System.Net.Http.Headers; using System.Net.Http.Json; -using System.Text; -using Application.Usecases.ReadyRoom; +using Monopoly.ApplicationLayer.Application.Usecases.ReadyRoom; -namespace ServerTests.AcceptanceTests.ReadyRoom; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.AcceptanceTests.ReadyRoom; public abstract class AbstractReadyRoomTestBase { diff --git a/Test/ServerTests/AcceptanceTests/ReadyRoom/CreateReadyRoomTest.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/CreateReadyRoomTest.cs similarity index 93% rename from Test/ServerTests/AcceptanceTests/ReadyRoom/CreateReadyRoomTest.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/CreateReadyRoomTest.cs index 3c9fd4e..5122e34 100644 --- a/Test/ServerTests/AcceptanceTests/ReadyRoom/CreateReadyRoomTest.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/CreateReadyRoomTest.cs @@ -1,7 +1,7 @@ using System.Net.Http.Headers; using System.Net.Http.Json; -namespace ServerTests.AcceptanceTests.ReadyRoom; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.AcceptanceTests.ReadyRoom; [TestClass] public class CreateReadyRoomTest : AbstractReadyRoomTestBase diff --git a/Test/ServerTests/AcceptanceTests/ReadyRoom/GameStartTest.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/GameStartTest.cs similarity index 98% rename from Test/ServerTests/AcceptanceTests/ReadyRoom/GameStartTest.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/GameStartTest.cs index d72b4bd..0211e30 100644 --- a/Test/ServerTests/AcceptanceTests/ReadyRoom/GameStartTest.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/GameStartTest.cs @@ -4,7 +4,7 @@ using Moq; using SharedLibrary.ResponseArgs.ReadyRoom; -namespace ServerTests.AcceptanceTests.ReadyRoom; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.AcceptanceTests.ReadyRoom; [TestClass] public class GameStartTest : AbstractReadyRoomTestBase diff --git a/Test/ServerTests/AcceptanceTests/ReadyRoom/GetReadyInfosTest.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/GetReadyInfosTest.cs similarity index 96% rename from Test/ServerTests/AcceptanceTests/ReadyRoom/GetReadyInfosTest.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/GetReadyInfosTest.cs index 0a585a9..f09455d 100644 --- a/Test/ServerTests/AcceptanceTests/ReadyRoom/GetReadyInfosTest.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/GetReadyInfosTest.cs @@ -3,7 +3,7 @@ using LocationEnum = Monopoly.DomainLayer.ReadyRoom.Enums.LocationEnum; using ReadyInfoLocationEnum = SharedLibrary.ResponseArgs.ReadyRoom.Models.LocationEnum; -namespace ServerTests.AcceptanceTests.ReadyRoom; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.AcceptanceTests.ReadyRoom; [TestClass] public class GetReadyInfosTest : AbstractReadyRoomTestBase diff --git a/Test/ServerTests/AcceptanceTests/ReadyRoom/JoinReadyRoomTest.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/JoinReadyRoomTest.cs similarity index 95% rename from Test/ServerTests/AcceptanceTests/ReadyRoom/JoinReadyRoomTest.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/JoinReadyRoomTest.cs index 6033eed..6448628 100644 --- a/Test/ServerTests/AcceptanceTests/ReadyRoom/JoinReadyRoomTest.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/JoinReadyRoomTest.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.SignalR; using Monopoly.DomainLayer.ReadyRoom.Builders; -namespace ServerTests.AcceptanceTests.ReadyRoom; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.AcceptanceTests.ReadyRoom; [TestClass] public class JoinReadyRoomTest : AbstractReadyRoomTestBase diff --git a/Test/ServerTests/AcceptanceTests/ReadyRoom/ReadyTest.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/ReadyTest.cs similarity index 97% rename from Test/ServerTests/AcceptanceTests/ReadyRoom/ReadyTest.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/ReadyTest.cs index 1f571d4..b8502b6 100644 --- a/Test/ServerTests/AcceptanceTests/ReadyRoom/ReadyTest.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/ReadyTest.cs @@ -3,7 +3,7 @@ using Monopoly.DomainLayer.ReadyRoom.Enums; using SharedLibrary.ResponseArgs.ReadyRoom; -namespace ServerTests.AcceptanceTests.ReadyRoom; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.AcceptanceTests.ReadyRoom; [TestClass] public class ReadyTest : AbstractReadyRoomTestBase diff --git a/Test/ServerTests/AcceptanceTests/ReadyRoom/SelectLocationTest.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/SelectLocationTest.cs similarity index 98% rename from Test/ServerTests/AcceptanceTests/ReadyRoom/SelectLocationTest.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/SelectLocationTest.cs index c43f849..85c3bfc 100644 --- a/Test/ServerTests/AcceptanceTests/ReadyRoom/SelectLocationTest.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/SelectLocationTest.cs @@ -3,7 +3,7 @@ using Monopoly.DomainLayer.ReadyRoom.Enums; using SharedLibrary.ResponseArgs.ReadyRoom; -namespace ServerTests.AcceptanceTests.ReadyRoom; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.AcceptanceTests.ReadyRoom; [TestClass] public class SelectLocationTest : AbstractReadyRoomTestBase diff --git a/Test/ServerTests/AcceptanceTests/ReadyRoom/SelectRoleTest.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/SelectRoleTest.cs similarity index 95% rename from Test/ServerTests/AcceptanceTests/ReadyRoom/SelectRoleTest.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/SelectRoleTest.cs index 78f5406..c5e5a60 100644 --- a/Test/ServerTests/AcceptanceTests/ReadyRoom/SelectRoleTest.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/ReadyRoom/SelectRoleTest.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.SignalR; using Monopoly.DomainLayer.ReadyRoom.Builders; -namespace ServerTests.AcceptanceTests.ReadyRoom; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.AcceptanceTests.ReadyRoom; [TestClass] public class SelectRoleTest : AbstractReadyRoomTestBase diff --git a/Test/ServerTests/AcceptanceTests/RedeemTest.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/RedeemTest.cs similarity index 93% rename from Test/ServerTests/AcceptanceTests/RedeemTest.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/RedeemTest.cs index 8409e74..d755743 100644 --- a/Test/ServerTests/AcceptanceTests/RedeemTest.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/RedeemTest.cs @@ -1,9 +1,9 @@ -using Server.Hubs.Monopoly; +using Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -using static ServerTests.Utils; +using static Monopoly.InterfaceAdapterLayer.Server.Tests.Utils; -namespace ServerTests.AcceptanceTests; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.AcceptanceTests; [TestClass] public class RedeemTest diff --git a/Test/ServerTests/AcceptanceTests/RollDiceTest.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/RollDiceTest.cs similarity index 98% rename from Test/ServerTests/AcceptanceTests/RollDiceTest.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/RollDiceTest.cs index 7946e57..2d02329 100644 --- a/Test/ServerTests/AcceptanceTests/RollDiceTest.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/RollDiceTest.cs @@ -1,9 +1,9 @@ -using Server.Hubs.Monopoly; +using Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -using static ServerTests.Utils; +using static Monopoly.InterfaceAdapterLayer.Server.Tests.Utils; -namespace ServerTests.AcceptanceTests; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.AcceptanceTests; [TestClass] public class RollDiceTest diff --git a/Test/ServerTests/AcceptanceTests/SelectDirectionTest.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/SelectDirectionTest.cs similarity index 93% rename from Test/ServerTests/AcceptanceTests/SelectDirectionTest.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/SelectDirectionTest.cs index 20ff5f5..915032d 100644 --- a/Test/ServerTests/AcceptanceTests/SelectDirectionTest.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/SelectDirectionTest.cs @@ -1,10 +1,10 @@ -using Application.Common; -using Server.Hubs.Monopoly; +using Monopoly.ApplicationLayer.Application.Common; +using Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; -using static ServerTests.Utils; +using static Monopoly.InterfaceAdapterLayer.Server.Tests.Utils; -namespace ServerTests.AcceptanceTests; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.AcceptanceTests; [TestClass] public class SelectDirectionTest diff --git a/Test/ServerTests/AcceptanceTests/SettlementTest.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/SettlementTest.cs similarity index 97% rename from Test/ServerTests/AcceptanceTests/SettlementTest.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/SettlementTest.cs index 7d59108..88306dd 100644 --- a/Test/ServerTests/AcceptanceTests/SettlementTest.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/AcceptanceTests/SettlementTest.cs @@ -1,8 +1,8 @@ -using Server.Hubs.Monopoly; +using Monopoly.InterfaceAdapterLayer.Server.Hubs.Monopoly; using SharedLibrary; -using static ServerTests.Utils; +using static Monopoly.InterfaceAdapterLayer.Server.Tests.Utils; -namespace ServerTests.AcceptanceTests; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.AcceptanceTests; [TestClass] [Ignore] diff --git a/Test/ServerTests/Common/MockJwtTokenService.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/Common/MockJwtTokenService.cs similarity index 95% rename from Test/ServerTests/Common/MockJwtTokenService.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/Common/MockJwtTokenService.cs index 5cd76dd..4adc5b9 100644 --- a/Test/ServerTests/Common/MockJwtTokenService.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/Common/MockJwtTokenService.cs @@ -3,7 +3,7 @@ using System.Security.Cryptography; using Microsoft.IdentityModel.Tokens; -namespace ServerTests.Common; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.Common; internal class MockJwtTokenService { diff --git a/Test/ServerTests/Common/MockPlatformService.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/Common/MockPlatformService.cs similarity index 68% rename from Test/ServerTests/Common/MockPlatformService.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/Common/MockPlatformService.cs index eb0b5ba..d58e224 100644 --- a/Test/ServerTests/Common/MockPlatformService.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/Common/MockPlatformService.cs @@ -1,8 +1,8 @@ using System.IdentityModel.Tokens.Jwt; -using Server.DataModels; -using Server.Services; +using Monopoly.InterfaceAdapterLayer.Server.DataModels; +using Monopoly.InterfaceAdapterLayer.Server.Services; -namespace ServerTests.Common; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.Common; public class MockPlatformService : IPlatformService { diff --git a/Test/ServerTests/ServerTests.csproj b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/Monopoly.InterfaceAdapterLayer.Server.Tests.csproj similarity index 75% rename from Test/ServerTests/ServerTests.csproj rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/Monopoly.InterfaceAdapterLayer.Server.Tests.csproj index add892e..60f3ee3 100644 --- a/Test/ServerTests/ServerTests.csproj +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/Monopoly.InterfaceAdapterLayer.Server.Tests.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/Test/ServerTests/MonopolyTestServer.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/MonopolyTestServer.cs similarity index 97% rename from Test/ServerTests/MonopolyTestServer.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/MonopolyTestServer.cs index 2d87935..8f22996 100644 --- a/Test/ServerTests/MonopolyTestServer.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/MonopolyTestServer.cs @@ -1,5 +1,8 @@ -using Application.Usecases; -using Microsoft.AspNetCore.Authentication.JwtBearer; +using System.Collections.Concurrent; +using System.IdentityModel.Tokens.Jwt; +using System.Security.Claims; +using System.Text; +using System.Text.Json; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc.Testing; using Microsoft.AspNetCore.SignalR.Client; @@ -7,20 +10,15 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Options; -using ServerTests.Usecases; -using SharedLibrary; -using System.Collections.Concurrent; -using System.IdentityModel.Tokens.Jwt; -using System.Security.Claims; -using System.Text; -using System.Text.Json; using Microsoft.IdentityModel.Tokens; +using Monopoly.ApplicationLayer.Application.Usecases; +using Monopoly.InterfaceAdapterLayer.Server.Configurations; +using Monopoly.InterfaceAdapterLayer.Server.Tests.Usecases; using Monopoly.InterfaceAdapters.Server.Tests.Generators; -using Server.Configurations; -using ServerTests.Common; +using SharedLibrary; using SharedLibrary.ResponseArgs.ReadyRoom.Models; -namespace ServerTests; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests; internal class MonopolyTestServer : WebApplicationFactory { diff --git a/Test/ServerTests/Usecases/MockDiceService.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/Usecases/MockDiceService.cs similarity index 71% rename from Test/ServerTests/Usecases/MockDiceService.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/Usecases/MockDiceService.cs index 47f22c6..670d8c9 100644 --- a/Test/ServerTests/Usecases/MockDiceService.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/Usecases/MockDiceService.cs @@ -1,6 +1,6 @@ -using Domain.Interfaces; +using Monopoly.DomainLayer.Domain.Interfaces; -namespace ServerTests.Usecases; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.Usecases; public class MockDiceService { diff --git a/Test/ServerTests/Usecases/MockPlayerRollDiceUsecase.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/Usecases/MockPlayerRollDiceUsecase.cs similarity index 83% rename from Test/ServerTests/Usecases/MockPlayerRollDiceUsecase.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/Usecases/MockPlayerRollDiceUsecase.cs index be64af5..1ca24d6 100644 --- a/Test/ServerTests/Usecases/MockPlayerRollDiceUsecase.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/Usecases/MockPlayerRollDiceUsecase.cs @@ -1,9 +1,8 @@ -using Application.Common; -using Application.Usecases; -using Domain.Common; +using Monopoly.ApplicationLayer.Application.Common; +using Monopoly.ApplicationLayer.Application.Usecases; using Monopoly.DomainLayer.Common; -namespace ServerTests.Usecases; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests.Usecases; public class MockPlayerRollDiceUsecase(ICommandRepository repository, IEventBus eventBus, diff --git a/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/Usings.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/Usings.cs new file mode 100644 index 0000000..ab67c7e --- /dev/null +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/Usings.cs @@ -0,0 +1 @@ +global using Microsoft.VisualStudio.TestTools.UnitTesting; \ No newline at end of file diff --git a/Test/ServerTests/Utils.cs b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/Utils.cs similarity index 75% rename from Test/ServerTests/Utils.cs rename to tests/Monopoly.InterfaceAdapterLayer.Server.Tests/Utils.cs index e428cd0..78695b6 100644 --- a/Test/ServerTests/Utils.cs +++ b/tests/Monopoly.InterfaceAdapterLayer.Server.Tests/Utils.cs @@ -1,12 +1,19 @@ -using Application.Common; -using Application.DataModels; -using Domain; -using Domain.Interfaces; -using ServerTests.Usecases; +using Monopoly.ApplicationLayer.Application.Common; +using Monopoly.ApplicationLayer.Application.DataModels; +using Monopoly.DomainLayer.Domain; +using Monopoly.DomainLayer.Domain.Interfaces; +using Monopoly.InterfaceAdapterLayer.Server.Tests.Usecases; using SharedLibrary; using SharedLibrary.ResponseArgs.Monopoly; +using Auction = Monopoly.ApplicationLayer.Application.DataModels.Auction; +using Chess = Monopoly.ApplicationLayer.Application.DataModels.Chess; +using CurrentPlayerState = Monopoly.ApplicationLayer.Application.DataModels.CurrentPlayerState; +using GameStage = Monopoly.ApplicationLayer.Application.DataModels.GameStage; +using LandContract = Monopoly.ApplicationLayer.Application.DataModels.LandContract; +using Map = Monopoly.ApplicationLayer.Application.DataModels.Map; +using Player = Monopoly.ApplicationLayer.Application.DataModels.Player; -namespace ServerTests; +namespace Monopoly.InterfaceAdapterLayer.Server.Tests; public class Utils { @@ -36,24 +43,24 @@ public class MonopolyBuilder { private string GameId { get; set; } - private List Players { get; set; } = new(); + private List Players { get; set; } = new(); private string HostId { get; set; } private int[] Dices { get; set; } = [0]; - private Application.DataModels.CurrentPlayerState CurrentPlayerState { get; set; } + private CurrentPlayerState CurrentPlayerState { get; set; } private List LandHouses { get; set; } = []; - public Application.DataModels.Map Map { get; private set; } - private Application.DataModels.GameStage GameStage { get; set; } + public Map Map { get; private set; } + private GameStage GameStage { get; set; } public MonopolyBuilder(string id) { GameId = id; - GameStage = Application.DataModels.GameStage.Gaming; + GameStage = GameStage.Gaming; } - public MonopolyBuilder WithPlayer(Application.DataModels.Player player) + public MonopolyBuilder WithPlayer(Player player) { Players.Add(player); return this; @@ -65,7 +72,7 @@ public MonopolyBuilder WithMockDice(int[] dices) return this; } - public MonopolyBuilder WithCurrentPlayer(Application.DataModels.CurrentPlayerState currentPlayerState) + public MonopolyBuilder WithCurrentPlayer(CurrentPlayerState currentPlayerState) { CurrentPlayerState = currentPlayerState; return this; @@ -83,9 +90,9 @@ public MonopolyBuilder WithLandHouse(string id, int house) return this; } - private Application.DataModels.MonopolyDataModel Build() + private MonopolyDataModel Build() { - return new Application.DataModels.MonopolyDataModel(Id: GameId, + return new MonopolyDataModel(Id: GameId, Players: [..Players], Map: Map, HostId: HostId, @@ -102,7 +109,7 @@ internal void Save(MonopolyTestServer server) Dices.Select(value => new MockDice(value)).ToArray(); } - internal MonopolyBuilder WithGameStage(Application.DataModels.GameStage gameStage) + internal MonopolyBuilder WithGameStage(GameStage gameStage) { GameStage = gameStage; return this; @@ -115,7 +122,7 @@ public class PlayerBuilder(string id) private decimal Money { get; set; } = 15000; private string BlockId { get; set; } = "StartPoint"; private Direction Direction { get; set; } = Direction.Right; - private List LandContracts { get; set; } = new(); + private List LandContracts { get; set; } = new(); private PlayerState PlayerState { get; set; } = PlayerState.Normal; private int BankruptRounds { get; set; } private string? RoleId { get; set; } @@ -136,7 +143,7 @@ public PlayerBuilder WithPosition(string blockId, Direction direction) public PlayerBuilder WithLandContract(string landId, bool inMortgage = false, int deadline = 10) { - LandContracts.Add(new Application.DataModels.LandContract( + LandContracts.Add(new LandContract( LandId: landId, InMortgage: inMortgage, Deadline: deadline)); @@ -150,11 +157,11 @@ public PlayerBuilder WithBankrupt(int rounds) return this; } - public Application.DataModels.Player Build() + public Player Build() { - Application.DataModels.Chess chess = new(CurrentPosition: BlockId, - Direction: Enum.Parse(Direction.ToString())); - Application.DataModels.Player player = new(Id: Id, + Chess chess = new(CurrentPosition: BlockId, + Direction: Enum.Parse(Direction.ToString())); + Player player = new(Id: Id, Money: Money, Chess: chess, LandContracts: LandContracts.ToArray(), @@ -199,7 +206,7 @@ public class CurrentPlayerStateBuilder(string id) private bool IsPayToll { get; set; } private bool IsBoughtLand { get; set; } private bool IsUpgradeLand { get; set; } - private Application.DataModels.Auction? Auction { get; set; } + private Auction? Auction { get; set; } private int RemainingSteps { get; set; } private bool HadSelectedDirection { get; set; } @@ -223,7 +230,7 @@ public CurrentPlayerStateBuilder WithUpgradeLand() internal CurrentPlayerStateBuilder WithAuction(string landId, string? highestBidderId, decimal highestPrice) { - Auction = new Application.DataModels.Auction(landId, highestBidderId, highestPrice); + Auction = new Auction(landId, highestBidderId, highestPrice); return this; } @@ -239,9 +246,9 @@ internal CurrentPlayerStateBuilder HadNotSelectedDirection() return this; } - public Application.DataModels.CurrentPlayerState Build() + public CurrentPlayerState Build() { - return new Application.DataModels.CurrentPlayerState(PlayerId: Id, + return new CurrentPlayerState(PlayerId: Id, IsPayToll: IsPayToll, IsBoughtLand: IsBoughtLand, IsUpgradeLand: IsUpgradeLand,