Merge branch 'work' into ci/test-satori

Author: GZTimeWalker

src/Directory.Packages.props

@@ -36,7 +36,7 @@
     <PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="1.11.0-beta.1" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.12.0-beta.1" />
-    <PackageVersion Include="Scalar.AspNetCore" Version="2.4.22" />
+    <PackageVersion Include="Scalar.AspNetCore" Version="2.5.0" />
     <PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
     <PackageVersion Include="Serilog.Expressions" Version="5.0.0" />
     <PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.2" />

src/GZCTF/Repositories/GameRepository.cs

@@ -54,8 +54,6 @@ public async Task UpdateGame(Game game, CancellationToken token = default)
     public Task<Game?> GetGameById(int id, CancellationToken token = default) =>
         Context.Games.FirstOrDefaultAsync(x => x.Id == id, token);
 
-    public Task<int> CountGames(CancellationToken token = default) => Context.Games.CountAsync(token);
-
     public Task<int[]> GetUpcomingGames(CancellationToken token = default) =>
         Context.Games.Where(g => g.StartTimeUtc > DateTime.UtcNow
                                  && g.StartTimeUtc - DateTime.UtcNow < TimeSpan.FromMinutes(15))
@@ -78,7 +76,7 @@ public Task<BasicGameInfoModel[]> FetchGameList(int count, int skip, Cancellatio
     public async Task<ArrayResponse<BasicGameInfoModel>> GetGameInfo(int count = 20, int skip = 0,
         CancellationToken token = default)
     {
-        var total = await CountGames(token);
+        var total = await Context.Games.CountAsync(game => !game.Hidden, token);
         if (skip >= total)
             return new([], total);
 
@@ -305,18 +303,17 @@ public async Task<ScoreboardModel> GenScoreboard(Game game, CancellationToken to
                 .Select(g =>
                     g.OrderBy(s => s.SubmitTimeUtc)
                         .Take(1)
-                        .Select(
-                            s =>
-                                new ChallengeItem
-                                {
-                                    Id = s.ChallengeId,
-                                    UserName = s.UserName,
-                                    SubmitTimeUtc = s.SubmitTimeUtc,
-                                    ParticipantId = s.ParticipationId,
-                                    // pending fields
-                                    Score = 0,
-                                    Type = SubmissionType.Normal
-                                }
+                        .Select(s =>
+                            new ChallengeItem
+                            {
+                                Id = s.ChallengeId,
+                                UserName = s.UserName,
+                                SubmitTimeUtc = s.SubmitTimeUtc,
+                                ParticipantId = s.ParticipationId,
+                                // pending fields
+                                Score = 0,
+                                Type = SubmissionType.Normal
+                            }
                         )
                         .First()
                 )

src/GZCTF/Repositories/Interface/IGameRepository.cs

@@ -32,13 +32,6 @@ public Task<ArrayResponse<BasicGameInfoModel>> GetGameInfo(int count = 10, int s
     /// <returns></returns>
     public Task<Game[]> GetGames(int count = 10, int skip = 0, CancellationToken token = default);
 
-    /// <summary>
-    /// 获取比赛数量
-    /// </summary>
-    /// <param name="token"></param>
-    /// <returns></returns>
-    public Task<int> CountGames(CancellationToken token = default);
-
     /// <summary>
     /// 获取最近将要开始的比赛 id
     /// </summary>