Remove region data from database and use JSON directly

Oliveriver · Aug 27, 2024 · 26f0171 · 26f0171
1 parent ac3072e
commit 26f0171
Show file tree

Hide file tree

Showing 11 changed files with 1,462 additions and 3,996 deletions.
diff --git a/server/Adjudication/Adjudicator.cs b/server/Adjudication/Adjudicator.cs
@@ -9,17 +9,19 @@ public class Adjudicator
 {
     private readonly World world;
 
-    private readonly AdjacencyValidator adjacencyValidator;
     private readonly Validator validator;
     private readonly Evaluator evaluator;
     private readonly Executor executor;
 
-    public Adjudicator(World world, bool hasStrictAdjacencies, List<Region> regions, DefaultWorldFactory defaultWorldFactory)
+    public Adjudicator(World world, bool hasStrictAdjacencies, MapFactory mapFactory, DefaultWorldFactory defaultWorldFactory)
     {
         this.world = world;
 
-        adjacencyValidator = new(regions, hasStrictAdjacencies);
-        validator = new(world, regions, adjacencyValidator, defaultWorldFactory);
+        var regions = mapFactory.CreateRegions();
+        var centres = defaultWorldFactory.CreateCentres();
+        var adjacencyValidator = new AdjacencyValidator(regions, hasStrictAdjacencies);
+
+        validator = new(world, regions, centres, adjacencyValidator);
         evaluator = new(world, adjacencyValidator);
         executor = new(world, regions);
     }

diff --git a/server/Adjudication/Validation/Validator.cs b/server/Adjudication/Validation/Validator.cs
@@ -1,6 +1,5 @@
 using Entities;
 using Enums;
-using Factories;
 
 namespace Adjudication;
 
@@ -15,17 +14,18 @@ public class Validator
     private readonly List<Disband> disbands;
     private readonly List<Order> retreats;
 
-    private readonly DefaultWorldFactory defaultWorldFactory;
     private readonly List<Region> regions;
+    private readonly List<Centre> centres;
+
     private readonly AdjacencyValidator adjacencyValidator;
     private readonly ConvoyPathValidator convoyPathValidator;
 
-    public Validator(World world, List<Region> regions, AdjacencyValidator adjacencyValidator, DefaultWorldFactory defaultWorldFactory)
+    public Validator(World world, List<Region> regions, List<Centre> centres, AdjacencyValidator adjacencyValidator)
     {
         this.world = world;
         this.regions = regions;
+        this.centres = centres;
         this.adjacencyValidator = adjacencyValidator;
-        this.defaultWorldFactory = defaultWorldFactory;
 
         var nonRetreats = world.Orders.Where(o => o.NeedsValidation && !o.Unit!.MustRetreat).ToList();
         retreats = world.Orders.Where(o => o.NeedsValidation && o.Unit!.MustRetreat).ToList();
@@ -107,8 +107,6 @@ private void ValidateConvoys()
 
     private void ValidateBuilds()
     {
-        var homeCentres = defaultWorldFactory.CreateCentres();
-
         foreach (var build in builds)
         {
             if (build.Location.Phase != Phase.Winter)
@@ -119,7 +117,7 @@ private void ValidateBuilds()
 
             var board = world.Boards.FirstOrDefault(b => b.Contains(build.Location));
             var region = regions.First(r => r.Id == build.Location.RegionId);
-            var centre = homeCentres.FirstOrDefault(c => c.Location.RegionId == build.Location.RegionId);
+            var centre = centres.FirstOrDefault(c => c.Location.RegionId == build.Location.RegionId);
             var unit = build.Unit!;
 
             if (board == null || centre == null)

diff --git a/server/Context/GameContext.cs b/server/Context/GameContext.cs
@@ -1,16 +1,10 @@
 using Entities;
-using Factories;
 using Microsoft.EntityFrameworkCore;
 
 namespace Context;
 
-public class GameContext(DbContextOptions<GameContext> options, MapFactory mapFactory) : DbContext(options)
+public class GameContext(DbContextOptions<GameContext> options) : DbContext(options)
 {
-    private readonly MapFactory mapFactory = mapFactory;
-
-    public DbSet<Region> Regions { get; set; } = null!;
-    public DbSet<Connection> Connections { get; set; } = null!;
-
     public DbSet<Game> Games { get; set; } = null!;
     public DbSet<World> Worlds { get; set; } = null!;
     public DbSet<Board> Boards { get; set; } = null!;
@@ -24,39 +18,4 @@ public class GameContext(DbContextOptions<GameContext> options, MapFactory mapFa
     public DbSet<Convoy> Convoys { get; set; } = null!;
     public DbSet<Build> Builds { get; set; } = null!;
     public DbSet<Disband> Disbands { get; set; } = null!;
-
-    protected override void OnModelCreating(ModelBuilder modelBuilder)
-    {
-        base.OnModelCreating(modelBuilder);
-
-        var (regions, connections) = mapFactory.CreateMap();
-
-        modelBuilder.Entity<Region>()
-            .HasData(regions);
-
-        modelBuilder.Entity<Connection>()
-            .HasData(connections);
-
-        modelBuilder.Entity<Region>()
-            .HasMany(r => r.Connections)
-            .WithMany(c => c.Regions)
-            .UsingEntity<ConnectionMapping>("ConnectionMappings")
-            .HasData(connections.SelectMany(connection =>
-            {
-                var regionIds = connection.Id.Split("-");
-                return new List<ConnectionMapping>
-                {
-                    new()
-                    {
-                        ConnectionsId = connection.Id,
-                        RegionsId = regionIds[0],
-                    },
-                    new()
-                    {
-                        ConnectionsId = connection.Id,
-                        RegionsId = regionIds[1],
-                    },
-                };
-            }));
-    }
 };
diff --git a/server/Data/regions.json b/server/Data/regions.json
@@ -93,7 +93,7 @@
   },
   {
     "id": "Bur",
-    "name": "Burgandy",
+    "name": "Burgundy",
     "type": "Land"
   },
   {
@@ -372,7 +372,7 @@
   },
   {
     "id": "TYS",
-    "name": "Tyrhennian Sea",
+    "name": "Tyrrhenian Sea",
     "type": "Sea"
   },
   {

diff --git a/server/Factories/MapFactory.cs b/server/Factories/MapFactory.cs
@@ -10,7 +10,7 @@ public class MapFactory
     private const string RegionsFilePath = "Data/regions.json";
     private const string ConnectionsFilePath = "Data/connections.json";
 
-    public (List<Region> regions, List<Connection> connections) CreateMap()
+    public List<Region> CreateRegions()
     {
         var regionsFile = File.ReadAllText(RegionsFilePath);
         var regions = JsonSerializer.Deserialize<List<Region>>(regionsFile, Constants.JsonOptions)
@@ -22,7 +22,7 @@ public class MapFactory
 
         Check(regions, connections);
         PopulateConnections(regions, connections);
-        return (regions, connections);
+        return regions;
     }
 
     private void PopulateConnections(List<Region> regions, List<Connection> connections)