only auto-remove non-manually added rosters and not turn 20

dlidstrom · Apr 29, 2023 · a9349a7 · a9349a7
1 parent 386c11c
commit a9349a7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Snittlistan.Web/Areas/V2/Controllers/RosterController.cs b/Snittlistan.Web/Areas/V2/Controllers/RosterController.cs
@@ -183,7 +183,10 @@ public ActionResult Create(CreateRosterViewModel vm)
             vm.Opponent,
             ParseDate(vm.Date),
             vm.IsFourPlayer,
-            new OilPatternInformation(vm.OilPatternName!, vm.OilPatternUrl!));
+            new OilPatternInformation(vm.OilPatternName!, vm.OilPatternUrl!))
+        {
+            ManuallyAdded = true
+        };
         CompositionRoot.DocumentSession.Store(roster);
         return RedirectToAction("Index");
     }

diff --git a/Snittlistan.Web/Areas/V2/Domain/Roster.cs b/Snittlistan.Web/Areas/V2/Domain/Roster.cs
@@ -116,6 +116,7 @@ public string? TeamLevel
     public List<AuditLogEntry> AuditLogEntries { get; }
     public int Version => AuditLogEntries.Count;
     public bool Preliminary { get; set; }
+    public bool ManuallyAdded { get; set; }
 
     public List<string> Players { get; set; } = new List<string>();
 

diff --git a/Snittlistan.Web/Commands/GetRostersFromBitsCommandHandler.cs b/Snittlistan.Web/Commands/GetRostersFromBitsCommandHandler.cs
@@ -138,7 +138,8 @@ public override async Task Handle(HandlerContext<Command> context)
         Roster[] toRemove = rosters
             .Where(x => foundMatchIds.Contains(x.BitsMatchId) == false
                 && x.MatchResultId is null
-                && x.Turn <= 20)
+                && x.Turn < 20
+                && x.ManuallyAdded == false)
             .ToArray();
         if (toRemove.Any())
         {