Merge pull request #75 from cmu-sei/next

3.6.8
cmu-sei · Nov 18, 2022 · 5eef9d2 · 5eef9d2
2 parents 734fa12 + 2dcfea4
commit 5eef9d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Gameboard.Api/Features/UnityGames/UnityGameExceptions.cs b/src/Gameboard.Api/Features/UnityGames/UnityGameExceptions.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Gameboard.Api.Features.UnityGames;
 
@@ -7,7 +9,7 @@ public class TeamHasNoPlayersException : Exception { }
 
 internal class ChallengeResolutionFailure : GameboardException
 {
-    public ChallengeResolutionFailure(string teamId) : base($"Couldn't resolve a Unity challenge for team {teamId}") { }
+    public ChallengeResolutionFailure(string teamId, IEnumerable<string> challengeIds) : base($"Couldn't resolve a Unity challenge for team {teamId}. They have {challengeIds.Count()} challenges ({String.Join(" | ", challengeIds)})") { }
 }
 
 internal class SemaphoreLockFailure : GameboardException

diff --git a/src/Gameboard.Api/Features/UnityGames/UnityGameService.cs b/src/Gameboard.Api/Features/UnityGames/UnityGameService.cs
@@ -197,7 +197,7 @@ public async Task DeleteChallengeData(string gameId)
 
         if (challengeCandidates.Count() != 1)
         {
-            throw new ChallengeResolutionFailure(model.TeamId);
+            throw new ChallengeResolutionFailure(model.TeamId, challengeCandidates.Select(c => c.Id));
         }
 
         // if we return null to the controller above, it interprets this as an "ok cool, we already have this one"