Fix board template ID key mismatch between client and server

The client sends 'boardTemplateIdOverride' but the server DTO had the
property named 'BoardTemplateId' (serializes to 'boardTemplateId').
The JSON key mismatch caused the server to always receive null, so
lobby.BoardTemplateIdOverride was never set and the auto-shape ran.

Rename BoardTemplateId → BoardTemplateIdOverride throughout
CustomRulesOverride and CustomRulesDto to match the client's key.

Generated with [Claude Code](https://claude.ai/code)
via [Happy](https://happy.engineering)

Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Happy <yesreply@happy.engineering>
This commit is contained in:
dingo
2026-03-28 10:10:43 -04:00
co-authored by Claude Happy
parent f57d1846c9
commit 9bf2d83457
5 changed files with 12 additions and 12 deletions
+3 -3
View File
@@ -125,12 +125,12 @@ public sealed record CustomRulesOverride(
/// Board shape. Null or "Default" = auto-select by player count via BoardShapeGenerator.AutoShape.
/// Explicit values: "Rectangle" | "Cross" | "Triangular" | "RadialStar" | "HexRing".
/// </summary>
string? BoardShape = null,
string? BoardShape = null,
/// <summary>
/// When set, use this board template instead of generating a board from BoardShape.
/// Null or absent = no template (use shape generator).
/// </summary>
Guid? BoardTemplateId = null);
Guid? BoardTemplateIdOverride = null);
/// <summary>Join an open custom lobby with the specified deck.</summary>
public sealed record JoinCustomLobbyRequest(Guid LobbyId, Guid DeckId, string? Password = null);
@@ -718,7 +718,7 @@ public sealed record CustomRulesDto(
/// <summary>"Default" = auto by player count; otherwise explicit shape name.</summary>
string BoardShape,
bool HasPassword,
Guid? BoardTemplateId = null);
Guid? BoardTemplateIdOverride = null);
/// <summary>Client-facing lobby preset summary.</summary>
public sealed record LobbyPresetDto(
@@ -95,7 +95,7 @@ internal sealed class GameCreateCustomLobbyHandler : GameHandlerBase, IMessageHa
MpBuffOverride = req.Rules?.MpBuff,
StartingRandomTilePctOverride = req.Rules?.StartingRandomTilePct,
BoardShapeOverride = req.Rules?.BoardShape,
BoardTemplateIdOverride = req.Rules?.BoardTemplateId,
BoardTemplateIdOverride = req.Rules?.BoardTemplateIdOverride,
CreatedAt = DateTimeOffset.UtcNow,
};
@@ -106,7 +106,7 @@ internal sealed class GameCreateCustomLobbyHandler : GameHandlerBase, IMessageHa
new CreateCustomLobbyResponse(
LobbyId : lobby.Id,
LobbyName : lobby.Name,
ActiveRules : ToDto(effective, req.Password != null, req.Rules?.BoardShape, req.Rules?.BoardTemplateId),
ActiveRules : ToDto(effective, req.Password != null, req.Rules?.BoardShape, req.Rules?.BoardTemplateIdOverride),
MaxPlayers : lobby.MaxPlayers,
GameMode : lobby.GameMode,
TeamCount : lobby.TeamCount));
@@ -115,7 +115,7 @@ internal sealed class GameCreateCustomLobbyHandler : GameHandlerBase, IMessageHa
// Shared helper used by list/join handlers as well.
// boardShape: the lobby's BoardShapeOverride string; null/"Default" → shown as "Default".
// boardTemplateId: the lobby's BoardTemplateIdOverride; null = no template.
internal static CustomRulesDto ToDto(GameRules r, bool hasPassword = false, string? boardShape = null, Guid? boardTemplateId = null) => new(
internal static CustomRulesDto ToDto(GameRules r, bool hasPassword = false, string? boardShape = null, Guid? boardTemplateIdOverride = null) => new(
OpeningHandSize : r.OpeningHandSize,
FirstPlayerSkipsDraw : r.FirstPlayerSkipsDraw,
SpAccumulationPerTurn : r.SpAccumulationPerTurn,
@@ -137,6 +137,6 @@ internal sealed class GameCreateCustomLobbyHandler : GameHandlerBase, IMessageHa
BoardShape : string.IsNullOrEmpty(boardShape) || boardShape == "Default"
? "Default"
: boardShape,
HasPassword : hasPassword,
BoardTemplateId : boardTemplateId);
HasPassword : hasPassword,
BoardTemplateIdOverride : boardTemplateIdOverride);
}
@@ -96,7 +96,7 @@ internal sealed class GameListActiveLobbiesHandler : GameHandlerBase, IMessageHa
StartingRandomTilePct : l.StartingRandomTilePctOverride ?? GameRules.Default.StartingRandomTilePct,
BoardShape : l.BoardShapeOverride ?? "Default",
HasPassword : l.Password != null,
BoardTemplateId : l.BoardTemplateIdOverride)));
BoardTemplateIdOverride : l.BoardTemplateIdOverride)));
return ServerMessage.Reply("game.custom.list_active.ack", message.Seq,
new ListActiveLobbiesResponse(
@@ -119,7 +119,7 @@ internal sealed class GameListCustomLobbiesHandler : GameHandlerBase, IMessageHa
StartingRandomTilePct : l.StartingRandomTilePctOverride ?? GameRules.Default.StartingRandomTilePct,
BoardShape : l.BoardShapeOverride ?? "Default",
HasPassword : l.Password != null,
BoardTemplateId : l.BoardTemplateIdOverride),
BoardTemplateIdOverride : l.BoardTemplateIdOverride),
CreatedAt : l.CreatedAt,
MaxPlayers : l.MaxPlayers,
CurrentPlayerCount : currentPlayerCount,
@@ -72,7 +72,7 @@ internal sealed class GameUpdateLobbyRulesHandler : GameHandlerBase, IMessageHan
lobby.MpBuffOverride = r.MpBuff;
lobby.StartingRandomTilePctOverride = r.StartingRandomTilePct;
lobby.BoardShapeOverride = r.BoardShape;
lobby.BoardTemplateIdOverride = r.BoardTemplateId;
lobby.BoardTemplateIdOverride = r.BoardTemplateIdOverride;
await _gameDb.SaveChangesAsync(ct);
@@ -96,7 +96,7 @@ internal sealed class GameUpdateLobbyRulesHandler : GameHandlerBase, IMessageHan
TurnLimit = r.TurnLimit ?? GameRules.Default.TurnLimit,
MpBuff = r.MpBuff ?? GameRules.Default.MpBuff,
StartingRandomTilePct = r.StartingRandomTilePct ?? GameRules.Default.StartingRandomTilePct,
}, lobby.Password != null, r.BoardShape, r.BoardTemplateId);
}, lobby.Password != null, r.BoardShape, r.BoardTemplateIdOverride);
var updatedPush = ServerMessage.Push("game.custom.lobby_updated",
new LobbyUpdatedPush(lobby.Id, effective));