Resolve #549

cmu-sei · Nov 19, 2024 · a554d7e · a554d7e
1 parent 75789b0
commit a554d7e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 34 deletions.
diff --git a/src/Gameboard.Api/Features/Admin/Requests/GetGameCenterContext/GetGameCenterContext.cs b/src/Gameboard.Api/Features/Admin/Requests/GetGameCenterContext/GetGameCenterContext.cs
@@ -16,32 +16,22 @@ namespace Gameboard.Api.Features.Admin;
 
 public record GetGameCenterContextQuery(string GameId) : IRequest<GameCenterContext>;
 
-internal class GetGameCenterContextHandler : IRequestHandler<GetGameCenterContextQuery, GameCenterContext>
+internal class GetGameCenterContextHandler
+(
+    EntityExistsValidator<GetGameCenterContextQuery, Data.Game> gameExists,
+    INowService now,
+    IStore store,
+    ITeamService teamService,
+    TicketService ticketService,
+    IValidatorService<GetGameCenterContextQuery> validator
+) : IRequestHandler<GetGameCenterContextQuery, GameCenterContext>
 {
-    private readonly EntityExistsValidator<GetGameCenterContextQuery, Data.Game> _gameExists;
-    private readonly INowService _now;
-    private readonly IStore _store;
-    private readonly ITeamService _teamService;
-    private readonly TicketService _ticketService;
-    private readonly IValidatorService<GetGameCenterContextQuery> _validator;
-
-    public GetGameCenterContextHandler
-    (
-        EntityExistsValidator<GetGameCenterContextQuery, Data.Game> gameExists,
-        INowService now,
-        IStore store,
-        ITeamService teamService,
-        TicketService ticketService,
-        IValidatorService<GetGameCenterContextQuery> validator
-    )
-    {
-        _gameExists = gameExists;
-        _now = now;
-        _store = store;
-        _teamService = teamService;
-        _ticketService = ticketService;
-        _validator = validator;
-    }
+    private readonly EntityExistsValidator<GetGameCenterContextQuery, Data.Game> _gameExists = gameExists;
+    private readonly INowService _now = now;
+    private readonly IStore _store = store;
+    private readonly ITeamService _teamService = teamService;
+    private readonly TicketService _ticketService = ticketService;
+    private readonly IValidatorService<GetGameCenterContextQuery> _validator = validator;
 
     public async Task<GameCenterContext> Handle(GetGameCenterContextQuery request, CancellationToken cancellationToken)
     {
@@ -86,8 +76,11 @@ await _validator
             })
             .SingleOrDefaultAsync(cancellationToken);
 
-        var openTicketCount = await _ticketService
-            .GetGameOpenTickets(request.GameId)
+        var gameTotalTicketCount = await _ticketService
+            .GetGameTicketsQuery(request.GameId)
+            .CountAsync(cancellationToken);
+        var gameOpenTicketCount = await _ticketService
+            .GetGameOpenTicketsQuery(request.GameId)
             .CountAsync(cancellationToken);
 
         var topScore = await _store
@@ -185,7 +178,8 @@ await _validator
             // aggregates
             ChallengeCount = challengeData?.ChallengeCount ?? 0,
             PointsAvailable = challengeData?.PointsAvailable ?? 0,
-            OpenTicketCount = openTicketCount
+            OpenTicketCount = gameTotalTicketCount,
+            TotalTicketCount = gameTotalTicketCount
         };
     }
 }
diff --git a/src/Gameboard.Api/Features/Admin/Requests/GetGameCenterContext/GetGameCenterContextModels.cs b/src/Gameboard.Api/Features/Admin/Requests/GetGameCenterContext/GetGameCenterContextModels.cs
@@ -15,6 +15,7 @@ public sealed class GameCenterContext
 
     public required int ChallengeCount { get; set; }
     public required int OpenTicketCount { get; set; }
+    public required int TotalTicketCount { get; set; }
 
     public required bool HasScoreboard { get; set; }
     public required bool IsExternal { get; set; }

diff --git a/src/Gameboard.Api/Features/Ticket/TicketService.cs b/src/Gameboard.Api/Features/Ticket/TicketService.cs
@@ -150,13 +150,13 @@ await _mediator.Publish(new TicketCreatedNotification
         return createdTicketModel;
     }
 
-    public IQueryable<Data.Ticket> GetGameOpenTickets(string gameId)
-    {
-        return _store
+    public IQueryable<Data.Ticket> GetGameTicketsQuery(string gameId)
+        => _store
             .WithNoTracking<Data.Ticket>()
-            .Where(t => t.Challenge.GameId == gameId || t.Player.Challenges.Any(c => c.GameId == gameId))
-            .Where(t => t.Status != "Closed");
-    }
+            .Where(t => t.Challenge.GameId == gameId || t.Player.Challenges.Any(c => c.GameId == gameId));
+
+    public IQueryable<Data.Ticket> GetGameOpenTicketsQuery(string gameId)
+        => GetGameTicketsQuery(gameId).Where(t => t.Status != "Closed");
 
     public IQueryable<Data.Ticket> GetTeamTickets(IEnumerable<string> teamIds)
         => _store