Complete universe model migration

2026-04-07 14:16:59 -04:00
parent d0c6e30304
commit 6c92ab50c8
76 changed files with 2061 additions and 1072 deletions
--- a/apps/backend/PlayerFaction/Api/GetPlayerIdentitiesHandler.cs
+++ b/apps/backend/PlayerFaction/Api/GetPlayerIdentitiesHandler.cs
@@ -17,16 +17,15 @@ public sealed class GetPlayerIdentitiesHandler(IAuthRepository authRepository, I
    public override async Task HandleAsync(CancellationToken cancellationToken)
    {
        var users = await authRepository.ListUsersAsync(cancellationToken);
-        var playerFactionsById = playerStateStore.GetPlayerFactions()
-          .ToDictionary(player => player.Id, StringComparer.Ordinal);
+        var playerFactionsByPlayerId = playerStateStore.GetPlayerFactionsByPlayerId();

-        var responses = new List<PlayerIdentitySummaryResponse>(users.Count + playerFactionsById.Count);
+        var responses = new List<PlayerIdentitySummaryResponse>(users.Count + playerFactionsByPlayerId.Count);
        var seenIds = new HashSet<string>(StringComparer.Ordinal);

        foreach (var user in users)
        {
            var userId = user.Id.ToString("N");
-            playerFactionsById.TryGetValue(userId, out var playerFaction);
+            playerFactionsByPlayerId.TryGetValue(userId, out var playerFaction);
            responses.Add(new PlayerIdentitySummaryResponse(
              userId,
              user.Email,
@@ -38,19 +37,19 @@ public sealed class GetPlayerIdentitiesHandler(IAuthRepository authRepository, I
            seenIds.Add(userId);
        }

-        foreach (var playerFaction in playerStateStore.GetPlayerFactions())
+        foreach (var (playerId, playerFaction) in playerFactionsByPlayerId)
        {
-            if (!seenIds.Add(playerFaction.Id))
+            if (!seenIds.Add(playerId))
            {
                continue;
            }

            responses.Add(new PlayerIdentitySummaryResponse(
-              playerFaction.Id,
-              $"{playerFaction.Id}@unknown",
+              playerId,
+              $"{playerId}@unknown",
              Array.Empty<string>(),
              true,
-              playerFaction.Id,
+              playerId,
              playerFaction.Label,
              playerFaction.SovereignFactionId));
        }
--- a/apps/backend/PlayerFaction/Contracts/PlayerFaction.cs
+++ b/apps/backend/PlayerFaction/Contracts/PlayerFaction.cs
@@ -194,7 +194,7 @@ public sealed record PlayerDirectiveSnapshot(
  bool UseOrders,
  string? StagingOrderKind,
  string? ItemId,
-  string? PreferredNodeId,
+  string? PreferredAnchorId,
  string? PreferredConstructionSiteId,
  string? PreferredModuleId,
  int Priority,
--- a/apps/backend/PlayerFaction/Contracts/PlayerFactionCommands.cs
+++ b/apps/backend/PlayerFaction/Contracts/PlayerFactionCommands.cs
@@ -45,7 +45,7 @@ public sealed record PlayerDirectiveCommandRequest(
  string? SourceStationId,
  string? DestinationStationId,
  string? ItemId,
-  string? PreferredNodeId,
+  string? PreferredAnchorId,
  string? PreferredConstructionSiteId,
  string? PreferredModuleId,
  int Priority,
--- a/apps/backend/PlayerFaction/Runtime/PlayerFactionRuntimeModels.cs
+++ b/apps/backend/PlayerFaction/Runtime/PlayerFactionRuntimeModels.cs
@@ -251,7 +251,7 @@ public sealed class PlayerDirectiveRuntime
    public bool UseOrders { get; set; }
    public string? StagingOrderKind { get; set; }
    public string? ItemId { get; set; }
-    public string? PreferredNodeId { get; set; }
+    public string? PreferredAnchorId { get; set; }
    public string? PreferredConstructionSiteId { get; set; }
    public string? PreferredModuleId { get; set; }
    public int Priority { get; set; } = 50;
--- a/apps/backend/PlayerFaction/Simulation/IPlayerStateStore.cs
+++ b/apps/backend/PlayerFaction/Simulation/IPlayerStateStore.cs
@@ -5,5 +5,6 @@ public interface IPlayerStateStore
    bool TryGetPlayerFaction(string playerId, out PlayerFactionRuntime playerFaction);
    PlayerFactionRuntime GetOrAddPlayerFaction(string playerId, Func<PlayerFactionRuntime> factory);
    IReadOnlyCollection<PlayerFactionRuntime> GetPlayerFactions();
+    IReadOnlyDictionary<string, PlayerFactionRuntime> GetPlayerFactionsByPlayerId();
    void Clear();
 }
--- a/apps/backend/PlayerFaction/Simulation/PlayerFactionProjectionService.cs
+++ b/apps/backend/PlayerFaction/Simulation/PlayerFactionProjectionService.cs
@@ -201,7 +201,7 @@ public sealed class PlayerFactionProjectionService
            directive.UseOrders,
            directive.StagingOrderKind,
            directive.ItemId,
-            directive.PreferredNodeId,
+            directive.PreferredAnchorId,
            directive.PreferredConstructionSiteId,
            directive.PreferredModuleId,
            directive.Priority,
@@ -261,7 +261,7 @@ public sealed class PlayerFactionProjectionService
        template.SourceStationId,
        template.DestinationStationId,
        template.ItemId,
-        template.NodeId,
+        template.AnchorId,
        template.ConstructionSiteId,
        template.ModuleId,
        template.WaitSeconds,
--- a/apps/backend/PlayerFaction/Simulation/PlayerFactionService.cs
+++ b/apps/backend/PlayerFaction/Simulation/PlayerFactionService.cs
@@ -329,7 +329,7 @@ internal sealed class PlayerFactionService
        directive.SourceStationId = request.SourceStationId;
        directive.DestinationStationId = request.DestinationStationId;
        directive.ItemId = request.ItemId;
-        directive.PreferredNodeId = request.PreferredNodeId;
+        directive.PreferredAnchorId = request.PreferredAnchorId;
        directive.PreferredConstructionSiteId = request.PreferredConstructionSiteId;
        directive.PreferredModuleId = request.PreferredModuleId;
        directive.Priority = request.Priority;
@@ -355,7 +355,7 @@ internal sealed class PlayerFactionService
                SourceStationId = template.SourceStationId,
                DestinationStationId = template.DestinationStationId,
                ItemId = template.ItemId,
-                NodeId = template.NodeId,
+                AnchorId = template.AnchorId,
                ConstructionSiteId = template.ConstructionSiteId,
                ModuleId = template.ModuleId,
                WaitSeconds = MathF.Max(0f, template.WaitSeconds ?? 0f),
@@ -501,7 +501,7 @@ internal sealed class PlayerFactionService
                SourceStationId = template.SourceStationId,
                DestinationStationId = template.DestinationStationId,
                ItemId = template.ItemId,
-                NodeId = template.NodeId,
+                AnchorId = template.AnchorId,
                ConstructionSiteId = template.ConstructionSiteId,
                ModuleId = template.ModuleId,
                WaitSeconds = MathF.Max(0f, template.WaitSeconds ?? 0f),
@@ -692,7 +692,7 @@ internal sealed class PlayerFactionService
            SourceStationId = request.SourceStationId,
            DestinationStationId = request.DestinationStationId,
            ItemId = request.ItemId,
-            NodeId = request.NodeId,
+            AnchorId = request.AnchorId,
            ConstructionSiteId = request.ConstructionSiteId,
            ModuleId = request.ModuleId,
            WaitSeconds = MathF.Max(0f, request.WaitSeconds ?? 0f),
@@ -805,7 +805,7 @@ internal sealed class PlayerFactionService
        directive.SourceStationId = request.HomeStationId;
        directive.DestinationStationId = null;
        directive.ItemId = request.ItemId;
-        directive.PreferredNodeId = request.PreferredNodeId;
+        directive.PreferredAnchorId = request.PreferredAnchorId;
        directive.PreferredConstructionSiteId = request.PreferredConstructionSiteId;
        directive.PreferredModuleId = request.PreferredModuleId;
        directive.Priority = 100;
@@ -831,7 +831,7 @@ internal sealed class PlayerFactionService
                SourceStationId = template.SourceStationId,
                DestinationStationId = template.DestinationStationId,
                ItemId = template.ItemId,
-                NodeId = template.NodeId,
+                AnchorId = template.AnchorId,
                ConstructionSiteId = template.ConstructionSiteId,
                ModuleId = template.ModuleId,
                WaitSeconds = MathF.Max(0f, template.WaitSeconds ?? 0f),
@@ -1418,7 +1418,7 @@ internal sealed class PlayerFactionService
            AreaSystemId = directive?.TargetSystemId ?? directive?.HomeSystemId ?? ship.DefaultBehavior.AreaSystemId ?? ship.SystemId,
            TargetEntityId = directive?.TargetEntityId,
            ItemId = directive?.ItemId ?? automation?.PreferredItemId ?? ship.DefaultBehavior.ItemId,
-            PreferredNodeId = directive?.PreferredNodeId ?? ship.DefaultBehavior.PreferredNodeId,
+            PreferredAnchorId = directive?.PreferredAnchorId ?? ship.DefaultBehavior.PreferredAnchorId,
            PreferredConstructionSiteId = directive?.PreferredConstructionSiteId ?? ship.DefaultBehavior.PreferredConstructionSiteId,
            PreferredModuleId = directive?.PreferredModuleId ?? ship.DefaultBehavior.PreferredModuleId,
            TargetPosition = directive?.TargetPosition,
@@ -1461,7 +1461,7 @@ internal sealed class PlayerFactionService
            SourceStationId = directive.SourceStationId ?? directive.HomeStationId,
            DestinationStationId = directive.DestinationStationId,
            ItemId = directive.ItemId,
-            NodeId = directive.PreferredNodeId,
+            AnchorId = directive.PreferredAnchorId,
            ConstructionSiteId = directive.PreferredConstructionSiteId,
            ModuleId = directive.PreferredModuleId,
            WaitSeconds = directive.WaitSeconds,
@@ -1525,7 +1525,7 @@ internal sealed class PlayerFactionService
        target.AreaSystemId = source.AreaSystemId;
        target.TargetEntityId = source.TargetEntityId;
        target.ItemId = source.ItemId;
-        target.PreferredNodeId = source.PreferredNodeId;
+        target.PreferredAnchorId = source.PreferredAnchorId;
        target.PreferredConstructionSiteId = source.PreferredConstructionSiteId;
        target.PreferredModuleId = source.PreferredModuleId;
        target.TargetPosition = source.TargetPosition;
@@ -1546,7 +1546,7 @@ internal sealed class PlayerFactionService
      && string.Equals(left.AreaSystemId, right.AreaSystemId, StringComparison.Ordinal)
      && string.Equals(left.TargetEntityId, right.TargetEntityId, StringComparison.Ordinal)
      && string.Equals(left.ItemId, right.ItemId, StringComparison.Ordinal)
-      && string.Equals(left.PreferredNodeId, right.PreferredNodeId, StringComparison.Ordinal)
+      && string.Equals(left.PreferredAnchorId, right.PreferredAnchorId, StringComparison.Ordinal)
      && string.Equals(left.PreferredConstructionSiteId, right.PreferredConstructionSiteId, StringComparison.Ordinal)
      && string.Equals(left.PreferredModuleId, right.PreferredModuleId, StringComparison.Ordinal)
      && Nullable.Equals(left.TargetPosition, right.TargetPosition)
@@ -1567,7 +1567,7 @@ internal sealed class PlayerFactionService
      && string.Equals(left.SourceStationId, right.SourceStationId, StringComparison.Ordinal)
      && string.Equals(left.DestinationStationId, right.DestinationStationId, StringComparison.Ordinal)
      && string.Equals(left.ItemId, right.ItemId, StringComparison.Ordinal)
-      && string.Equals(left.NodeId, right.NodeId, StringComparison.Ordinal)
+      && string.Equals(left.AnchorId, right.AnchorId, StringComparison.Ordinal)
      && string.Equals(left.ConstructionSiteId, right.ConstructionSiteId, StringComparison.Ordinal)
      && string.Equals(left.ModuleId, right.ModuleId, StringComparison.Ordinal)
      && left.WaitSeconds.Equals(right.WaitSeconds)
@@ -1589,7 +1589,7 @@ internal sealed class PlayerFactionService
      && string.Equals(left.SourceStationId, right.SourceStationId, StringComparison.Ordinal)
      && string.Equals(left.DestinationStationId, right.DestinationStationId, StringComparison.Ordinal)
      && string.Equals(left.ItemId, right.ItemId, StringComparison.Ordinal)
-      && string.Equals(left.NodeId, right.NodeId, StringComparison.Ordinal)
+      && string.Equals(left.AnchorId, right.AnchorId, StringComparison.Ordinal)
      && string.Equals(left.ConstructionSiteId, right.ConstructionSiteId, StringComparison.Ordinal)
      && string.Equals(left.ModuleId, right.ModuleId, StringComparison.Ordinal)
      && left.WaitSeconds.Equals(right.WaitSeconds)
@@ -1634,7 +1634,7 @@ internal sealed class PlayerFactionService
        SourceStationId = template.SourceStationId,
        DestinationStationId = template.DestinationStationId,
        ItemId = template.ItemId,
-        NodeId = template.NodeId,
+        AnchorId = template.AnchorId,
        ConstructionSiteId = template.ConstructionSiteId,
        ModuleId = template.ModuleId,
        WaitSeconds = template.WaitSeconds,
--- a/apps/backend/PlayerFaction/Simulation/PlayerStateStore.cs
+++ b/apps/backend/PlayerFaction/Simulation/PlayerStateStore.cs
@@ -22,5 +22,8 @@ public sealed class PlayerStateStore : IPlayerStateStore
    public IReadOnlyCollection<PlayerFactionRuntime> GetPlayerFactions() =>
      _playerFactions.Values.ToList();

+    public IReadOnlyDictionary<string, PlayerFactionRuntime> GetPlayerFactionsByPlayerId() =>
+      new Dictionary<string, PlayerFactionRuntime>(_playerFactions, StringComparer.Ordinal);
+
    public void Clear() => _playerFactions.Clear();
 }