Fix enrollment report unstarted teams calc. Fix challenge launch fail…

…ure after an attempt that is canceled
cmu-sei · Jan 15, 2025 · 9848b05 · 9848b05
1 parent 0f3ea4f
commit 9848b05
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 24 deletions.
diff --git a/src/Gameboard.Api/Features/Challenge/Services/ChallengeService.cs b/src/Gameboard.Api/Features/Challenge/Services/ChallengeService.cs
@@ -136,32 +136,33 @@ public async Task<Challenge> Create(NewChallenge model, string actorId, string g
             TeamId = player.TeamId,
             Specs = []
         });
-
         _launchCache.TryGetValue(player.TeamId, out var entry);
 
-        if (entry.Specs.Any(s => s.SpecId == model.SpecId))
-        {
-            throw new ChallengeStartPending();
-        }
-        else
+        try
         {
-            entry.Specs.Add(new ChallengeLaunchCacheEntrySpec { GameId = player.GameId, SpecId = model.SpecId });
-        }
+            cancellationToken.ThrowIfCancellationRequested();
+
+            if (entry.Specs.Any(s => s.SpecId == model.SpecId))
+            {
+                throw new ChallengeStartPending();
+            }
+            else
+            {
+                entry.Specs.Add(new ChallengeLaunchCacheEntrySpec { GameId = player.GameId, SpecId = model.SpecId });
+            }
 
-        var spec = await _store
-            .WithNoTracking<Data.ChallengeSpec>()
-            .SingleAsync(s => s.Id == model.SpecId, cancellationToken);
+            var spec = await _store
+                .WithNoTracking<Data.ChallengeSpec>()
+                .SingleAsync(s => s.Id == model.SpecId, cancellationToken);
 
-        var playerCount = 1;
-        if (player.Game.AllowTeam)
-        {
-            playerCount = await _store
-                .WithNoTracking<Data.Player>()
-                .CountAsync(p => p.TeamId == player.TeamId, cancellationToken);
-        }
+            var playerCount = 1;
+            if (player.Game.AllowTeam)
+            {
+                playerCount = await _store
+                    .WithNoTracking<Data.Player>()
+                    .CountAsync(p => p.TeamId == player.TeamId, cancellationToken);
+            }
 
-        try
-        {
             var challenge = await BuildAndRegisterChallenge(model, spec, player.Game, player, actorId, graderUrl, playerCount, model.Variant);
 
             await _store.Create(challenge, cancellationToken);
@@ -171,7 +172,7 @@ public async Task<Challenge> Create(NewChallenge model, string actorId, string g
         }
         catch (Exception ex)
         {
-            Logger.LogWarning(message: "Challenge registration failure: {exName} -- {exMessage}", ex.GetType().Name, ex.Message);
+            Logger.LogWarning("Challenge registration failure: {exName} -- {exMessage}", ex.GetType().Name, ex.Message);
             throw;
         }
         finally

diff --git a/src/Gameboard.Api/Features/Reports/Queries/EnrollmentReport/EnrollmentReportService.cs b/src/Gameboard.Api/Features/Reports/Queries/EnrollmentReport/EnrollmentReportService.cs
@@ -229,20 +229,23 @@ public async Task<EnrollmentReportStatSummary> GetSummaryStats(EnrollmentReportP
             }
         }
 
+        var distinctTeamIds = rawResults.Select(r => r.Player.TeamId).Distinct().ToArray();
         var noChallengeStartedPlayers = rawResults.Where(r => r.ChallengesStarted == 0);
         var noSessionPlayers = rawResults.Where(r => r.Player.SessionBegin.IsEmpty());
+        var teamsWithSession = rawResults.Where(r => r.Player.SessionBegin.IsNotEmpty()).Select(p => p.Player.TeamId).Distinct().Count();
+        var startedChallengeTeamsCount = distinctTeamIds.Length - rawResults.Where(p => p.ChallengesStarted > 0).Select(r => r.Player.TeamId).Distinct().Count();
 
         return new EnrollmentReportStatSummary
         {
             DistinctGameCount = rawResults.Select(r => r.Player.GameId).Distinct().Count(),
             DistinctPlayerCount = rawResults.Select(r => r.Player.UserId).Distinct().Count(),
             DistinctSponsorCount = rawResults.Select(r => r.Player.SponsorId).Distinct().Count(),
-            DistinctTeamCount = rawResults.Select(r => r.Player.TeamId).Distinct().Count(),
+            DistinctTeamCount = distinctTeamIds.Length,
             SponsorWithMostPlayers = sponsorWithMostPlayers,
             PlayersWithNoSessionCount = noSessionPlayers.Select(r => r.Player.UserId).Distinct().Count(),
             PlayersWithNoStartedChallengeCount = noChallengeStartedPlayers.Select(r => r.Player.UserId).Distinct().Count(),
-            TeamsWithNoSessionCount = noSessionPlayers.Select(r => r.Player.TeamId).Distinct().Count(),
-            TeamsWithNoStartedChallengeCount = noChallengeStartedPlayers.Select(r => r.Player.TeamId).Distinct().Count()
+            TeamsWithNoSessionCount = distinctTeamIds.Length - teamsWithSession,
+            TeamsWithNoStartedChallengeCount = distinctTeamIds.Length - startedChallengeTeamsCount
         };
     }