Add DATC F

Oliveriver · Sep 2, 2024 · 0203437 · 0203437
1 parent 0c9ed77
commit 0203437
Show file tree

Hide file tree

Showing 5 changed files with 1,231 additions and 13 deletions.
diff --git a/server/Adjudication/Validation/ConvoyPathValidator.cs b/server/Adjudication/Validation/ConvoyPathValidator.cs
@@ -10,11 +10,11 @@ public class ConvoyPathValidator(List<Convoy> convoys, List<Region> regions, Adj
     private readonly List<Region> regions = regions;
     private readonly AdjacencyValidator adjacencyValidator = adjacencyValidator;
 
-    public bool HasPath(Unit unit, Location location, Location destination)
+    public List<Convoy> GetPossibleConvoys(Unit unit, Location location, Location destination)
     {
         if (unit.Type == UnitType.Fleet || location == destination)
         {
-            return false;
+            return [];
         }
 
         var startRegion = regions.First(r => r.Id == location.RegionId);
@@ -27,7 +27,7 @@ public bool HasPath(Unit unit, Location location, Location destination)
 
         if (!startsOnCoast || !endsOnCoast)
         {
-            return false;
+            return [];
         }
 
         var convoysInPath = convoys.Where(c =>
@@ -37,38 +37,58 @@ public bool HasPath(Unit unit, Location location, Location destination)
 
         if (convoysInPath.Count == 0)
         {
-            return false;
+            return [];
         }
 
-        var depthFirstSearch = new DepthFirstSearch(convoysInPath, adjacencyValidator);
-        return depthFirstSearch.HasPath(unit, location, destination);
+        var depthFirstSearch = new DepthFirstSearch(convoysInPath, adjacencyValidator, regions);
+        return depthFirstSearch.GetPossibleConvoys(unit, location, destination);
     }
 
-    private class DepthFirstSearch(List<Convoy> convoys, AdjacencyValidator adjacencyValidator)
+    private class DepthFirstSearch(List<Convoy> convoys, AdjacencyValidator adjacencyValidator, List<Region> regions)
     {
         private readonly List<Convoy> convoys = convoys;
         private readonly AdjacencyValidator adjacencyValidator = adjacencyValidator;
+        private readonly List<Region> regions = regions;
 
         private readonly List<Convoy> visitedConvoys = [];
 
-        public bool HasPath(Unit unit, Location location, Location destination)
+        public List<Convoy> GetPossibleConvoys(Unit unit, Location location, Location destination)
         {
             if (adjacencyValidator.IsValidDirectMove(unit, location, destination))
             {
-                return true;
+                if (location == convoys.First().Midpoint)
+                {
+                    var directConvoys = convoys.Where(c =>
+                        adjacencyValidator.IsValidDirectMove(c.Unit!, c.Location, destination, allowDestinationChild: true));
+
+                    if (directConvoys.Any())
+                    {
+                        return directConvoys.ToList();
+                    }
+                }
+
+                return convoys.Where(c => c.Unit == unit).ToList();
             }
 
             var convoy = convoys.FirstOrDefault(c => c.Location == location);
             if (convoy != null)
             {
                 visitedConvoys.Add(convoy);
+
+                var region = regions.First(r => r.Id == convoy.Location.RegionId);
+                if (region.Type != RegionType.Sea)
+                {
+                    return [];
+                }
             }
 
             var adjacentConvoys = convoys.Where(c =>
                 !visitedConvoys.Contains(c)
                 && adjacencyValidator.IsValidDirectMove(c.Unit!, c.Location, location, allowDestinationChild: true));
 
-            return adjacentConvoys.Any(c => HasPath(c.Unit!, c.Location, destination));
+            var onwardConvoys = adjacentConvoys.SelectMany(c => GetPossibleConvoys(c.Unit!, c.Location, destination));
+
+            return convoy == null || !onwardConvoys.Any() ? [.. onwardConvoys] : [.. onwardConvoys, convoy];
         }
     }
 }
diff --git a/server/Adjudication/Validation/Validator.cs b/server/Adjudication/Validation/Validator.cs
@@ -55,7 +55,9 @@ private void ValidateMoves()
         foreach (var move in moves)
         {
             var canDirectMove = adjacencyValidator.IsValidDirectMove(move.Unit!, move.Location, move.Destination);
-            var canConvoyMove = convoyPathValidator.HasPath(move.Unit!, move.Location, move.Destination);
+
+            move.ConvoyPath = convoyPathValidator.GetPossibleConvoys(move.Unit!, move.Location, move.Destination);
+            var canConvoyMove = move.ConvoyPath.Count > 0;
 
             move.Status = canDirectMove || canConvoyMove ? OrderStatus.New : OrderStatus.Invalid;
         }
@@ -106,7 +108,7 @@ private void ValidateConvoys()
                 continue;
             }
 
-            var hasMatchingMove = moves.Any(m => m.Location == convoy.Midpoint && m.Destination == convoy.Destination && m.Status != OrderStatus.Invalid);
+            var hasMatchingMove = moves.Any(m => m.ConvoyPath.Contains(convoy) && m.Status != OrderStatus.Invalid);
 
             convoy.Status = hasMatchingMove ? OrderStatus.New : OrderStatus.Invalid;
         }

diff --git a/server/Entities/Orders/Move.cs b/server/Entities/Orders/Move.cs
@@ -9,6 +9,9 @@ public class Move : Order
     [NotMapped]
     public override List<Location> TouchedLocations => [Location, Destination];
 
+    [NotMapped]
+    public List<Convoy> ConvoyPath { get; set; } = [];
+
     [NotMapped]
     public Move? OpposingMove { get; set; }
 

diff --git a/server/Tests/DATC_A.cs b/server/Tests/DATC_A.cs
@@ -117,7 +117,7 @@ public void DATC_A_5()
         // Assert
         englishMove.Status.Should().Be(OrderStatus.Invalid);
         englishConvoy.Status.Should().Be(OrderStatus.Invalid);
-        englishSupport.Status.Should().Be(OrderStatus.Invalid);
+        englishSupport.Status.Should().Be(OrderStatus.Success);
         germanMove.Status.Should().Be(OrderStatus.Success);
         germanSupport.Status.Should().Be(OrderStatus.Success);