Phase 6: GameGetLobbyHandler + CustomLobbyDetailDto
- game.custom.get returns full CustomLobbyDetailDto: all effective rules (overrides merged with GameRules.Default), host/guest account IDs, status, GameSessionId. - CustomLobbyDetailDto includes Status string, GuestAccountId (nullable), GameSessionId (nullable); richer than the browse-list CustomLobbyDto. - GetCustomLobbyRequest / GetCustomLobbyResponse added to GameMessages.cs. - ServiceRegistration: registered GameGetLobbyHandler as transient IMessageHandler. 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:
@@ -124,6 +124,9 @@ public sealed record JoinCustomLobbyRequest(Guid LobbyId, Guid DeckId, string? P
|
||||
/// <summary>Leave or cancel a custom lobby.</summary>
|
||||
public sealed record LeaveCustomLobbyRequest(Guid LobbyId);
|
||||
|
||||
/// <summary>Fetch full details for a specific custom lobby.</summary>
|
||||
public sealed record GetCustomLobbyRequest(Guid LobbyId);
|
||||
|
||||
// ── Preset requests ───────────────────────────────────────────────────────────
|
||||
|
||||
/// <summary>Save the current lobby's rule overrides as a named preset (participants only).</summary>
|
||||
@@ -207,6 +210,8 @@ public sealed record JoinCustomLobbyResponse(
|
||||
|
||||
public sealed record LeaveCustomLobbyResponse(Guid LobbyId);
|
||||
|
||||
public sealed record GetCustomLobbyResponse(CustomLobbyDetailDto Lobby);
|
||||
|
||||
// ── Preset responses ──────────────────────────────────────────────────────────
|
||||
|
||||
public sealed record SavePresetResponse(Guid PresetId, string Name);
|
||||
@@ -395,6 +400,20 @@ public sealed record CustomLobbyDto(
|
||||
CustomRulesDto Rules,
|
||||
DateTimeOffset CreatedAt);
|
||||
|
||||
/// <summary>
|
||||
/// Detailed view of a custom lobby, including full rule set and participant presence.
|
||||
/// Returned by game.custom.get.
|
||||
/// </summary>
|
||||
public sealed record CustomLobbyDetailDto(
|
||||
Guid LobbyId,
|
||||
string LobbyName,
|
||||
string Status, // Open | Full | Started | Cancelled
|
||||
Guid HostAccountId,
|
||||
Guid? GuestAccountId,
|
||||
CustomRulesDto Rules,
|
||||
DateTimeOffset CreatedAt,
|
||||
Guid? GameSessionId);
|
||||
|
||||
public sealed record CustomRulesDto(
|
||||
int OpeningHandSize,
|
||||
bool FirstPlayerSkipsDraw,
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
namespace SOR.Game.Handlers;
|
||||
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SOR.Database.Contexts;
|
||||
using SOR.Networking.Abstractions.Messaging;
|
||||
using SOR.Networking.Abstractions.Transport;
|
||||
using SOR.Shared.Networking;
|
||||
|
||||
/// <summary>
|
||||
/// game.custom.get — returns full detail for a specific custom lobby.
|
||||
/// Includes effective rules (overrides merged with GameRules.Default),
|
||||
/// host/guest account IDs, and status.
|
||||
/// </summary>
|
||||
internal sealed class GameGetLobbyHandler : GameHandlerBase, IMessageHandler
|
||||
{
|
||||
private readonly IMessageSerializer _serializer;
|
||||
private readonly GameDbContext _gameDb;
|
||||
|
||||
public GameGetLobbyHandler(IMessageSerializer serializer, GameDbContext gameDb)
|
||||
{
|
||||
_serializer = serializer;
|
||||
_gameDb = gameDb;
|
||||
}
|
||||
|
||||
public string MessageType => "game.custom.get";
|
||||
|
||||
public async Task<IServerMessage?> HandleAsync(
|
||||
IClientMessage message,
|
||||
AuthenticatedConnection connection,
|
||||
CancellationToken ct)
|
||||
{
|
||||
var req = _serializer.DeserializePayload<GetCustomLobbyRequest>(message.Payload);
|
||||
|
||||
var lobby = await _gameDb.CustomLobbies
|
||||
.AsNoTracking()
|
||||
.Where(l => l.Id == req.LobbyId)
|
||||
.SingleOrDefaultAsync(ct)
|
||||
?? throw new GameException("LOBBY_NOT_FOUND");
|
||||
|
||||
var rules = GameCreateCustomLobbyHandler.ToDto(new GameRules
|
||||
{
|
||||
OpeningHandSize = lobby.OpeningHandSizeOverride ?? GameRules.Default.OpeningHandSize,
|
||||
FirstPlayerSkipsDraw = lobby.FirstPlayerSkipsDrawOverride ?? GameRules.Default.FirstPlayerSkipsDraw,
|
||||
SpAccumulationPerTurn = lobby.SpAccumulationPerTurnOverride ?? GameRules.Default.SpAccumulationPerTurn,
|
||||
DrawPerTurn = lobby.DrawPerTurnOverride ?? GameRules.Default.DrawPerTurn,
|
||||
SpHasCap = lobby.SpHasCapOverride ?? GameRules.Default.SpHasCap,
|
||||
SpCap = lobby.SpCapOverride ?? GameRules.Default.SpCap,
|
||||
BoardWidth = lobby.BoardWidthOverride ?? GameRules.Default.BoardWidth,
|
||||
BoardHeight = lobby.BoardHeightOverride ?? GameRules.Default.BoardHeight,
|
||||
HandSizeCap = lobby.HandSizeCapOverride ?? GameRules.Default.HandSizeCap,
|
||||
DiscardOnMaxHand = lobby.DiscardOnMaxHandOverride ?? GameRules.Default.DiscardOnMaxHand,
|
||||
MaxDeckSize = lobby.MaxDeckSizeOverride ?? GameRules.Default.MaxDeckSize,
|
||||
MinDeckSize = lobby.MinDeckSizeOverride ?? GameRules.Default.MinDeckSize,
|
||||
MaxArchTier1 = lobby.MaxArchTier1Override ?? GameRules.Default.MaxArchTier1,
|
||||
TurnTimerSeconds = lobby.TurnTimerSecondsOverride ?? GameRules.Default.TurnTimerSeconds,
|
||||
TimeLimitMinutes = lobby.TimeLimitMinutesOverride ?? GameRules.Default.TimeLimitMinutes,
|
||||
TurnLimit = lobby.TurnLimitOverride ?? GameRules.Default.TurnLimit,
|
||||
MpBuff = lobby.MpBuffOverride ?? GameRules.Default.MpBuff,
|
||||
}, lobby.Password != null);
|
||||
|
||||
var dto = new CustomLobbyDetailDto(
|
||||
LobbyId : lobby.Id,
|
||||
LobbyName : lobby.Name,
|
||||
Status : lobby.Status.ToString(),
|
||||
HostAccountId : lobby.HostAccountId,
|
||||
GuestAccountId: lobby.GuestAccountId,
|
||||
Rules : rules,
|
||||
CreatedAt : lobby.CreatedAt,
|
||||
GameSessionId : lobby.GameSessionId);
|
||||
|
||||
return ServerMessage.Reply("game.custom.get.ack", message.Seq,
|
||||
new GetCustomLobbyResponse(dto));
|
||||
}
|
||||
}
|
||||
@@ -56,6 +56,7 @@ public static class ServiceRegistration
|
||||
services.AddTransient<IMessageHandler, GameJoinCustomLobbyHandler>();
|
||||
services.AddTransient<IMessageHandler, GameLeaveCustomLobbyHandler>();
|
||||
services.AddTransient<IMessageHandler, GameListCustomLobbiesHandler>();
|
||||
services.AddTransient<IMessageHandler, GameGetLobbyHandler>();
|
||||
|
||||
// Spectator handlers
|
||||
services.AddTransient<IMessageHandler, GameSpectateHandler>();
|
||||
|
||||
Reference in New Issue
Block a user