將IMonopolyResponse移動到SharedLibrary

這個變更使前端能夠直接使用IMonopolyResponse作為SignalR的Event名稱。在移動後為了避免ServerTest使用到MonopolyMap，因此把MonopolyMap移動到其他命名空間
Game-as-a-Service · Aug 13, 2023 · e06e41e · e06e41e
1 parent 991076e
commit e06e41e
Show file tree

Hide file tree

Showing 19 changed files with 70 additions and 56 deletions.
diff --git a/Client/Components/BlazorMap.cs b/Client/Components/BlazorMap.cs
@@ -1,4 +1,5 @@
-using System.ComponentModel;
+using SharedLibrary.MonopolyMap;
+using System.ComponentModel;
 
 namespace Client.Components;
 
@@ -21,7 +22,7 @@ public class BlazorMap
 
     public int BlockHeight => _blockHeight;
 
-    public BlazorMap(SharedLibrary.MonopolyMap data)
+    public BlazorMap(MonopolyMap data)
     {
         // 自動Mapping _data 到 _blocks
         _blocks = new Block[data.Data.Length][];
@@ -35,13 +36,13 @@ public BlazorMap(SharedLibrary.MonopolyMap data)
                 var y = i * (_blockHeight + _blockMargin);
                 _blocks[i][j] = monopolyBlock.Type switch
                 {
-                    SharedLibrary.BlockType.None => null!,
-                    SharedLibrary.BlockType.Land => CreateLand(monopolyBlock, x, y),
-                    SharedLibrary.BlockType.Road => new Road(x, y, monopolyBlock.Id, monopolyBlock.ToRoad().RoadType.ToBlazorRoadType()),
-                    SharedLibrary.BlockType.ParkingLot => new ParkingLot(x, y, monopolyBlock.Id),
-                    SharedLibrary.BlockType.Prison => new Prison(x, y, monopolyBlock.Id),
-                    SharedLibrary.BlockType.StartPoint => new StartPoint(x, y, monopolyBlock.Id),
-                    SharedLibrary.BlockType.Station => new Station(x, y, monopolyBlock.Id, monopolyBlock.ToStation().RoadType.ToBlazorStationRoadType()),
+                    BlockType.None => null!,
+                    BlockType.Land => CreateLand(monopolyBlock, x, y),
+                    BlockType.Road => new Road(x, y, monopolyBlock.Id, monopolyBlock.ToRoad().RoadType.ToBlazorRoadType()),
+                    BlockType.ParkingLot => new ParkingLot(x, y, monopolyBlock.Id),
+                    BlockType.Prison => new Prison(x, y, monopolyBlock.Id),
+                    BlockType.StartPoint => new StartPoint(x, y, monopolyBlock.Id),
+                    BlockType.Station => new Station(x, y, monopolyBlock.Id, monopolyBlock.ToStation().RoadType.ToBlazorStationRoadType()),
                     _ => throw new InvalidEnumArgumentException()
                 };
             }
@@ -59,7 +60,7 @@ public BlazorMap(SharedLibrary.MonopolyMap data)
     /// <param name="_y">原座標Y</param>
     /// <returns></returns>
     /// <exception cref="InvalidOperationException"></exception>
-    private static Land CreateLand(SharedLibrary.BlockBase block, int x, int y)
+    private static Land CreateLand(BlockBase block, int x, int y)
     {
         var type = block.ToLand().LandType.ToBlazorLandType();
         double offsetX = type switch
@@ -178,67 +179,67 @@ public static string GetImageName(this BlazorMap.StationRoadType stationRoadType
         return GetImageName(typeof(BlazorMap.StationRoadType), stationRoadType);
     }
 
-    public static SharedLibrary.Land ToLand(this SharedLibrary.BlockBase block)
+    public static Land ToLand(this BlockBase block)
     {
-        return (SharedLibrary.Land)block;
+        return (Land)block;
     }
 
-    public static BlazorMap.LandType ToBlazorLandType(this SharedLibrary.LandType landType)
+    public static BlazorMap.LandType ToBlazorLandType(this LandType landType)
     {
         return landType switch
         {
-            SharedLibrary.LandType.Right => BlazorMap.LandType.Right,
-            SharedLibrary.LandType.Down => BlazorMap.LandType.Down,
-            SharedLibrary.LandType.Left => BlazorMap.LandType.Left,
-            SharedLibrary.LandType.Up => BlazorMap.LandType.Up,
+            LandType.Right => BlazorMap.LandType.Right,
+            LandType.Down => BlazorMap.LandType.Down,
+            LandType.Left => BlazorMap.LandType.Left,
+            LandType.Up => BlazorMap.LandType.Up,
             _ => throw new InvalidEnumArgumentException()
         };
     }
 
-    public static SharedLibrary.Road ToRoad(this SharedLibrary.BlockBase block)
+    public static Road ToRoad(this BlockBase block)
     {
-        return (SharedLibrary.Road)block;
+        return (Road)block;
     }
 
-    public static BlazorMap.RoadType ToBlazorRoadType(this SharedLibrary.RoadType roadType)
+    public static BlazorMap.RoadType ToBlazorRoadType(this RoadType roadType)
     {
         return roadType switch
         {
-            SharedLibrary.RoadType.TopLeftIntersection => BlazorMap.RoadType.TopLeftIntersection,
-            SharedLibrary.RoadType.TopIntersection => BlazorMap.RoadType.TopIntersection,
-            SharedLibrary.RoadType.TopRightIntersection => BlazorMap.RoadType.TopRightIntersection,
-            SharedLibrary.RoadType.LeftCenterIntersection => BlazorMap.RoadType.LeftCenterIntersection,
-            SharedLibrary.RoadType.CenterIntersection => BlazorMap.RoadType.CenterIntersection,
-            SharedLibrary.RoadType.RightCenterIntersection => BlazorMap.RoadType.RightCenterIntersection,
-            SharedLibrary.RoadType.BottomLeftIntersection => BlazorMap.RoadType.BottomLeftIntersection,
-            SharedLibrary.RoadType.BottomIntersection => BlazorMap.RoadType.BottomIntersection,
-            SharedLibrary.RoadType.BottomRightIntersection => BlazorMap.RoadType.BottomRightIntersection,
-            SharedLibrary.RoadType.HorizontalRoad => BlazorMap.RoadType.HorizontalRoad,
-            SharedLibrary.RoadType.VerticalRoad => BlazorMap.RoadType.VerticalRoad,
+            RoadType.TopLeftIntersection => BlazorMap.RoadType.TopLeftIntersection,
+            RoadType.TopIntersection => BlazorMap.RoadType.TopIntersection,
+            RoadType.TopRightIntersection => BlazorMap.RoadType.TopRightIntersection,
+            RoadType.LeftCenterIntersection => BlazorMap.RoadType.LeftCenterIntersection,
+            RoadType.CenterIntersection => BlazorMap.RoadType.CenterIntersection,
+            RoadType.RightCenterIntersection => BlazorMap.RoadType.RightCenterIntersection,
+            RoadType.BottomLeftIntersection => BlazorMap.RoadType.BottomLeftIntersection,
+            RoadType.BottomIntersection => BlazorMap.RoadType.BottomIntersection,
+            RoadType.BottomRightIntersection => BlazorMap.RoadType.BottomRightIntersection,
+            RoadType.HorizontalRoad => BlazorMap.RoadType.HorizontalRoad,
+            RoadType.VerticalRoad => BlazorMap.RoadType.VerticalRoad,
             _ => throw new InvalidEnumArgumentException()
         };
     }
 
-    public static SharedLibrary.Station ToStation(this SharedLibrary.BlockBase block)
+    public static Station ToStation(this BlockBase block)
     {
-        return (SharedLibrary.Station)block;
+        return (Station)block;
     }
 
-    public static BlazorMap.StationRoadType ToBlazorStationRoadType(this SharedLibrary.RoadType stationRoadType)
+    public static BlazorMap.StationRoadType ToBlazorStationRoadType(this RoadType stationRoadType)
     {
         return stationRoadType switch
         {
-            SharedLibrary.RoadType.TopLeftIntersection => BlazorMap.StationRoadType.TopLeftIntersection,
-            SharedLibrary.RoadType.TopIntersection => BlazorMap.StationRoadType.TopIntersection,
-            SharedLibrary.RoadType.TopRightIntersection => BlazorMap.StationRoadType.TopRightIntersection,
-            SharedLibrary.RoadType.LeftCenterIntersection => BlazorMap.StationRoadType.LeftCenterIntersection,
-            SharedLibrary.RoadType.CenterIntersection => BlazorMap.StationRoadType.CenterIntersection,
-            SharedLibrary.RoadType.RightCenterIntersection => BlazorMap.StationRoadType.RightCenterIntersection,
-            SharedLibrary.RoadType.BottomLeftIntersection => BlazorMap.StationRoadType.BottomLeftIntersection,
-            SharedLibrary.RoadType.BottomIntersection => BlazorMap.StationRoadType.BottomIntersection,
-            SharedLibrary.RoadType.BottomRightIntersection => BlazorMap.StationRoadType.BottomRightIntersection,
-            SharedLibrary.RoadType.HorizontalRoad => BlazorMap.StationRoadType.HorizontalRoad,
-            SharedLibrary.RoadType.VerticalRoad => BlazorMap.StationRoadType.VerticalRoad,
+            RoadType.TopLeftIntersection => BlazorMap.StationRoadType.TopLeftIntersection,
+            RoadType.TopIntersection => BlazorMap.StationRoadType.TopIntersection,
+            RoadType.TopRightIntersection => BlazorMap.StationRoadType.TopRightIntersection,
+            RoadType.LeftCenterIntersection => BlazorMap.StationRoadType.LeftCenterIntersection,
+            RoadType.CenterIntersection => BlazorMap.StationRoadType.CenterIntersection,
+            RoadType.RightCenterIntersection => BlazorMap.StationRoadType.RightCenterIntersection,
+            RoadType.BottomLeftIntersection => BlazorMap.StationRoadType.BottomLeftIntersection,
+            RoadType.BottomIntersection => BlazorMap.StationRoadType.BottomIntersection,
+            RoadType.BottomRightIntersection => BlazorMap.StationRoadType.BottomRightIntersection,
+            RoadType.HorizontalRoad => BlazorMap.StationRoadType.HorizontalRoad,
+            RoadType.VerticalRoad => BlazorMap.StationRoadType.VerticalRoad,
             _ => throw new InvalidEnumArgumentException()
         };
     }

diff --git a/Client/Pages/Game.razor.cs b/Client/Pages/Game.razor.cs
@@ -4,7 +4,7 @@
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.Options;
 using MudBlazor;
-using SharedLibrary;
+using SharedLibrary.MonopolyMap;
 using System.Net.Http.Json;
 
 namespace Client.Pages;

diff --git a/Domain/Events/PlayerBuildHouseEvent.cs b/Domain/Events/PlayerBuildHouseEvent.cs
@@ -2,7 +2,7 @@
 
 namespace Domain.Events;
 
-public record PlayerBuildHouseEvent(string GameId, string PlayerId, string BlockId, decimal PlayerMoney, int House) 
+public record PlayerBuildHouseEvent(string GameId, string PlayerId, string BlockId, decimal PlayerMoney, int House)
     : DomainEvent(GameId);
 
 public record PlayerCannotBuildHouseEvent(string GameId, string PlayerId, string BlockId)

diff --git a/Server/Hubs/MonopolyHub.cs b/Server/Hubs/MonopolyHub.cs
@@ -2,6 +2,7 @@
 using Application.Usecases;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.SignalR;
+using SharedLibrary;
 using System.Security.Claims;
 
 namespace Server.Hubs;

diff --git a/Server/MonopolyEventBus.cs b/Server/MonopolyEventBus.cs
@@ -3,6 +3,7 @@
 using Domain.Events;
 using Microsoft.AspNetCore.SignalR;
 using Server.Hubs;
+using SharedLibrary;
 
 namespace Server;
 

diff --git a/Server/Program.cs b/Server/Program.cs
@@ -8,7 +8,7 @@
 using Server.Hubs;
 using Server.Repositories;
 using Server.Services;
-using SharedLibrary;
+using SharedLibrary.MonopolyMap;
 using System.Security.Claims;
 
 var builder = WebApplication.CreateBuilder(args);

diff --git a/Server/Hubs/IMonopolyResponses.cs → SharedLibrary/IMonopolyResponse.cs b/Server/Hubs/IMonopolyResponses.cs → SharedLibrary/IMonopolyResponse.cs
@@ -1,4 +1,4 @@
-namespace Server.Hubs;
+namespace SharedLibrary;
 
 public interface IMonopolyResponses
 {

diff --git a/SharedLibrary/MonopolyMap.cs → SharedLibrary/MonopolyMap/MonopolyMap.cs b/SharedLibrary/MonopolyMap.cs → SharedLibrary/MonopolyMap/MonopolyMap.cs
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace SharedLibrary;
+namespace SharedLibrary.MonopolyMap;
 
 public class MonopolyMap
 {
@@ -66,11 +66,11 @@ public enum LandType
     Up
 }
 
-public class TestMap 
+public class TestMap
 {
     public MonopolyMap Map { get; set; }
-    public TestMap() 
-    { 
+    public TestMap()
+    {
         var emptyBlock = new EmptyBlock();
         var land = (string id, LandType landType) => new Land(id, landType);
         var road = (string id, RoadType roadType) => new Road(id, roadType);

diff --git a/SharedLibrary/SharedLibrary.csproj b/SharedLibrary/SharedLibrary.csproj
@@ -6,4 +6,8 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Folder Include="MonopolyMap\" />
+  </ItemGroup>
+
 </Project>
diff --git a/Test/ServerTests/AcceptanceTests/BuildHouseTest.cs b/Test/ServerTests/AcceptanceTests/BuildHouseTest.cs
@@ -1,5 +1,6 @@
 using Domain;
 using Server.Hubs;
+using SharedLibrary;
 using static Domain.Map;
 using static ServerTests.Utils;
 

diff --git a/Test/ServerTests/AcceptanceTests/BuyBlockTest.cs b/Test/ServerTests/AcceptanceTests/BuyBlockTest.cs
@@ -1,5 +1,6 @@
 using Domain;
 using Server.Hubs;
+using SharedLibrary;
 using static Domain.Map;
 using static ServerTests.Utils;
 

diff --git a/Test/ServerTests/AcceptanceTests/MortgageTest.cs b/Test/ServerTests/AcceptanceTests/MortgageTest.cs
@@ -1,5 +1,6 @@
 using Domain;
 using Server.Hubs;
+using SharedLibrary;
 using static Domain.Map;
 using static ServerTests.Utils;
 

diff --git a/Test/ServerTests/AcceptanceTests/PayTollTest.cs b/Test/ServerTests/AcceptanceTests/PayTollTest.cs
@@ -1,5 +1,6 @@
 using Domain;
 using Server.Hubs;
+using SharedLibrary;
 using static Domain.Map;
 using static ServerTests.Utils;
 

diff --git a/Test/ServerTests/AcceptanceTests/PlayerJoinGameTest.cs b/Test/ServerTests/AcceptanceTests/PlayerJoinGameTest.cs
@@ -2,8 +2,8 @@
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.Extensions.Options;
 using Server.DataModels;
-using Server.Hubs;
 using Server.Repositories;
+using SharedLibrary;
 using System.Net.Http.Headers;
 using System.Net.Http.Json;
 

diff --git a/Test/ServerTests/AcceptanceTests/RedeemTest.cs b/Test/ServerTests/AcceptanceTests/RedeemTest.cs
@@ -1,5 +1,6 @@
 using Domain;
 using Server.Hubs;
+using SharedLibrary;
 using static Domain.Map;
 using static ServerTests.Utils;
 

diff --git a/Test/ServerTests/AcceptanceTests/RollDiceTest.cs b/Test/ServerTests/AcceptanceTests/RollDiceTest.cs
@@ -2,6 +2,7 @@
 using Domain;
 using Domain.Maps;
 using Server.Hubs;
+using SharedLibrary;
 using static Domain.Map;
 using static ServerTests.Utils;
 

diff --git a/Test/ServerTests/AcceptanceTests/SelectDirectionTest.cs b/Test/ServerTests/AcceptanceTests/SelectDirectionTest.cs
@@ -1,6 +1,7 @@
 using Application.Common;
 using Domain;
 using Server.Hubs;
+using SharedLibrary;
 using static Domain.Map;
 using static ServerTests.Utils;
 

diff --git a/Test/ServerTests/MonopolyTestServer.cs b/Test/ServerTests/MonopolyTestServer.cs
@@ -9,8 +9,8 @@
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using Microsoft.IdentityModel.Tokens;
 using Server.DataModels;
-using Server.Hubs;
 using Server.Services;
+using SharedLibrary;
 using System.Collections.Concurrent;
 using System.IdentityModel.Tokens.Jwt;
 using System.Reflection;

diff --git a/Test/ServerTests/Utils.cs b/Test/ServerTests/Utils.cs
@@ -3,7 +3,7 @@
 using Domain.Interfaces;
 using Domain.Maps;
 using Moq;
-using Server.Hubs;
+using SharedLibrary;
 using static Domain.Map;
 
 namespace ServerTests;