minor admin portal changes
This commit is contained in:
@@ -6,13 +6,17 @@ namespace SOR.Collection;
|
||||
/// Paginated list of all cards the authenticated player owns.
|
||||
/// NameFilter: case-insensitive substring match on card name (optional).
|
||||
/// CardTypeFilter / AffinityFilter: exact enum name match (optional).
|
||||
/// TierFilter: when set, only returns cards whose Tier equals this value
|
||||
/// (null Tier is treated as 1). Useful combined with CardTypeFilter="ArchSpirit"
|
||||
/// to show only Tier-1 commanders or only Tier-2+ ascension targets.
|
||||
/// </summary>
|
||||
public sealed record GetCardsRequest(
|
||||
int Page = 1,
|
||||
int PageSize = 50,
|
||||
string? NameFilter = null,
|
||||
string? CardTypeFilter = null,
|
||||
string? AffinityFilter = null);
|
||||
string? AffinityFilter = null,
|
||||
int? TierFilter = null);
|
||||
|
||||
/// <summary>Returns all decks for the authenticated player (summaries only).</summary>
|
||||
public sealed record GetDecksRequest; // no fields — identity from connection
|
||||
@@ -81,7 +85,8 @@ public sealed record PlayerCardDto(
|
||||
int? SerialNumber,
|
||||
DateTimeOffset AcquiredAt,
|
||||
string? ArtUrl,
|
||||
bool IsTradeable = true);
|
||||
bool IsTradeable = true,
|
||||
int? Tier = null);
|
||||
|
||||
public sealed record GetDecksResponse(IEnumerable<DeckSummaryDto> Decks);
|
||||
|
||||
|
||||
@@ -47,10 +47,11 @@ internal sealed class CollectionGetCardsHandler : CollectionHandlerBase, IMessag
|
||||
var query = _collectionDb.PlayerCards
|
||||
.Where(pc => pc.AccountId == accountId);
|
||||
|
||||
// Cross-context name/type filter: first resolve matching definition IDs from catalog.
|
||||
// Cross-context name/type/tier filter: first resolve matching definition IDs from catalog.
|
||||
if (!string.IsNullOrWhiteSpace(req.NameFilter)
|
||||
|| !string.IsNullOrWhiteSpace(req.CardTypeFilter)
|
||||
|| !string.IsNullOrWhiteSpace(req.AffinityFilter))
|
||||
|| !string.IsNullOrWhiteSpace(req.AffinityFilter)
|
||||
|| req.TierFilter.HasValue)
|
||||
{
|
||||
var defQuery = _catalogDb.CardDefinitions.AsQueryable();
|
||||
if (!string.IsNullOrWhiteSpace(req.NameFilter))
|
||||
@@ -61,6 +62,11 @@ internal sealed class CollectionGetCardsHandler : CollectionHandlerBase, IMessag
|
||||
if (!string.IsNullOrWhiteSpace(req.AffinityFilter)
|
||||
&& Enum.TryParse<Affinity>(req.AffinityFilter, true, out var af))
|
||||
defQuery = defQuery.Where(cd => cd.Affinity == af);
|
||||
if (req.TierFilter.HasValue)
|
||||
// Null Tier in the DB is treated as Tier 1.
|
||||
defQuery = defQuery.Where(cd =>
|
||||
cd.Tier == req.TierFilter.Value
|
||||
|| (req.TierFilter.Value == 1 && cd.Tier == null));
|
||||
|
||||
var matchingIds = await defQuery.Select(cd => cd.Id).ToListAsync(cancellationToken);
|
||||
query = query.Where(pc => matchingIds.Contains(pc.CardDefinitionId));
|
||||
@@ -94,7 +100,8 @@ internal sealed class CollectionGetCardsHandler : CollectionHandlerBase, IMessag
|
||||
SerialNumber: pc.SerialNumber,
|
||||
AcquiredAt: pc.AcquiredAt,
|
||||
ArtUrl: GetArtUrl(def),
|
||||
IsTradeable: pc.IsTradeable);
|
||||
IsTradeable: pc.IsTradeable,
|
||||
Tier: def?.Tier ?? 1);
|
||||
});
|
||||
|
||||
return ServerMessage.Reply(
|
||||
|
||||
Reference in New Issue
Block a user