fix: query warning

GZTimeWalker · Sep 8, 2022 · a06afec · a06afec
1 parent 23e6b0c
commit a06afec
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/GZCTF/ClientApp/src/components/StrengthPasswordInput.tsx b/GZCTF/ClientApp/src/components/StrengthPasswordInput.tsx
@@ -19,7 +19,7 @@ const requirements = [
   { re: /[0-9]/, label: '包含数字' },
   { re: /[a-z]/, label: '包含小写字母' },
   { re: /[A-Z]/, label: '包含大写字母' },
-  { re: /[$&+,:;=?@#|'<>.^*()%!-`]/, label: '包含特殊字符' },
+  { re: /[`$&+,:;=?@#|'<>.^*()%!-]/, label: '包含特殊字符' },
 ]
 
 const getStrength = (password: string) => {

diff --git a/GZCTF/ClientApp/vite.config.ts b/GZCTF/ClientApp/vite.config.ts
@@ -28,7 +28,7 @@ export default defineConfig(({ mode }) => {
         output: {
           chunkFileNames: 'static/[hash].js',
           assetFileNames: 'static/[hash].[ext]',
-          entryFileNames: 'static/[name].js',
+          entryFileNames: 'static/[name].[hash].js',
           compact: true,
         },
       },

diff --git a/GZCTF/Repositories/ParticipationRepository.cs b/GZCTF/Repositories/ParticipationRepository.cs
@@ -16,12 +16,14 @@ public ParticipationRepository(
 
     public async Task<bool> EnsureInstances(Participation part, Game game, CancellationToken token = default)
     {
-        await context.Entry(part).Collection(p => p.Challenges).LoadAsync(token);
-        await context.Entry(game).Collection(g => g.Challenges).LoadAsync(token);
+        var challenges = await context.Challenges.Where(c => c.Game == game).ToArrayAsync(token);
 
+        // requery instead of Entry
+        part = await context.Participations.Include(p => p.Challenges).AsSplitQuery().SingleAsync(p => p.Id == part.Id, token);
+
         bool update = false;
 
-        foreach (var challenge in game.Challenges)
+        foreach (var challenge in challenges)
             update |= part.Challenges.Add(challenge);
 
         await SaveAsync(token);