From 4fa4c21b6e2e76f3ee7672642c26de34b748294e Mon Sep 17 00:00:00 2001 From: dingo Date: Mon, 9 Mar 2026 09:33:40 -0400 Subject: [PATCH] Feat: game explorer, action log result capture, session purge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DB / Server: - Added ResultJson (jsonb, nullable) to GameActionLog entity + EF migration - Updated SaveStateAsync to accept resultJson (optional, default null) - All 11 action handlers now serialize GameEngine.ToDto() result into the log Admin — GameSessionsPage: - Session IDs are now clickable links → /game/sessions/{id} - "Abandon All Active" bulk button (previous) - "Purge All" button (SuperAdmin only, JS confirm) — hard-deletes all sessions and action logs via cascade Admin — GameSessionDetailPage (/game/sessions/{id}): - Session header: status badge, P1/P2 display names (click to copy GUID) - Info cards: Player 1, Player 2, Created timestamp, Duration/WinCondition - Action log table: seq#, time, actor name (click to copy GUID), action type - Expandable Payload (JSON) and Result (JSON) per row - Actor display names resolved from SorIdentityDbContext Generated with [Claude Code](https://claude.ai/code) via [Happy](https://happy.engineering) Co-Authored-By: Claude Co-Authored-By: Happy --- .../Pages/Game/GameSessionDetailPage.razor | 283 ++++++++++++++++++ .../Pages/Game/GameSessionsPage.razor | 20 +- .../SOR.Database/Contexts/GameDbContext.cs | 1 + .../Entities/Game/GameActionLog.cs | 3 + .../Game/20260309000000_AddActionLogResult.cs | 30 ++ .../Game/GameDbContextModelSnapshot.cs | 4 + .../Handlers/GameActivateAbilityHandler.cs | 5 +- .../SOR.Game/Handlers/GameAscendHandler.cs | 5 +- .../SOR.Game/Handlers/GameAttackHandler.cs | 5 +- .../SOR.Game/Handlers/GameConcedeHandler.cs | 5 +- .../src/SOR.Game/Handlers/GameDrawHandler.cs | 5 +- .../SOR.Game/Handlers/GameEndTurnHandler.cs | 5 +- .../src/SOR.Game/Handlers/GameHandlerBase.cs | 4 +- .../SOR.Game/Handlers/GameMoveUnitHandler.cs | 5 +- .../Handlers/GamePlaceArchSpiritHandler.cs | 5 +- .../SOR.Game/Handlers/GamePlayCardHandler.cs | 6 +- .../SOR.Game/Handlers/GameSacrificeHandler.cs | 5 +- .../Handlers/GameTransitionHandler.cs | 5 +- 18 files changed, 376 insertions(+), 25 deletions(-) create mode 100644 Server/src/SOR.Admin/Components/Pages/Game/GameSessionDetailPage.razor create mode 100644 Server/src/SOR.Database/Migrations/Game/20260309000000_AddActionLogResult.cs diff --git a/Server/src/SOR.Admin/Components/Pages/Game/GameSessionDetailPage.razor b/Server/src/SOR.Admin/Components/Pages/Game/GameSessionDetailPage.razor new file mode 100644 index 0000000..9d914f1 --- /dev/null +++ b/Server/src/SOR.Admin/Components/Pages/Game/GameSessionDetailPage.razor @@ -0,0 +1,283 @@ +@page "/game/sessions/{Id:guid}" +@attribute [Authorize(Roles = "Admin,SuperAdmin")] +@using Microsoft.EntityFrameworkCore +@using SOR.Database.Contexts +@using SOR.Database.Enums +@inject GameDbContext Db +@inject SorIdentityDbContext IdentityDb + +Game Session – SOR Admin + +@if (_loading) +{ +

Loading…

+} +else if (_session is null) +{ +

Session not found.

+} +else +{ + +
+
+ ← Sessions +

Game Explorer

+
+ @Id — @_session.Status +
+
+
+ + +
+
+
+
Player 1
+
+ + @(_session.P1Name ?? _session.P1Id[..8] + "…") + +
+
+
+
+
+
Player 2
+
+ + @(_session.P2Name ?? _session.P2Id[..8] + "…") + +
+
+
+
+
+
Created
+
@_session.CreatedAt.ToString("yyyy-MM-dd HH:mm:ss")
+
+
+
+
+
Duration / Result
+
@_session.Duration
+ @if (_session.WinCondition is not null) + { +
@_session.WinCondition
+ } +
+
+
+ + +
+
+ Action Log + @_logs.Count entries +
+
+ + + + + + + + + + + + + @foreach (var log in _logs) + { + + + + + + + + + @if (log.PayloadExpanded && log.Payload is not null) + { + + + + } + @if (log.ResultExpanded && log.Result is not null) + { + + + + } + } + @if (!_logs.Any()) + { + + + + } + +
#TimeActorActionPayloadResult
@log.Seq@log.Time + + @(log.ActorName ?? log.ActorId[..8] + "…") + + @log.ActionType + @if (log.Payload is not null) + { + + } + + @if (log.Result is not null) + { + + } +
+
@log.Payload
+
+
@log.Result
+
No action logs.
+
+
+} + + + + +@code { + [Parameter] public Guid Id { get; set; } + + [Inject] private IJSRuntime JS { get; set; } = default!; + + private bool _loading = true; + private SessionInfo? _session; + private List _logs = new(); + + private sealed class SessionInfo + { + public string P1Id { get; init; } = ""; + public string? P1Name { get; init; } + public string P2Id { get; init; } = ""; + public string? P2Name { get; init; } + public string Status { get; init; } = ""; + public DateTimeOffset CreatedAt { get; init; } + public string Duration { get; init; } = "—"; + public string? WinCondition { get; init; } + } + + private sealed class LogRow + { + public int Seq { get; init; } + public string Time { get; init; } = ""; + public string ActorId { get; init; } = ""; + public string? ActorName { get; init; } + public string ActionType { get; init; } = ""; + public string? Payload { get; init; } + public string? Result { get; init; } + public bool PayloadExpanded { get; set; } + public bool ResultExpanded { get; set; } + } + + protected override async Task OnInitializedAsync() + { + var session = await Db.GameSessions.FindAsync(Id); + if (session is null) { _loading = false; return; } + + // Resolve display names for both players. + var playerIds = new[] { session.PlayerOneAccountId, session.PlayerTwoAccountId }; + var accounts = await IdentityDb.Users + .Where(u => playerIds.Contains(u.Id)) + .Select(u => new { u.Id, u.DisplayName, u.Email }) + .ToListAsync(); + + string NameOf(Guid id) + { + var a = accounts.FirstOrDefault(x => x.Id == id); + return a?.DisplayName ?? a?.Email ?? id.ToString(); + } + + _session = new SessionInfo + { + P1Id = session.PlayerOneAccountId.ToString(), + P1Name = NameOf(session.PlayerOneAccountId), + P2Id = session.PlayerTwoAccountId.ToString(), + P2Name = NameOf(session.PlayerTwoAccountId), + Status = session.Status.ToString(), + CreatedAt = session.CreatedAt, + Duration = session.EndedAt.HasValue && session.StartedAt.HasValue + ? FormatDuration(session.EndedAt.Value - session.StartedAt.Value) + : "ongoing", + WinCondition = session.WinCondition, + }; + + // Load action logs ordered by sequence. + var rawLogs = await Db.ActionLogs + .Where(l => l.GameSessionId == Id) + .OrderBy(l => l.SequenceNumber) + .ToListAsync(); + + // Bulk-resolve actor display names. + var actorIds = rawLogs.Select(l => l.ActorAccountId).Distinct().ToArray(); + var actorAccounts = await IdentityDb.Users + .Where(u => actorIds.Contains(u.Id)) + .Select(u => new { u.Id, u.DisplayName, u.Email }) + .ToListAsync(); + + string ActorName(Guid id) + { + var a = actorAccounts.FirstOrDefault(x => x.Id == id); + return a?.DisplayName ?? a?.Email ?? id.ToString(); + } + + _logs = rawLogs.Select(l => new LogRow + { + Seq = l.SequenceNumber, + Time = l.OccurredAt.ToString("HH:mm:ss"), + ActorId = l.ActorAccountId.ToString(), + ActorName = ActorName(l.ActorAccountId), + ActionType = l.ActionType, + Payload = l.PayloadJson, + Result = l.ResultJson, + }).ToList(); + + _loading = false; + } + + private void ToggleExpand(LogRow row, bool isPayload) + { + if (isPayload) row.PayloadExpanded = !row.PayloadExpanded; + else row.ResultExpanded = !row.ResultExpanded; + } + + private async Task CopyToClipboard(string text) + => await JS.InvokeVoidAsync("copyText", text); + + private static string FormatDuration(TimeSpan ts) + { + if (ts.TotalHours >= 1) return $"{(int)ts.TotalHours}h {ts.Minutes}m"; + if (ts.TotalMinutes >= 1) return $"{(int)ts.TotalMinutes}m {ts.Seconds}s"; + return $"{(int)ts.TotalSeconds}s"; + } + + private static string StatusBadge(string status) => status switch + { + nameof(GameSessionStatus.Initializing) => "bg-warning text-dark", + nameof(GameSessionStatus.Active) => "bg-success", + nameof(GameSessionStatus.Completed) => "bg-primary", + nameof(GameSessionStatus.Abandoned) => "bg-secondary", + _ => "bg-light text-dark", + }; +} diff --git a/Server/src/SOR.Admin/Components/Pages/Game/GameSessionsPage.razor b/Server/src/SOR.Admin/Components/Pages/Game/GameSessionsPage.razor index f9e6e69..c246720 100644 --- a/Server/src/SOR.Admin/Components/Pages/Game/GameSessionsPage.razor +++ b/Server/src/SOR.Admin/Components/Pages/Game/GameSessionsPage.razor @@ -4,12 +4,18 @@ @using SOR.Database.Contexts @using SOR.Database.Enums @inject GameDbContext Db +@inject IJSRuntime JS Game Sessions – SOR Admin

Game Sessions

+ + + @@ -106,7 +112,9 @@ else { @s.CreatedAt.ToString("yyyy-MM-dd HH:mm") - @s.Id.ToString()[..8]… + + @s.Id.ToString()[..8]… + @s.PlayerOneAccountId.ToString()[..8]… @s.PlayerTwoAccountId.ToString()[..8]… @s.Status @@ -239,6 +247,16 @@ else await LoadAsync(); } + private async Task PurgeAllAsync() + { + if (!await JS.InvokeAsync("confirm", "Permanently delete ALL sessions and action logs?")) + return; + // Cascade delete on action_logs means deleting sessions removes logs too. + await Db.GameSessions.ExecuteDeleteAsync(); + _page = 1; + await LoadAsync(); + } + private async Task AbandonAllActiveAsync() { var now = DateTimeOffset.UtcNow; diff --git a/Server/src/SOR.Database/Contexts/GameDbContext.cs b/Server/src/SOR.Database/Contexts/GameDbContext.cs index 13d09c2..cd5a57d 100644 --- a/Server/src/SOR.Database/Contexts/GameDbContext.cs +++ b/Server/src/SOR.Database/Contexts/GameDbContext.cs @@ -63,6 +63,7 @@ public sealed class GameDbContext : DbContext e.ToTable("action_logs"); e.HasKey(a => a.Id); e.Property(a => a.PayloadJson).HasColumnType("jsonb").HasColumnName("payload"); + e.Property(a => a.ResultJson).HasColumnType("jsonb").HasColumnName("result"); e.HasIndex(a => new { a.GameSessionId, a.SequenceNumber }).IsUnique(); e.HasIndex(a => a.ActorAccountId); }); diff --git a/Server/src/SOR.Database/Entities/Game/GameActionLog.cs b/Server/src/SOR.Database/Entities/Game/GameActionLog.cs index a46eddc..000448d 100644 --- a/Server/src/SOR.Database/Entities/Game/GameActionLog.cs +++ b/Server/src/SOR.Database/Entities/Game/GameActionLog.cs @@ -22,6 +22,9 @@ public sealed class GameActionLog /// JSONB: serialized action request payload. public string? PayloadJson { get; set; } + /// JSONB: serialized server response / result state sent back to the actor. + public string? ResultJson { get; set; } + /// 1-based sequence number within the game session. public int SequenceNumber { get; set; } diff --git a/Server/src/SOR.Database/Migrations/Game/20260309000000_AddActionLogResult.cs b/Server/src/SOR.Database/Migrations/Game/20260309000000_AddActionLogResult.cs new file mode 100644 index 0000000..f885e15 --- /dev/null +++ b/Server/src/SOR.Database/Migrations/Game/20260309000000_AddActionLogResult.cs @@ -0,0 +1,30 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace SOR.Database.Migrations.Game +{ + /// + public partial class AddActionLogResult : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "result", + schema: "game", + table: "action_logs", + type: "jsonb", + nullable: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "result", + schema: "game", + table: "action_logs"); + } + } +} diff --git a/Server/src/SOR.Database/Migrations/Game/GameDbContextModelSnapshot.cs b/Server/src/SOR.Database/Migrations/Game/GameDbContextModelSnapshot.cs index e7b56fa..a123756 100644 --- a/Server/src/SOR.Database/Migrations/Game/GameDbContextModelSnapshot.cs +++ b/Server/src/SOR.Database/Migrations/Game/GameDbContextModelSnapshot.cs @@ -105,6 +105,10 @@ namespace SOR.Database.Migrations.Game .HasColumnType("jsonb") .HasColumnName("payload"); + b.Property("ResultJson") + .HasColumnType("jsonb") + .HasColumnName("result"); + b.Property("SequenceNumber") .HasColumnType("integer"); diff --git a/Server/src/SOR.Game/Handlers/GameActivateAbilityHandler.cs b/Server/src/SOR.Game/Handlers/GameActivateAbilityHandler.cs index 8cddd37..0041c96 100644 --- a/Server/src/SOR.Game/Handlers/GameActivateAbilityHandler.cs +++ b/Server/src/SOR.Game/Handlers/GameActivateAbilityHandler.cs @@ -44,12 +44,13 @@ internal sealed class GameActivateAbilityHandler : GameHandlerBase, IMessageHand var newState = GameEngine.ActivateAbility( state, actorId, req.SourceInstanceId, req.AbilityIndex, req.Targets); + var dto = GameEngine.ToDto(newState, actorId); await SaveStateAsync(_gameDb, session, newState, actorId, "game.activate_ability", - JsonSerializer.Serialize(req), ct); + JsonSerializer.Serialize(req), ct, JsonSerializer.Serialize(dto)); await PushStateToPlayersAsync(_clientPush, session, newState, ct); return ServerMessage.Reply("game.activate_ability.ack", message.Seq, - new GameActivateAbilityResponse(GameEngine.ToDto(newState, actorId))); + new GameActivateAbilityResponse(dto)); } } diff --git a/Server/src/SOR.Game/Handlers/GameAscendHandler.cs b/Server/src/SOR.Game/Handlers/GameAscendHandler.cs index 14f60b6..9231cd2 100644 --- a/Server/src/SOR.Game/Handlers/GameAscendHandler.cs +++ b/Server/src/SOR.Game/Handlers/GameAscendHandler.cs @@ -45,12 +45,13 @@ internal sealed class GameAscendHandler : GameHandlerBase, IMessageHandler var state = GameEngine.Deserialize(session.StateJson!); var newState = GameEngine.Ascend(state, actorId, req.IncomingCardInstanceId); + var dto = GameEngine.ToDto(newState, actorId); await SaveStateAsync(_gameDb, session, newState, actorId, "game.ascend", - JsonSerializer.Serialize(req), ct); + JsonSerializer.Serialize(req), ct, JsonSerializer.Serialize(dto)); await PushStateToPlayersAsync(_clientPush, session, newState, ct); return ServerMessage.Reply("game.ascend.ack", message.Seq, - new GameAscendResponse(GameEngine.ToDto(newState, actorId))); + new GameAscendResponse(dto)); } } diff --git a/Server/src/SOR.Game/Handlers/GameAttackHandler.cs b/Server/src/SOR.Game/Handlers/GameAttackHandler.cs index cd665cf..b965375 100644 --- a/Server/src/SOR.Game/Handlers/GameAttackHandler.cs +++ b/Server/src/SOR.Game/Handlers/GameAttackHandler.cs @@ -45,8 +45,9 @@ internal sealed class GameAttackHandler : GameHandlerBase, IMessageHandler var (newState, gameOver) = GameEngine.Attack( state, actorId, req.AttackerInstanceId, req.TargetInstanceId); + var dto = GameEngine.ToDto(newState, actorId); await SaveStateAsync(_gameDb, session, newState, actorId, "game.attack", - JsonSerializer.Serialize(req), ct); + JsonSerializer.Serialize(req), ct, JsonSerializer.Serialize(dto)); if (gameOver) { @@ -69,6 +70,6 @@ internal sealed class GameAttackHandler : GameHandlerBase, IMessageHandler } return ServerMessage.Reply("game.attack.ack", message.Seq, - new GameAttackResponse(GameEngine.ToDto(newState, actorId))); + new GameAttackResponse(dto)); } } diff --git a/Server/src/SOR.Game/Handlers/GameConcedeHandler.cs b/Server/src/SOR.Game/Handlers/GameConcedeHandler.cs index 030c640..0911bde 100644 --- a/Server/src/SOR.Game/Handlers/GameConcedeHandler.cs +++ b/Server/src/SOR.Game/Handlers/GameConcedeHandler.cs @@ -43,8 +43,9 @@ internal sealed class GameConcedeHandler : GameHandlerBase, IMessageHandler var state = GameEngine.Deserialize(session.StateJson!); var newState = GameEngine.Concede(state, actorId); + var dto = GameEngine.ToDto(newState, actorId); await SaveStateAsync(_gameDb, session, newState, actorId, "game.concede", - JsonSerializer.Serialize(req), ct); + JsonSerializer.Serialize(req), ct, JsonSerializer.Serialize(dto)); var winnerId = session.PlayerOneAccountId.ToString() == actorId ? session.PlayerTwoAccountId @@ -59,6 +60,6 @@ internal sealed class GameConcedeHandler : GameHandlerBase, IMessageHandler ct); return ServerMessage.Reply("game.concede.ack", message.Seq, - new GameConcedeResponse(GameEngine.ToDto(newState, actorId))); + new GameConcedeResponse(dto)); } } diff --git a/Server/src/SOR.Game/Handlers/GameDrawHandler.cs b/Server/src/SOR.Game/Handlers/GameDrawHandler.cs index ea0cb8f..6a5ab61 100644 --- a/Server/src/SOR.Game/Handlers/GameDrawHandler.cs +++ b/Server/src/SOR.Game/Handlers/GameDrawHandler.cs @@ -38,12 +38,13 @@ internal sealed class GameDrawHandler : GameHandlerBase, IMessageHandler var (newState, drawn) = GameEngine.Draw(state, actorId); + var dto = GameEngine.ToDto(newState, actorId); await SaveStateAsync(_gameDb, session, newState, actorId, "game.draw", - JsonSerializer.Serialize(req), ct); + JsonSerializer.Serialize(req), ct, JsonSerializer.Serialize(dto)); await PushStateToPlayersAsync(_clientPush, session, newState, ct); return ServerMessage.Reply("game.draw.ack", message.Seq, - new GameDrawResponse(GameEngine.ToDto(newState, actorId))); + new GameDrawResponse(dto)); } } diff --git a/Server/src/SOR.Game/Handlers/GameEndTurnHandler.cs b/Server/src/SOR.Game/Handlers/GameEndTurnHandler.cs index a63bee2..26ba8ac 100644 --- a/Server/src/SOR.Game/Handlers/GameEndTurnHandler.cs +++ b/Server/src/SOR.Game/Handlers/GameEndTurnHandler.cs @@ -37,12 +37,13 @@ internal sealed class GameEndTurnHandler : GameHandlerBase, IMessageHandler var state = GameEngine.Deserialize(session.StateJson!); var newState = GameEngine.EndTurn(state, actorId); + var dto = GameEngine.ToDto(newState, actorId); await SaveStateAsync(_gameDb, session, newState, actorId, "game.end_turn", - JsonSerializer.Serialize(req), ct); + JsonSerializer.Serialize(req), ct, JsonSerializer.Serialize(dto)); await PushStateToPlayersAsync(_clientPush, session, newState, ct); return ServerMessage.Reply("game.end_turn.ack", message.Seq, - new GameEndTurnResponse(GameEngine.ToDto(newState, actorId))); + new GameEndTurnResponse(dto)); } } diff --git a/Server/src/SOR.Game/Handlers/GameHandlerBase.cs b/Server/src/SOR.Game/Handlers/GameHandlerBase.cs index 0d014c5..7a23f7a 100644 --- a/Server/src/SOR.Game/Handlers/GameHandlerBase.cs +++ b/Server/src/SOR.Game/Handlers/GameHandlerBase.cs @@ -62,7 +62,8 @@ internal abstract class GameHandlerBase string actorId, string actionType, string? payloadJson, - CancellationToken ct) + CancellationToken ct, + string? resultJson = null) { var seqNum = state.NextActionSequence++; // increment before serialize so the saved JSON reflects the consumed number session.StateJson = GameEngine.Serialize(state); @@ -72,6 +73,7 @@ internal abstract class GameHandlerBase ActorAccountId = Guid.Parse(actorId), ActionType = actionType, PayloadJson = payloadJson, + ResultJson = resultJson, SequenceNumber = seqNum, OccurredAt = DateTimeOffset.UtcNow, }); diff --git a/Server/src/SOR.Game/Handlers/GameMoveUnitHandler.cs b/Server/src/SOR.Game/Handlers/GameMoveUnitHandler.cs index b2b1c10..8a99d30 100644 --- a/Server/src/SOR.Game/Handlers/GameMoveUnitHandler.cs +++ b/Server/src/SOR.Game/Handlers/GameMoveUnitHandler.cs @@ -45,12 +45,13 @@ internal sealed class GameMoveUnitHandler : GameHandlerBase, IMessageHandler var target = new Coord(req.TargetPosition.X, req.TargetPosition.Y); var newState = GameEngine.MoveUnit(state, actorId, req.UnitInstanceId, target); + var dto = GameEngine.ToDto(newState, actorId); await SaveStateAsync(_gameDb, session, newState, actorId, "game.move_unit", - JsonSerializer.Serialize(req), ct); + JsonSerializer.Serialize(req), ct, JsonSerializer.Serialize(dto)); await PushStateToPlayersAsync(_clientPush, session, newState, ct); return ServerMessage.Reply("game.move_unit.ack", message.Seq, - new GameMoveUnitResponse(GameEngine.ToDto(newState, actorId))); + new GameMoveUnitResponse(dto)); } } diff --git a/Server/src/SOR.Game/Handlers/GamePlaceArchSpiritHandler.cs b/Server/src/SOR.Game/Handlers/GamePlaceArchSpiritHandler.cs index 7361760..bd1a4c5 100644 --- a/Server/src/SOR.Game/Handlers/GamePlaceArchSpiritHandler.cs +++ b/Server/src/SOR.Game/Handlers/GamePlaceArchSpiritHandler.cs @@ -49,12 +49,13 @@ internal sealed class GamePlaceArchSpiritHandler : GameHandlerBase, IMessageHand var coord = new Coord(req.Position.X, req.Position.Y); var (newState, _) = GameEngine.PlaceArchSpirit(state, actorId, coord); + var dto = GameEngine.ToDto(newState, actorId); await SaveStateAsync(_gameDb, session, newState, actorId, "game.place_arch_spirit", - JsonSerializer.Serialize(req), ct); + JsonSerializer.Serialize(req), ct, JsonSerializer.Serialize(dto)); await PushStateToPlayersAsync(_clientPush, session, newState, ct); return ServerMessage.Reply("game.place_arch_spirit.ack", message.Seq, - new GamePlaceArchSpiritResponse(GameEngine.ToDto(newState, actorId))); + new GamePlaceArchSpiritResponse(dto)); } } diff --git a/Server/src/SOR.Game/Handlers/GamePlayCardHandler.cs b/Server/src/SOR.Game/Handlers/GamePlayCardHandler.cs index ffa5d54..5f3e7fc 100644 --- a/Server/src/SOR.Game/Handlers/GamePlayCardHandler.cs +++ b/Server/src/SOR.Game/Handlers/GamePlayCardHandler.cs @@ -51,12 +51,12 @@ internal sealed class GamePlayCardHandler : GameHandlerBase, IMessageHandler var newState = GameEngine.ChannelCard(state, actorId, req.CardInstanceId, targets, req.Targets); + var dto = GameEngine.ToDto(newState, actorId); await SaveStateAsync(_gameDb, session, newState, actorId, "game.play_card", - JsonSerializer.Serialize(req), ct); + JsonSerializer.Serialize(req), ct, JsonSerializer.Serialize(dto)); await PushStateToPlayersAsync(_clientPush, session, newState, ct); - return ServerMessage.Reply("game.play_card.ack", message.Seq, - new GamePlayCardResponse(GameEngine.ToDto(newState, actorId))); + return ServerMessage.Reply("game.play_card.ack", message.Seq, new GamePlayCardResponse(dto)); } } diff --git a/Server/src/SOR.Game/Handlers/GameSacrificeHandler.cs b/Server/src/SOR.Game/Handlers/GameSacrificeHandler.cs index 6fad96b..ebcc740 100644 --- a/Server/src/SOR.Game/Handlers/GameSacrificeHandler.cs +++ b/Server/src/SOR.Game/Handlers/GameSacrificeHandler.cs @@ -44,12 +44,13 @@ internal sealed class GameSacrificeHandler : GameHandlerBase, IMessageHandler var state = GameEngine.Deserialize(session.StateJson!); var newState = GameEngine.Sacrifice(state, actorId, req.UnitInstanceId); + var dto = GameEngine.ToDto(newState, actorId); await SaveStateAsync(_gameDb, session, newState, actorId, "game.sacrifice", - JsonSerializer.Serialize(req), ct); + JsonSerializer.Serialize(req), ct, JsonSerializer.Serialize(dto)); await PushStateToPlayersAsync(_clientPush, session, newState, ct); return ServerMessage.Reply("game.sacrifice.ack", message.Seq, - new GameSacrificeResponse(GameEngine.ToDto(newState, actorId))); + new GameSacrificeResponse(dto)); } } diff --git a/Server/src/SOR.Game/Handlers/GameTransitionHandler.cs b/Server/src/SOR.Game/Handlers/GameTransitionHandler.cs index 446d343..33588d9 100644 --- a/Server/src/SOR.Game/Handlers/GameTransitionHandler.cs +++ b/Server/src/SOR.Game/Handlers/GameTransitionHandler.cs @@ -45,12 +45,13 @@ internal sealed class GameTransitionHandler : GameHandlerBase, IMessageHandler var state = GameEngine.Deserialize(session.StateJson!); var newState = GameEngine.Transition(state, actorId, req.IncomingCardInstanceId); + var dto = GameEngine.ToDto(newState, actorId); await SaveStateAsync(_gameDb, session, newState, actorId, "game.transition", - JsonSerializer.Serialize(req), ct); + JsonSerializer.Serialize(req), ct, JsonSerializer.Serialize(dto)); await PushStateToPlayersAsync(_clientPush, session, newState, ct); return ServerMessage.Reply("game.transition.ack", message.Seq, - new GameTransitionResponse(GameEngine.ToDto(newState, actorId))); + new GameTransitionResponse(dto)); } }