Client changes, admin portal, collection fixes.
This commit is contained in:
@@ -77,16 +77,10 @@ public sealed record GetCardsResponse(
|
||||
public sealed record PlayerCardDto(
|
||||
Guid PlayerCardId,
|
||||
Guid CardDefinitionId,
|
||||
string Name,
|
||||
string CardType,
|
||||
string Affinity,
|
||||
string Rarity,
|
||||
bool IsFoil,
|
||||
int? SerialNumber,
|
||||
DateTimeOffset AcquiredAt,
|
||||
string? ArtUrl,
|
||||
bool IsTradeable = true,
|
||||
int? Tier = null);
|
||||
bool IsTradeable = true);
|
||||
|
||||
public sealed record GetDecksResponse(IEnumerable<DeckSummaryDto> Decks);
|
||||
|
||||
@@ -94,7 +88,6 @@ public sealed record DeckSummaryDto(
|
||||
Guid Id,
|
||||
string Name,
|
||||
Guid ArchSpiritCardDefinitionId,
|
||||
string? ArchSpiritName,
|
||||
int CardCount,
|
||||
bool IsValid,
|
||||
DateTimeOffset CreatedAt,
|
||||
@@ -108,7 +101,6 @@ public sealed record DeckDetailDto(
|
||||
Guid Id,
|
||||
string Name,
|
||||
Guid ArchSpiritCardDefinitionId,
|
||||
string? ArchSpiritName,
|
||||
bool IsValid,
|
||||
DateTimeOffset CreatedAt,
|
||||
DateTimeOffset UpdatedAt,
|
||||
@@ -117,11 +109,6 @@ public sealed record DeckDetailDto(
|
||||
|
||||
public sealed record DeckCardDto(
|
||||
Guid CardDefinitionId,
|
||||
string Name,
|
||||
string CardType,
|
||||
string Affinity,
|
||||
string Rarity,
|
||||
string? ArtUrl,
|
||||
int Quantity,
|
||||
int OwnedCount);
|
||||
|
||||
|
||||
@@ -117,16 +117,10 @@ internal sealed class CollectionAddCardHandler : CollectionHandlerBase, IMessage
|
||||
|
||||
var warnings = await RefreshValidityAsync(_collectionDb, _catalogDb, deck, cancellationToken);
|
||||
|
||||
var archName = await _catalogDb.CardDefinitions
|
||||
.Where(cd => cd.Id == deck.ArchSpiritCardDefinitionId)
|
||||
.Select(cd => cd.Name)
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
|
||||
var summary = new DeckSummaryDto(
|
||||
Id: deck.Id,
|
||||
Name: deck.Name,
|
||||
ArchSpiritCardDefinitionId: deck.ArchSpiritCardDefinitionId,
|
||||
ArchSpiritName: archName,
|
||||
CardCount: deck.Cards.Sum(c => c.Quantity),
|
||||
IsValid: deck.IsValid,
|
||||
CreatedAt: deck.CreatedAt,
|
||||
|
||||
@@ -93,16 +93,10 @@ internal sealed class CollectionCloneDeckHandler : CollectionHandlerBase, IMessa
|
||||
// Revalidate the clone (ownership/validity may have changed since original was built).
|
||||
var warnings = await RefreshValidityAsync(_collectionDb, _catalogDb, clone, cancellationToken);
|
||||
|
||||
var archName = await _catalogDb.CardDefinitions
|
||||
.Where(cd => cd.Id == clone.ArchSpiritCardDefinitionId)
|
||||
.Select(cd => cd.Name)
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
|
||||
var summary = new DeckSummaryDto(
|
||||
Id: clone.Id,
|
||||
Name: clone.Name,
|
||||
ArchSpiritCardDefinitionId: clone.ArchSpiritCardDefinitionId,
|
||||
ArchSpiritName: archName,
|
||||
CardCount: original.Cards.Sum(c => c.Quantity),
|
||||
IsValid: clone.IsValid,
|
||||
CreatedAt: clone.CreatedAt,
|
||||
|
||||
@@ -92,7 +92,6 @@ internal sealed class CollectionCreateDeckHandler : CollectionHandlerBase, IMess
|
||||
Id: deck.Id,
|
||||
Name: deck.Name,
|
||||
ArchSpiritCardDefinitionId: deck.ArchSpiritCardDefinitionId,
|
||||
ArchSpiritName: archDef.Name,
|
||||
CardCount: 0,
|
||||
IsValid: false,
|
||||
CreatedAt: deck.CreatedAt,
|
||||
|
||||
@@ -80,29 +80,14 @@ internal sealed class CollectionGetCardsHandler : CollectionHandlerBase, IMessag
|
||||
.Take(pageSize)
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
// Batch-fetch definitions from catalog schema.
|
||||
var definitions = await LoadDefinitionsAsync(
|
||||
_catalogDb,
|
||||
playerCards.Select(pc => pc.CardDefinitionId),
|
||||
cancellationToken);
|
||||
|
||||
var dtos = playerCards.Select(pc =>
|
||||
{
|
||||
definitions.TryGetValue(pc.CardDefinitionId, out var def);
|
||||
return new PlayerCardDto(
|
||||
new PlayerCardDto(
|
||||
PlayerCardId: pc.Id,
|
||||
CardDefinitionId: pc.CardDefinitionId,
|
||||
Name: def?.Name ?? "Unknown",
|
||||
CardType: def?.CardType.ToString() ?? "Unknown",
|
||||
Affinity: def?.Affinity.ToString() ?? "Unknown",
|
||||
Rarity: def?.Rarity.ToString() ?? "Unknown",
|
||||
IsFoil: pc.IsFoil,
|
||||
SerialNumber: pc.SerialNumber,
|
||||
AcquiredAt: pc.AcquiredAt,
|
||||
ArtUrl: GetArtUrl(def),
|
||||
IsTradeable: pc.IsTradeable,
|
||||
Tier: def?.Tier ?? 1);
|
||||
});
|
||||
IsTradeable: pc.IsTradeable));
|
||||
|
||||
return ServerMessage.Reply(
|
||||
"collection.get_cards.ack",
|
||||
|
||||
@@ -15,16 +15,13 @@ internal sealed class CollectionGetDeckHandler : CollectionHandlerBase, IMessage
|
||||
{
|
||||
private readonly IMessageSerializer _serializer;
|
||||
private readonly CollectionDbContext _collectionDb;
|
||||
private readonly CatalogDbContext _catalogDb;
|
||||
|
||||
public CollectionGetDeckHandler(
|
||||
IMessageSerializer serializer,
|
||||
CollectionDbContext collectionDb,
|
||||
CatalogDbContext catalogDb)
|
||||
CollectionDbContext collectionDb)
|
||||
{
|
||||
_serializer = serializer;
|
||||
_collectionDb = collectionDb;
|
||||
_catalogDb = catalogDb;
|
||||
}
|
||||
|
||||
public string MessageType => "collection.get_deck";
|
||||
@@ -46,42 +43,24 @@ internal sealed class CollectionGetDeckHandler : CollectionHandlerBase, IMessage
|
||||
if (deck == null)
|
||||
return ServerMessage.Error(message.Seq, "DECK_NOT_FOUND", "Deck not found.");
|
||||
|
||||
// Batch-load definitions for all cards + the ArchSpirit.
|
||||
var allDefIds = deck.Cards
|
||||
.Select(c => c.CardDefinitionId)
|
||||
.Append(deck.ArchSpiritCardDefinitionId)
|
||||
.Distinct();
|
||||
|
||||
var definitions = await LoadDefinitionsAsync(_catalogDb, allDefIds, cancellationToken);
|
||||
var ownedCounts = await GetOwnedCountsAsync(
|
||||
_collectionDb,
|
||||
accountId,
|
||||
deck.Cards.Select(c => c.CardDefinitionId),
|
||||
cancellationToken);
|
||||
|
||||
definitions.TryGetValue(deck.ArchSpiritCardDefinitionId, out var archDef);
|
||||
|
||||
var cardDtos = deck.Cards
|
||||
.OrderBy(c => definitions.TryGetValue(c.CardDefinitionId, out var d) ? d.Name : "")
|
||||
.OrderBy(c => c.CardDefinitionId)
|
||||
.Select(c =>
|
||||
{
|
||||
definitions.TryGetValue(c.CardDefinitionId, out var def);
|
||||
return new DeckCardDto(
|
||||
new DeckCardDto(
|
||||
CardDefinitionId: c.CardDefinitionId,
|
||||
Name: def?.Name ?? "Unknown",
|
||||
CardType: def?.CardType.ToString() ?? "Unknown",
|
||||
Affinity: def?.Affinity.ToString() ?? "Unknown",
|
||||
Rarity: def?.Rarity.ToString() ?? "Unknown",
|
||||
ArtUrl: GetArtUrl(def),
|
||||
Quantity: c.Quantity,
|
||||
OwnedCount: ownedCounts.GetValueOrDefault(c.CardDefinitionId));
|
||||
});
|
||||
OwnedCount: ownedCounts.GetValueOrDefault(c.CardDefinitionId)));
|
||||
|
||||
var dto = new DeckDetailDto(
|
||||
Id: deck.Id,
|
||||
Name: deck.Name,
|
||||
ArchSpiritCardDefinitionId: deck.ArchSpiritCardDefinitionId,
|
||||
ArchSpiritName: archDef?.Name,
|
||||
IsValid: deck.IsValid,
|
||||
CreatedAt: deck.CreatedAt,
|
||||
UpdatedAt: deck.UpdatedAt,
|
||||
|
||||
@@ -13,14 +13,10 @@ using SOR.Shared.Networking;
|
||||
internal sealed class CollectionGetDecksHandler : CollectionHandlerBase, IMessageHandler
|
||||
{
|
||||
private readonly CollectionDbContext _collectionDb;
|
||||
private readonly CatalogDbContext _catalogDb;
|
||||
|
||||
public CollectionGetDecksHandler(
|
||||
CollectionDbContext collectionDb,
|
||||
CatalogDbContext catalogDb)
|
||||
public CollectionGetDecksHandler(CollectionDbContext collectionDb)
|
||||
{
|
||||
_collectionDb = collectionDb;
|
||||
_catalogDb = catalogDb;
|
||||
}
|
||||
|
||||
public string MessageType => "collection.get_decks";
|
||||
@@ -47,17 +43,10 @@ internal sealed class CollectionGetDecksHandler : CollectionHandlerBase, IMessag
|
||||
})
|
||||
.ToListAsync(cancellationToken);
|
||||
|
||||
// Batch-fetch ArchSpirit names from catalog.
|
||||
var archIds = decks.Select(d => d.ArchSpiritCardDefinitionId).Distinct().ToList();
|
||||
var archNames = await _catalogDb.CardDefinitions
|
||||
.Where(cd => archIds.Contains(cd.Id))
|
||||
.ToDictionaryAsync(cd => cd.Id, cd => cd.Name, cancellationToken);
|
||||
|
||||
var summaries = decks.Select(d => new DeckSummaryDto(
|
||||
Id: d.Id,
|
||||
Name: d.Name,
|
||||
ArchSpiritCardDefinitionId: d.ArchSpiritCardDefinitionId,
|
||||
ArchSpiritName: archNames.GetValueOrDefault(d.ArchSpiritCardDefinitionId),
|
||||
CardCount: d.CardCount,
|
||||
IsValid: d.IsValid,
|
||||
CreatedAt: d.CreatedAt,
|
||||
|
||||
@@ -66,16 +66,10 @@ internal sealed class CollectionRemoveCardHandler : CollectionHandlerBase, IMess
|
||||
|
||||
var warnings = await RefreshValidityAsync(_collectionDb, _catalogDb, deck, cancellationToken);
|
||||
|
||||
var archName = await _catalogDb.CardDefinitions
|
||||
.Where(cd => cd.Id == deck.ArchSpiritCardDefinitionId)
|
||||
.Select(cd => cd.Name)
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
|
||||
var summary = new DeckSummaryDto(
|
||||
Id: deck.Id,
|
||||
Name: deck.Name,
|
||||
ArchSpiritCardDefinitionId: deck.ArchSpiritCardDefinitionId,
|
||||
ArchSpiritName: archName,
|
||||
CardCount: deck.Cards.Sum(c => c.Quantity),
|
||||
IsValid: deck.IsValid,
|
||||
CreatedAt: deck.CreatedAt,
|
||||
|
||||
@@ -13,16 +13,13 @@ internal sealed class CollectionRenameDeckHandler : CollectionHandlerBase, IMess
|
||||
{
|
||||
private readonly IMessageSerializer _serializer;
|
||||
private readonly CollectionDbContext _collectionDb;
|
||||
private readonly CatalogDbContext _catalogDb;
|
||||
|
||||
public CollectionRenameDeckHandler(
|
||||
IMessageSerializer serializer,
|
||||
CollectionDbContext collectionDb,
|
||||
CatalogDbContext catalogDb)
|
||||
CollectionDbContext collectionDb)
|
||||
{
|
||||
_serializer = serializer;
|
||||
_collectionDb = collectionDb;
|
||||
_catalogDb = catalogDb;
|
||||
}
|
||||
|
||||
public string MessageType => "collection.rename_deck";
|
||||
@@ -51,16 +48,10 @@ internal sealed class CollectionRenameDeckHandler : CollectionHandlerBase, IMess
|
||||
deck.UpdatedAt = DateTimeOffset.UtcNow;
|
||||
await _collectionDb.SaveChangesAsync(cancellationToken);
|
||||
|
||||
var archName = await _catalogDb.CardDefinitions
|
||||
.Where(cd => cd.Id == deck.ArchSpiritCardDefinitionId)
|
||||
.Select(cd => cd.Name)
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
|
||||
var summary = new DeckSummaryDto(
|
||||
Id: deck.Id,
|
||||
Name: deck.Name,
|
||||
ArchSpiritCardDefinitionId: deck.ArchSpiritCardDefinitionId,
|
||||
ArchSpiritName: archName,
|
||||
CardCount: deck.Cards.Sum(c => c.Quantity),
|
||||
IsValid: deck.IsValid,
|
||||
CreatedAt: deck.CreatedAt,
|
||||
|
||||
@@ -138,16 +138,10 @@ internal sealed class CollectionSelectStarterDeckHandler : CollectionHandlerBase
|
||||
await _identityDb.SaveChangesAsync(cancellationToken);
|
||||
|
||||
// ── Build response ────────────────────────────────────────────────────
|
||||
var archName = await _catalogDb.CardDefinitions
|
||||
.Where(cd => cd.Id == deck.ArchSpiritCardDefinitionId)
|
||||
.Select(cd => cd.Name)
|
||||
.FirstOrDefaultAsync(cancellationToken);
|
||||
|
||||
var summary = new DeckSummaryDto(
|
||||
Id: deck.Id,
|
||||
Name: deck.Name,
|
||||
ArchSpiritCardDefinitionId: deck.ArchSpiritCardDefinitionId,
|
||||
ArchSpiritName: archName,
|
||||
CardCount: starterDeck.Cards.Sum(c => c.Quantity),
|
||||
IsValid: deck.IsValid,
|
||||
CreatedAt: deck.CreatedAt,
|
||||
|
||||
Reference in New Issue
Block a user