[WIP] Move scoring into a separate process

.config/dotnet-tools.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "9.0.1",
+      "commands": [
+        "dotnet-ef"
+      ],
+      "rollForward": false
+    }
+  }
+}

.gitignore

@@ -9,3 +9,4 @@ ctf.*.json
 data
 obj
 *.binlog
+/data_bk

ENOWARS.ruleset

@@ -69,6 +69,7 @@
   </Rules>
   <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
     <Rule Id="SA0001" Action="None" />
+    <Rule Id="SA1600" Action="None" />
     <Rule Id="SA1623" Action="None" />
     <Rule Id="SA1633" Action="None" />
     <Rule Id="SA1649" Action="None" />

EnoConfig/Program.cs

@@ -82,10 +82,6 @@ public static int Main(string[] args)
         debugFlagsCommand.Handler = CommandHandler.Create<int, FlagEncoding, string>(async (round, encoding, signing_key) => await program.Flags(round, encoding, signing_key));
         rootCommand.AddCommand(debugFlagsCommand);
 
-        var roundWarpCommand = new Command("newround", "Start new round");
-        roundWarpCommand.Handler = CommandHandler.Create(program.NewRound);
-        rootCommand.AddCommand(roundWarpCommand);
-
         return rootCommand.InvokeAsync(args).Result;
     }
 
@@ -415,43 +411,6 @@ public async Task<int> Flags(int round, FlagEncoding encoding, string signing_ke
         return 0;
     }
 
-    public async Task<int> NewRound()
-    {
-        using var scope = this.serviceProvider.CreateScope();
-        using var dbContext = scope.ServiceProvider.GetRequiredService<EnoDbContext>();
-        var lastRound = await dbContext.Rounds
-            .OrderByDescending(r => r.Id)
-            .FirstOrDefaultAsync();
-
-        Round round;
-        if (lastRound != null)
-        {
-            round = new Round(
-                lastRound.Id + 1,
-                DateTime.UtcNow,
-                DateTime.UtcNow,
-                DateTime.UtcNow,
-                DateTime.UtcNow,
-                DateTime.UtcNow);
-        }
-        else
-        {
-            round = new Round(
-                1,
-                DateTime.UtcNow,
-                DateTime.UtcNow,
-                DateTime.UtcNow,
-                DateTime.UtcNow,
-                DateTime.UtcNow);
-        }
-
-        Console.WriteLine($"Adding round {round}");
-        dbContext.Add(round);
-        await dbContext.SaveChangesAsync();
-
-        return 0;
-    }
-
     private static JsonConfiguration? LoadConfig(FileInfo input)
     {
         if (!input.Exists)

EnoCore.Models/AttackInfo/AttackInfo.cs

@@ -1,18 +1,18 @@
-namespace EEnoCore.Models.AttackInfo;
-
-public record AttackInfo(
-    string[] AvailableTeams,
-    Dictionary<string, AttackInfoService> Services);
-
-#pragma warning disable SA1402 // File may only contain a single type
-#pragma warning disable SA1502 // Element should not be on a single line
-public class AttackInfoService : Dictionary<string, AttackInfoServiceTeam>
-{ }
-
-public class AttackInfoServiceTeam : Dictionary<long, AttackInfoServiceTeamRound>
-{ }
-
-public class AttackInfoServiceTeamRound : Dictionary<long, string[]>
-{ }
-#pragma warning restore SA1502
-#pragma warning restore SA1402
+namespace EEnoCore.Models.AttackInfo;
+
+public record AttackInfo(
+    string[] AvailableTeams,
+    Dictionary<string, AttackInfoService> Services);
+
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1502 // Element should not be on a single line
+public class AttackInfoService : Dictionary<string, AttackInfoServiceTeam>
+{ }
+
+public class AttackInfoServiceTeam : Dictionary<long, AttackInfoServiceTeamRound>
+{ }
+
+public class AttackInfoServiceTeamRound : Dictionary<long, string[]>
+{ }
+#pragma warning restore SA1502
+#pragma warning restore SA1402

EnoCore.Models/Database/Round.cs

@@ -1,8 +1,28 @@
 namespace EnoCore.Models.Database;
 
-public sealed record Round(long Id,
-    DateTimeOffset Begin,
-    DateTimeOffset Quarter2,
-    DateTimeOffset Quarter3,
-    DateTimeOffset Quarter4,
-    DateTimeOffset End);
+public enum RoundStatus
+{
+    Prepared,
+    Running,
+    Finished,
+    Scored,
+}
+
+public sealed record Round
+{
+    public Round(long id, DateTimeOffset? begin, DateTimeOffset? end, RoundStatus status)
+    {
+        this.Id = id;
+        this.Begin = begin;
+        this.End = end;
+        this.Status = status;
+    }
+
+    public long Id {  get; set; }
+
+    public DateTimeOffset? Begin { get; set; }
+
+    public DateTimeOffset? End { get; set; }
+
+    public RoundStatus Status { get; set; }
+}