clean up WIP implementation of space stations

see #118
see #120

Author: dealloc

src/Helldivers-2-API/Controllers/ArrowHeadController.cs

@@ -81,11 +81,12 @@ public static async Task<IResult> Assignments(HttpContext context, ArrowHeadStor
     /// </summary>
     [ProducesResponseType<List<Assignment>>(StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status503ServiceUnavailable)]
-    public static async Task<IResult> SpaceStation(HttpContext context, ArrowHeadStore store)
+    public static async Task<IResult> SpaceStation(HttpContext context, ArrowHeadStore store, [FromRoute] long index)
     {
-        // TODO extract ID from route
-        var spaceStation = await store.GetSpaceStations(749875195, context.RequestAborted);
+        var spaceStation = await store.GetSpaceStation(index, context.RequestAborted);
+        if (spaceStation is { } bytes)
+            return Results.Bytes(bytes, contentType: "application/json");
 
-        return Results.Bytes(spaceStation, contentType: "application/json");
+        return Results.NotFound();
     }
 }

src/Helldivers-2-API/Controllers/V1/SpaceStationController.cs

@@ -13,8 +13,9 @@ public static class SpaceStationController
     /// Fetches a list of all available <see cref="SpaceStation" /> information available.
     /// </summary>
     [ProducesResponseType<List<SpaceStation>>(StatusCodes.Status200OK)]
-    public static async Task<IResult> Index(HttpContext context, IStore<SpaceStation, int> store)
+    public static async Task<IResult> Index(HttpContext context, IStore<SpaceStation, long> store)
     {
+        // TODO: check implementation.
         var stations = await store.AllAsync(context.RequestAborted);
 
         return Results.Ok(stations);
@@ -24,7 +25,7 @@ public static async Task<IResult> Index(HttpContext context, IStore<SpaceStation
     /// Fetches a specific <see cref="SpaceStation" /> identified by <paramref name="index" />.
     /// </summary>
     [ProducesResponseType<SpaceStation>(StatusCodes.Status200OK)]
-    public static async Task<IResult> Show(HttpContext context, IStore<SpaceStation, int> store, [FromRoute] int index)
+    public static async Task<IResult> Show(HttpContext context, IStore<SpaceStation, long> store, [FromRoute] int index)
     {
         var station = await store.GetAsync(index, context.RequestAborted);
 

src/Helldivers-2-API/Program.cs

@@ -255,7 +255,7 @@
 raw.MapGet("/api/Stats/war/801/summary", ArrowHeadController.Summary);
 raw.MapGet("/api/NewsFeed/801", ArrowHeadController.NewsFeed);
 raw.MapGet("/api/v2/Assignment/War/801", ArrowHeadController.Assignments);
-raw.MapGet("/api/v2/SpaceStation/War/801/749875195", ArrowHeadController.SpaceStation);
+raw.MapGet("/api/v2/SpaceStation/War/801/{index:long}", ArrowHeadController.SpaceStation);
 
 #endregion
 

src/Helldivers-2-API/appsettings.json

@@ -24,6 +24,9 @@
     "Synchronization": {
       "IntervalSeconds": 20,
       "DefaultLanguage": "en-US",
+      "SpaceStations": [
+        749875195
+      ],
       "Languages": [
         "en-US",
         "de-DE",

src/Helldivers-2-Core/Extensions/ServiceCollectionExtensions.cs

@@ -74,7 +74,7 @@ public static IServiceCollection AddV1Stores(this IServiceCollection services)
         services.AddSingleton<IStore<Campaign, int>, CampaignStore>();
         services.AddSingleton<IStore<Models.V1.Assignment, long>, Storage.V1.AssignmentStore>();
         services.AddSingleton<IStore<Dispatch, int>, DispatchStore>();
-        services.AddSingleton<IStore<SpaceStation, int>, SpaceStationStore>();
+        services.AddSingleton<IStore<SpaceStation, long>, SpaceStationStore>();
 
         // Register mappers
         services.AddSingleton<AssignmentMapper>();

src/Helldivers-2-Core/Facades/V1Facade.cs

@@ -20,7 +20,7 @@ public sealed class V1Facade(
     AssignmentMapper assignmentMapper,
     IStore<Dispatch, int> dispatchStore,
     DispatchMapper dispatchMapper,
-    IStore<SpaceStation, int> spaceStationStore,
+    IStore<SpaceStation, long> spaceStationStore,
     SpaceStationMapper spaceStationMapper
 )
 {

src/Helldivers-2-Core/Mapping/MappingContext.cs

@@ -47,7 +47,13 @@ public sealed class MappingContext
     public TimeSpan GameTimeDeviation { get; private init; }
 
     /// <summary>Initializes a new <see cref="MappingContext" />.</summary>
-    internal MappingContext(WarId warId, WarInfo warInfo, Dictionary<string, WarStatus> warStatuses, WarSummary warSummary, Dictionary<string, List<NewsFeedItem>> newsFeeds, Dictionary<string, List<Assignment>> assignments, Dictionary<string, List<SpaceStation>> spaceStations)
+    internal MappingContext(WarId warId,
+        WarInfo warInfo,
+        Dictionary<string, WarStatus> warStatuses,
+        WarSummary warSummary,
+        Dictionary<string, List<NewsFeedItem>> newsFeeds,
+        Dictionary<string, List<Assignment>> assignments,
+        Dictionary<string, List<SpaceStation>> spaceStations)
     {
         WarId = warId;
         WarInfo = warInfo;

src/Helldivers-2-Core/Mapping/V1/SpaceStationMapper.cs

@@ -1,5 +1,6 @@
 using Helldivers.Models;
 using Helldivers.Models.V1;
+using Helldivers.Models.V1.SpaceStations;
 
 namespace Helldivers.Core.Mapping.V1;
 
@@ -16,19 +17,43 @@ public sealed class SpaceStationMapper
     /// <returns>An enumerable list of space stations mapped to the V1 model.</returns>
     public IEnumerable<SpaceStation> MapToV1(MappingContext context, List<Planet> planets)
     {
-        foreach (var station in context.InvariantWarStatus.SpaceStations)
-            yield return Map(context, station, planets);
+        // Get a list of all assignments across all translations.
+        var invariants = context.SpaceStations
+            .SelectMany(pair => pair.Value)
+            .DistinctBy(spaceStation => spaceStation.Id32);
+
+        foreach (var spaceStation in invariants)
+        {
+            // Build a dictionary of all translations for this assignment
+            var translations = context.SpaceStations.Select(pair =>
+                    new KeyValuePair<string, Models.ArrowHead.SpaceStation?>(
+                        pair.Key,
+                        pair.Value.FirstOrDefault(a => a.Id32 == spaceStation.Id32)
+                    )
+                ).Where(pair => pair.Value is not null)
+                .ToDictionary(pair => pair.Key, pair => pair.Value!);
+
+            yield return Map(translations, context, planets);
+        }
     }
 
-    private SpaceStation Map(MappingContext context, Helldivers.Models.ArrowHead.SpaceStation raw, List<Planet> planets)
+    private SpaceStation Map(Dictionary<string, Models.ArrowHead.SpaceStation> translations, MappingContext context, List<Planet> planets)
     {
-        var planet = planets.First(p => p.Index == raw.PlanetIndex);
+        var invariant = translations.First().Value;
+        var planet = planets.First(p => p.Index == invariant.PlanetIndex);
 
         return new SpaceStation(
-            Id32: raw.Id32,
+            Id32: invariant.Id32,
             Planet: planet,
-            ElectionEnd: context.RelativeGameStart.AddSeconds(raw.CurrentElectionEndWarTime),
-            Flags: raw.Flags
+            ElectionEnd: context.RelativeGameStart.AddSeconds(invariant.CurrentElectionEndWarTime),
+            Flags: invariant.Flags,
+            TacticalActions: invariant.TacticalActions.Select(rawAction => MapTacticalAction(context, rawAction)).ToList()
         );
     }
+
+    private TacticalAction MapTacticalAction(MappingContext context, Helldivers.Models.ArrowHead.SpaceStations.TacticalAction raw)
+    {
+        // TODO: map actions.
+        return new TacticalAction();
+    }
 }

src/Helldivers-2-Core/Storage/ArrowHead/ArrowHeadStore.cs

@@ -14,7 +14,7 @@ public sealed class ArrowHeadStore
     private CultureDictionary<Memory<byte>> _statuses = null!;
     private CultureDictionary<Memory<byte>> _feeds = null!;
     private CultureDictionary<Memory<byte>> _assignments = null!;
-    private CultureDictionary<Memory<byte>> _spaceStations = null!;
+    private Dictionary<long, CultureDictionary<Memory<byte>>> _spaceStations = null!;
     private readonly TaskCompletionSource _syncState = new();
 
     /// <summary>
@@ -27,7 +27,7 @@ public void UpdateRawStore(
         IEnumerable<KeyValuePair<string, Memory<byte>>> statuses,
         IEnumerable<KeyValuePair<string, Memory<byte>>> feeds,
         IEnumerable<KeyValuePair<string, Memory<byte>>> assignments,
-        IEnumerable<KeyValuePair<string, Memory<byte>>> spaceStations
+        Dictionary<long, Dictionary<string, Memory<byte>>> spaceStations
     )
     {
         _warId = warId;
@@ -36,7 +36,8 @@ IEnumerable<KeyValuePair<string, Memory<byte>>> spaceStations
         _statuses = new(statuses);
         _feeds = new(feeds);
         _assignments = new(assignments);
-        _spaceStations = new(spaceStations);
+        _spaceStations =
+            spaceStations.ToDictionary(pair => pair.Key, pair => new CultureDictionary<Memory<byte>>(pair.Value));
 
         _syncState.TrySetResult();
     }
@@ -104,11 +105,10 @@ public async Task<Memory<byte>> GetAssignments(CancellationToken cancellationTok
     /// <summary>
     /// returns the raw payload for <see cref="SpaceStation" />s.
     /// </summary>
-    public async Task<Memory<byte>> GetSpaceStations(int id, CancellationToken cancellationToken)
+    public async Task<Memory<byte>?> GetSpaceStation(long id, CancellationToken cancellationToken)
     {
         await _syncState.Task.WaitAsync(cancellationToken);
 
-        // TODO use ID to get relevant space station
-        return _spaceStations.Get();
+        return _spaceStations.TryGetValue(id, out var spaceStations) ? spaceStations.Get() : null;
     }
 }

src/Helldivers-2-Core/Storage/V1/SpaceStationStore.cs

@@ -4,8 +4,8 @@
 namespace Helldivers.Core.Storage.V1;
 
 /// <inheritdoc cref="IStore{T,TKey}" />
-public sealed class SpaceStationStore : StoreBase<SpaceStation, int>
+public sealed class SpaceStationStore : StoreBase<SpaceStation, long>
 {
     /// <inheritdoc />
-    protected override bool GetAsyncPredicate(SpaceStation station, int index) => station.Id32 == index;
+    protected override bool GetAsyncPredicate(SpaceStation station, long index) => station.Id32 == index;
 }