Fix support for MissionSiteExpiredEvent

src/api/ApplyPlayerActionRoute.cs

@@ -3,6 +3,7 @@
 using Lib.OS;
 using Microsoft.AspNetCore.Http.HttpResults;
 using UfoGameLib.Controller;
+using UfoGameLib.Events;
 using UfoGameLib.Lib;
 using UfoGameLib.State;
 
@@ -46,7 +47,7 @@ private static JsonHttpResult<GameSessionTurn> ApplyPlayerActionInternal(
         var controller = new GameSessionController(config, log, gameSession);
 
         // kja2-assert: make this check stronger, for membership in valid action name. See https://chatgpt.com/c/fb0a4197-4397-4f3f-bc13-2e0468141b0b        
-        Contract.Assert(playerActionPayload.ActionName != "AdvanceTimePlayerAction");
+        Contract.Assert(playerActionPayload.ActionName != GameEventName.AdvanceTimePlayerAction);
 
         gameSession.CurrentPlayerActionEvents.Add(playerActionPayload.Apply(controller));
         // See analogous line in UfoGameLib.Controller.GameSessionController.PlayGameUntilOver

src/api/PlayerActionPayload.cs

@@ -41,7 +41,7 @@ private Func<PlayerActionEvent> TranslatePlayerActionToControllerAction(GameSess
         // https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/operators/patterns#positional-pattern
         => ActionName switch
         {
-            "AdvanceTimePlayerAction" => controller.AdvanceTimeNoWorldEvents,
+            EventNames.AdvanceTimePlayerAction => controller.AdvanceTimeNoWorldEvents,
             nameof(BuyTransportCapacityPlayerAction) => () => controller.CurrentTurnController.BuyTransportCapacity(TargetId!.Value),
             nameof(HireAgentsPlayerAction) => () => controller.CurrentTurnController.HireAgents(TargetId!.Value),
             nameof(SackAgentsPlayerAction) => () => controller.CurrentTurnController.SackAgents(Ids!),

src/game-lib/Controller/TimeAdvancementController.cs

@@ -33,7 +33,7 @@ public TimeAdvancementController(ILog log, RandomGen randomGen, EventIdGen event
 
         PlayerActionEvent advanceTimeEvent = new PlayerActionEvent(
             _eventIdGen.Generate,
-            "AdvanceTimePlayerAction",
+            GameEventName.AdvanceTimePlayerAction,
             targetId: state.Timeline.CurrentTurn);
 
         // Agents cost upkeep. Note we compute upkeep before evaluating missions.
@@ -200,7 +200,8 @@ private int UpdateActiveMissionSites(GameState state)
                 if (expired)
                 {
                     expiredMissions++;
-                    _worldEvents.Add(new MissionSiteExpiredEvent(_eventIdGen.Generate, missionSite.Id));
+                    _worldEvents.Add(
+                        new WorldEvent(_eventIdGen.Generate, GameEventName.MissionSiteExpiredEvent, missionSite.Id));
                     _log.Info($"{missionSite.LogString} expired!");
                 }
             }

src/game-lib/Events/GameEventName.cs

@@ -0,0 +1,7 @@
+namespace UfoGameLib.Events;
+
+public static class GameEventName
+{
+    public const string AdvanceTimePlayerAction = "AdvanceTimePlayerAction";
+    public const string WorldEvent = "WorldEvent";
+}

src/game-lib/Events/WorldEvent.cs

@@ -2,13 +2,15 @@
 
 namespace UfoGameLib.Events;
 
-[JsonDerivedType(typeof(MissionSiteExpiredEvent))]
 public class WorldEvent : GameEvent
 {
-    public WorldEvent(int id, string type) : base(id, type)
+    public readonly int TargetId;
+
+    public WorldEvent(int id, string type, int targetId) : base(id, type)
     {
+        TargetId = targetId;    
     }
 
     public override WorldEvent Clone()
-        => new(Id, Type);
+        => new(Id, Type, TargetId);
 }

web/src/lib/codesync/WorldEvent.ts

@@ -1,9 +1,8 @@
 // codesync: UfoGameLib.Events.WorldEvent
 import type { GameEventBase } from './GameEvent'
 
-export type WorldEvent = MissionSiteExpiredEvent
-
-export type MissionSiteExpiredEvent = GameEventBase & {
+export type WorldEvent = GameEventBase & {
   readonly TargetId: number
 }
+
 export type WorldEventName = 'MissionSiteExpiredEvent'

web/src/lib/rendering/renderGameEvent.ts

@@ -68,7 +68,7 @@ export function getDisplayedDetails(event: GameEventWithTurn): string {
   return formatString(
     playerActionNameToDisplayMap[event.Type as PlayerActionName]
       .displayedDetails,
-    event.Ids,
+    'Ids' in event ? event.Ids : undefined,
     event.TargetId,
   )
 }