yep

Gameboard.ShogiUI.Sockets.ServiceModels/Api/GetGuestToken.cs

@@ -0,0 +1,20 @@
+using System;
+
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Api
+{
+  public class GetGuestToken
+  {
+  }
+
+  public class GetGuestTokenResponse
+  {
+    public string PlayerName { get; }
+    public Guid OneTimeToken { get; }
+
+    public GetGuestTokenResponse(string playerName, Guid token)
+    {
+      PlayerName = playerName;
+      OneTimeToken = token;
+    }
+  }
+}

Gameboard.ShogiUI.Sockets.ServiceModels/Api/GetToken.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Gameboard.ShogiUI.Sockets.ServiceModels.Api.Messages
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Api
 {
   public class GetTokenResponse
   {

Gameboard.ShogiUI.Sockets.ServiceModels/Api/Messages/GetGuestToken.cs

@@ -1,21 +0,0 @@
-using System;
-
-namespace Gameboard.ShogiUI.Sockets.ServiceModels.Api.Messages
-{
-  public class GetGuestToken
-  {
-    public string? ClientId { get; set; }
-  }
-
-  public class GetGuestTokenResponse
-  {
-    public string ClientId { get; }
-    public Guid OneTimeToken { get; }
-
-    public GetGuestTokenResponse(string clientId, Guid token)
-    {
-      ClientId = clientId;
-      OneTimeToken = token;
-    }
-  }
-}

Gameboard.ShogiUI.Sockets.ServiceModels/Api/PostGameInvitation.cs

@@ -1,4 +1,4 @@
-namespace Gameboard.ShogiUI.Sockets.ServiceModels.Api.Messages
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Api
 {
   public class PostGameInvitation
   {

Gameboard.ShogiUI.Sockets.ServiceModels/Api/PostMove.cs

@@ -0,0 +1,14 @@
+using Gameboard.ShogiUI.Sockets.ServiceModels.Types;
+using System.ComponentModel.DataAnnotations;
+
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Api
+{
+  public class PostMove
+  {
+    [Required]
+    public string GameName { get; set; }
+
+    [Required]
+    public Move Move { get; set; }
+  }
+}

Gameboard.ShogiUI.Sockets.ServiceModels/Api/PostSession.cs

@@ -1,4 +1,4 @@
-namespace Gameboard.ShogiUI.Sockets.ServiceModels.Api.Messages
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Api
 {
   public class PostSession
   {

Gameboard.ShogiUI.Sockets.ServiceModels/Socket/CreateGame.cs

@@ -1,7 +1,6 @@
-using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Interfaces;
-using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Types;
 
-namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket
 {
   public class CreateGameRequest : IRequest
   {
@@ -17,9 +16,9 @@ namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages
     public Game Game { get; set; }
     public string PlayerName { get; set; }
 
-    public CreateGameResponse(ClientAction action)
+    public CreateGameResponse()
     {
-      Action = action.ToString();
+      Action = ClientAction.CreateGame.ToString();
       Error = string.Empty;
       Game = new Game();
       PlayerName = string.Empty;

Gameboard.ShogiUI.Sockets.ServiceModels/Socket/IRequest.cs

@@ -0,0 +1,9 @@
+using Gameboard.ShogiUI.Sockets.ServiceModels.Types;
+
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket
+{
+  public interface IRequest
+  {
+    ClientAction Action { get; }
+  }
+}

Gameboard.ShogiUI.Sockets.ServiceModels/Socket/IResponse.cs

@@ -1,4 +1,4 @@
-namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Interfaces
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket
 {
   public interface IResponse
   {

Gameboard.ShogiUI.Sockets.ServiceModels/Socket/Interfaces/IRequest.cs

@@ -1,9 +0,0 @@
-using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
-
-namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Interfaces
-{
-  public interface IRequest
-  {
-    ClientAction Action { get; }
-  }
-}

Gameboard.ShogiUI.Sockets.ServiceModels/Socket/JoinGame.cs

@@ -1,7 +1,6 @@
-using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Interfaces;
-using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Types;
 
-namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket
 {
   public class JoinByCodeRequest : IRequest
   {
@@ -17,17 +16,25 @@ namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages
 
   public class JoinGameResponse : IResponse
   {
-    public string Action { get; }
+    public string Action { get; protected set; }
     public string Error { get; set; }
     public string GameName { get; set; }
     public string PlayerName { get; set; }
 
-    public JoinGameResponse(ClientAction action)
+    public JoinGameResponse()
     {
-      Action = action.ToString();
+      Action = ClientAction.JoinGame.ToString();
       Error = "";
       GameName = "";
       PlayerName = "";
     }
   }
+
+  public class JoinByCodeResponse : JoinGameResponse, IResponse
+  {
+    public JoinByCodeResponse()
+    {
+      Action = ClientAction.JoinByCode.ToString();
+    }
+  }
 }

Gameboard.ShogiUI.Sockets.ServiceModels/Socket/ListGames.cs

@@ -1,9 +1,8 @@
-using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Interfaces;
-using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Types;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 
-namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket
 {
   public class ListGamesRequest : IRequest
   {
@@ -16,9 +15,9 @@ namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages
     public string Error { get; set; }
     public IReadOnlyList<Game> Games { get; set; }
 
-    public ListGamesResponse(ClientAction action)
+    public ListGamesResponse()
     {
-      Action = action.ToString();
+      Action = ClientAction.ListGames.ToString();
       Error = "";
       Games = new Collection<Game>();
     }

Gameboard.ShogiUI.Sockets.ServiceModels/Socket/LoadGame.cs

@@ -1,8 +1,7 @@
-using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Interfaces;
-using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Types;
 using System.Collections.Generic;
 
-namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket
 {
   public class LoadGameRequest : IRequest
   {
@@ -19,9 +18,9 @@ namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages
     public IList<Move> MoveHistory { get; set; }
     public string Error { get; set; }
 
-    public LoadGameResponse(ClientAction action)
+    public LoadGameResponse()
     {
-      Action = action.ToString();
+      Action = ClientAction.LoadGame.ToString();
     }
   }
 }

Gameboard.ShogiUI.Sockets.ServiceModels/Socket/Move.cs

@@ -1,7 +1,6 @@
-using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Interfaces;
-using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Types;
 
-namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket
 {
   public class MoveRequest : IRequest
   {
@@ -15,16 +14,16 @@ namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Messages
     public string Action { get; }
     public string Error { get; set; }
     public string GameName { get; set; }
-    public BoardState BoardState { get; set; }
     public string PlayerName { get; set; }
+    public Move Move { get; set; }
 
-    public MoveResponse(ClientAction action)
+    public MoveResponse()
     {
-      Action = action.ToString();
+      Action = ClientAction.Move.ToString();
       Error = string.Empty;
       GameName = string.Empty;
-      BoardState = new BoardState();
       PlayerName = string.Empty;
+      Move = new Move();
     }
   }
 }

Gameboard.ShogiUI.Sockets.ServiceModels/Socket/Types/WhichPlayer.cs

@@ -1,8 +0,0 @@
-namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types
-{
-  public enum WhichPlayer
-  {
-    Player1,
-    Player2
-  }
-}

Gameboard.ShogiUI.Sockets.ServiceModels/Types/BoardState.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 
-namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Types
 {
   public class BoardState
   {
-    public Piece[,] Board { get; set; } = new Piece[0, 0];
+    public Dictionary<string, Piece?> Board { get; set; } = new Dictionary<string, Piece?>();
     public IReadOnlyCollection<Piece> Player1Hand { get; set; } = Array.Empty<Piece>();
     public IReadOnlyCollection<Piece> Player2Hand { get; set; } = Array.Empty<Piece>();
     public WhichPlayer? PlayerInCheck { get; set; }

Gameboard.ShogiUI.Sockets.ServiceModels/Types/ClientActionEnum.cs

@@ -1,4 +1,4 @@
-namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Types
 {
   public enum ClientAction
   {

Gameboard.ShogiUI.Sockets.ServiceModels/Types/Game.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Types
 {
   public class Game
   {

Gameboard.ShogiUI.Sockets.ServiceModels/Types/Move.cs

@@ -1,4 +1,4 @@
-namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Types
 {
   public class Move
   {

Gameboard.ShogiUI.Sockets.ServiceModels/Types/Piece.cs

@@ -1,4 +1,4 @@
-namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Types
 {
   public class Piece
   {

Gameboard.ShogiUI.Sockets.ServiceModels/Types/WhichPiece.cs

@@ -1,4 +1,4 @@
-namespace Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Types
 {
   public enum WhichPiece
   {

Gameboard.ShogiUI.Sockets.ServiceModels/Types/WhichPlayer.cs

@@ -0,0 +1,8 @@
+namespace Gameboard.ShogiUI.Sockets.ServiceModels.Types
+{
+  public enum WhichPlayer
+  {
+    Player1,
+    Player2
+  }
+}