yep

Gameboard.ShogiUI.Sockets/Repositories/CouchModels/BoardStateDocument.cs

@@ -1,6 +1,9 @@
-using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Types;
+using Gameboard.ShogiUI.Sockets.Utilities;
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Numerics;
 
 namespace Gameboard.ShogiUI.Sockets.Repositories.CouchModels
 {
@@ -8,7 +11,10 @@ namespace Gameboard.ShogiUI.Sockets.Repositories.CouchModels
   {
     public string Name { get; set; }
 
-    public Piece?[,] Board { get; set; }
+    /// <summary>
+    /// A dictionary where the key is a board-notation position, like D3.
+    /// </summary>
+    public Dictionary<string, Piece?> Board { get; set; }
 
     public Piece[] Player1Hand { get; set; }
 
@@ -25,7 +31,7 @@ namespace Gameboard.ShogiUI.Sockets.Repositories.CouchModels
     public BoardStateDocument() : base(WhichDocumentType.BoardState)
     {
       Name = string.Empty;
-      Board = new Piece[9, 9];
+      Board = new Dictionary<string, Piece?>(81, StringComparer.OrdinalIgnoreCase);
       Player1Hand = Array.Empty<Piece>();
       Player2Hand = Array.Empty<Piece>();
     }
@@ -34,20 +40,23 @@ namespace Gameboard.ShogiUI.Sockets.Repositories.CouchModels
       : base($"{sessionName}-{DateTime.Now:O}", WhichDocumentType.BoardState)
     {
       Name = sessionName;
-      Board = new Piece[9, 9];
+      Board = new Dictionary<string, Piece?>(81, StringComparer.OrdinalIgnoreCase);
 
       for (var x = 0; x < 9; x++)
         for (var y = 0; y < 9; y++)
         {
+          var position = new Vector2(x, y);
           var piece = shogi.Board[y, x];
+
           if (piece != null)
           {
-            Board[y, x] = new Piece(piece);
+            var positionNotation = NotationHelper.ToBoardNotation(position);
+            Board[positionNotation] = new Piece(piece);
           }
         }
 
-      Player1Hand = shogi.Hands[WhichPlayer.Player1].Select(model => new Piece(model)).ToArray();
-      Player2Hand = shogi.Hands[WhichPlayer.Player2].Select(model => new Piece(model)).ToArray();
+      Player1Hand = shogi.Player1Hand.Select(model => new Piece(model)).ToArray();
+      Player2Hand = shogi.Player2Hand.Select(model => new Piece(model)).ToArray();
       if (shogi.MoveHistory.Count > 0)
       {
         Move = new Move(shogi.MoveHistory[^1]);

Gameboard.ShogiUI.Sockets/Repositories/CouchModels/CouchFindResult.cs

@@ -5,10 +5,12 @@ namespace Gameboard.ShogiUI.Sockets.Repositories.CouchModels
   internal class CouchFindResult<T>
   {
     public T[] docs;
+    public string warning;
 
     public CouchFindResult()
     {
       docs = Array.Empty<T>();
+      warning = "";
     }
   }
 }

Gameboard.ShogiUI.Sockets/Repositories/CouchModels/Move.cs

@@ -1,4 +1,4 @@
-using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Types;
 using System.Numerics;
 
 namespace Gameboard.ShogiUI.Sockets.Repositories.CouchModels

Gameboard.ShogiUI.Sockets/Repositories/CouchModels/Piece.cs

@@ -1,4 +1,4 @@
-using Gameboard.ShogiUI.Sockets.ServiceModels.Socket.Types;
+using Gameboard.ShogiUI.Sockets.ServiceModels.Types;
 
 namespace Gameboard.ShogiUI.Sockets.Repositories.CouchModels
 {

Gameboard.ShogiUI.Sockets/Repositories/CouchModels/UserDocument.cs

@@ -1,9 +1,9 @@
-namespace Gameboard.ShogiUI.Sockets.Repositories.CouchModels
+using System;
+
+namespace Gameboard.ShogiUI.Sockets.Repositories.CouchModels
 {
   public class UserDocument : CouchDocument
   {
-    public static string GetDocumentId(string userName) => $"org.couchdb.user:{userName}";
-
     public enum LoginPlatform
     {
       Microsoft,
@@ -12,10 +12,27 @@
 
     public string Name { get; set; }
     public LoginPlatform Platform { get; set; }
-    public UserDocument(string name, LoginPlatform platform) : base($"org.couchdb.user:{name}", WhichDocumentType.User)
+    /// <summary>
+    /// The browser session ID saved via Set-Cookie headers.
+    /// Only used with guest accounts.
+    /// </summary>
+    public Guid? WebSessionId { get; set; }
+
+    /// <summary>
+    /// Constructor for JSON deserializing.
+    /// </summary>
+    public UserDocument() : base(WhichDocumentType.User)
+    {
+      Name = string.Empty;
+    }
+
+    public UserDocument(string name, Guid? webSessionId = null) : base($"org.couchdb.user:{name}", WhichDocumentType.User)
     {
       Name = name;
-      Platform = platform;
+      WebSessionId = webSessionId;
+      Platform = WebSessionId.HasValue
+        ? LoginPlatform.Guest
+        : LoginPlatform.Microsoft;
     }
   }
 }