fix: incorrect scoreboard

GZTimeWalker · Aug 31, 2024 · 84b5105 · 84b5105
1 parent 1d991fe
commit 84b5105
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/src/GZCTF/ClientApp/package.json b/src/GZCTF/ClientApp/package.json
@@ -71,7 +71,7 @@
     "@typescript-eslint/eslint-plugin": "^8.3.0",
     "@typescript-eslint/parser": "^8.3.0",
     "@vitejs/plugin-react": "^4.3.1",
-    "axios": "^1.7.5",
+    "axios": "^1.7.6",
     "babel-plugin-prismjs": "^2.1.0",
     "eslint": "^9.9.1",
     "eslint-plugin-oxlint": "^0.9.1",

diff --git a/src/GZCTF/ClientApp/pnpm-lock.yaml b/src/GZCTF/ClientApp/pnpm-lock.yaml
diff --git a/src/GZCTF/Repositories/GameRepository.cs b/src/GZCTF/Repositories/GameRepository.cs
@@ -140,9 +140,7 @@ public Task<Game[]> GetGames(int count, int skip, CancellationToken token) =>
         Context.Games.OrderByDescending(g => g.Id).Skip(skip).Take(count).ToArrayAsync(token);
 
     public void FlushGameInfoCache() => cache.Remove(CacheKey.BasicGameInfo);
-
-    #region Generate Scoreboard
-
+
     // By xfoxfu & GZTimeWalker @ 2022/04/03
     // Refactored by GZTimeWalker @ 2024/08/31
     public async Task<ScoreboardModel> GenScoreboard(Game game, CancellationToken token = default)
@@ -235,8 +233,8 @@ public async Task<ScoreboardModel> GenScoreboard(Game game, CancellationToken to
             game.BloodBonus.SecondBloodFactor,
             game.BloodBonus.ThirdBloodFactor
         ];
-
-        foreach (var item in submissions)
+        
+        foreach (var item in submissions.OrderBy(s => s.SubmitTimeUtc))
         {
             var challenge = challenges[item.Id];
             var scoreboardItem = items[item.ParticipantId];
@@ -307,7 +305,8 @@ public async Task<ScoreboardModel> GenScoreboard(Game game, CancellationToken to
             {
                 item.OrganizationRank = rank + 1;
                 ranks[item.Organization]++;
-                orgTeams[item.Organization].Add(item.Id);
+                if (item.OrganizationRank <= 10)
+                    orgTeams[item.Organization].Add(item.Id);
             }
             else
             {
@@ -354,8 +353,6 @@ public async Task<ScoreboardModel> GenScoreboard(Game game, CancellationToken to
             BloodBonusValue = game.BloodBonus.Val
         };
     }
-
-    #endregion Generate Scoreboard
 }
 
 public class ScoreboardCacheHandler : ICacheRequestHandler