feat: Refactor orchestration status handling and improve progress tracking in map rotations

Author: frasermolyneux

src/XtremeIdiots.Portal.Web/Controllers/MapRotationsController.cs

@@ -608,7 +608,7 @@ public async Task<IActionResult> SyncAssignment(Guid assignmentId, Guid mapRotat
             if (result.Success)
             {
                 this.AddAlertSuccess("Sync triggered successfully.");
-                TempData["ActiveInstanceId"] = $"maprot-sync-{assignmentId}";
+                TempData["PendingInstanceId"] = $"maprot-sync-{assignmentId}";
             }
             else
             {
@@ -650,7 +650,7 @@ public async Task<IActionResult> ActivateAssignment(Guid assignmentId, Guid mapR
             if (result.Success)
             {
                 this.AddAlertSuccess("Activation triggered successfully.");
-                TempData["ActiveInstanceId"] = $"maprot-activate-{assignmentId}";
+                TempData["PendingInstanceId"] = $"maprot-activate-{assignmentId}";
             }
             else
             {
@@ -692,7 +692,7 @@ public async Task<IActionResult> DeactivateAssignment(Guid assignmentId, Guid ma
             if (result.Success)
             {
                 this.AddAlertSuccess("Deactivation triggered successfully.");
-                TempData["ActiveInstanceId"] = $"maprot-deactivate-{assignmentId}";
+                TempData["PendingInstanceId"] = $"maprot-deactivate-{assignmentId}";
             }
             else
             {
@@ -706,9 +706,21 @@ public async Task<IActionResult> DeactivateAssignment(Guid assignmentId, Guid ma
     [HttpGet]
     public async Task<IActionResult> GetSyncProgress(string instanceId, CancellationToken cancellationToken = default)
     {
-        var result = await syncApiClient.GetOrchestrationStatus(instanceId, cancellationToken).ConfigureAwait(false);
-        if (result == null)
-            return Json(new { status = "unknown" });
-        return Json(result);
+        var queryResult = await syncApiClient.GetOrchestrationStatus(instanceId, cancellationToken).ConfigureAwait(false);
+        return queryResult.Outcome switch
+        {
+            Services.OrchestrationStatusQueryOutcome.Found => Json(new
+            {
+                status = "found",
+                instanceId = queryResult.Result!.InstanceId,
+                runtimeStatus = queryResult.Result.RuntimeStatus,
+                createdAt = queryResult.Result.CreatedAt,
+                lastUpdatedAt = queryResult.Result.LastUpdatedAt,
+                progress = queryResult.Result.Progress
+            }),
+            Services.OrchestrationStatusQueryOutcome.NotFound => Json(new { status = "not_found" }),
+            Services.OrchestrationStatusQueryOutcome.Error => Json(new { status = "error" }),
+            _ => Json(new { status = "error" })
+        };
     }
 }

src/XtremeIdiots.Portal.Web/Services/ISyncApiClient.cs

@@ -6,7 +6,7 @@ public interface ISyncApiClient
     Task<SyncTriggerResult> TriggerActivate(Guid assignmentId, CancellationToken cancellationToken = default);
     Task<SyncTriggerResult> TriggerDeactivate(Guid assignmentId, CancellationToken cancellationToken = default);
     Task<SyncTriggerResult> TriggerRemove(Guid assignmentId, CancellationToken cancellationToken = default);
-    Task<OrchestrationStatusResult?> GetOrchestrationStatus(string instanceId, CancellationToken cancellationToken = default);
+    Task<OrchestrationStatusQueryResult> GetOrchestrationStatus(string instanceId, CancellationToken cancellationToken = default);
 }
 
 public record SyncTriggerResult(bool Success, string? InstanceId = null, string? Error = null);
@@ -18,6 +18,17 @@ public record OrchestrationStatusResult(
     DateTime LastUpdatedAt,
     OrchestrationProgressDto? Progress);
 
+public record OrchestrationStatusQueryResult(
+    OrchestrationStatusQueryOutcome Outcome,
+    OrchestrationStatusResult? Result = null);
+
+public enum OrchestrationStatusQueryOutcome
+{
+    Found,
+    NotFound,
+    Error
+}
+
 public record OrchestrationProgressDto(
     string Operation,
     int TotalMaps,

src/XtremeIdiots.Portal.Web/Services/NoOpSyncApiClient.cs

@@ -22,8 +22,8 @@ public Task<SyncTriggerResult> TriggerRemove(Guid assignmentId, CancellationToke
         return Task.FromResult(new SyncTriggerResult(false, Error: "Sync API not configured"));
     }
 
-    public Task<OrchestrationStatusResult?> GetOrchestrationStatus(string instanceId, CancellationToken cancellationToken = default)
+    public Task<OrchestrationStatusQueryResult> GetOrchestrationStatus(string instanceId, CancellationToken cancellationToken = default)
     {
-        return Task.FromResult<OrchestrationStatusResult?>(null);
+        return Task.FromResult(new OrchestrationStatusQueryResult(OrchestrationStatusQueryOutcome.Error));
     }
 }

src/XtremeIdiots.Portal.Web/Services/SyncApiClient.cs

@@ -31,7 +31,7 @@ public Task<SyncTriggerResult> TriggerRemove(Guid assignmentId, CancellationToke
         return TriggerOrchestration($"/api/map-rotations/remove/{assignmentId}", cancellationToken);
     }
 
-    public async Task<OrchestrationStatusResult?> GetOrchestrationStatus(string instanceId, CancellationToken cancellationToken = default)
+    public async Task<OrchestrationStatusQueryResult> GetOrchestrationStatus(string instanceId, CancellationToken cancellationToken = default)
     {
         try
         {
@@ -42,15 +42,24 @@ public Task<SyncTriggerResult> TriggerRemove(Guid assignmentId, CancellationToke
             request.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", tokenResult.Token);
 
             var response = await httpClient.SendAsync(request, cancellationToken).ConfigureAwait(false);
-            if (!response.IsSuccessStatusCode) return null;
+
+            if (response.StatusCode == System.Net.HttpStatusCode.NotFound)
+                return new OrchestrationStatusQueryResult(OrchestrationStatusQueryOutcome.NotFound);
+
+            if (!response.IsSuccessStatusCode)
+            {
+                logger.LogWarning("Sync API returned {StatusCode} for orchestration status {InstanceId}", (int)response.StatusCode, instanceId);
+                return new OrchestrationStatusQueryResult(OrchestrationStatusQueryOutcome.Error);
+            }
 
             var json = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
-            return System.Text.Json.JsonSerializer.Deserialize<OrchestrationStatusResult>(json, jsonOptions);
+            var result = System.Text.Json.JsonSerializer.Deserialize<OrchestrationStatusResult>(json, jsonOptions);
+            return new OrchestrationStatusQueryResult(OrchestrationStatusQueryOutcome.Found, result);
         }
         catch (Exception ex)
         {
             logger.LogError(ex, "Failed to get orchestration status for {InstanceId}", instanceId);
-            return null;
+            return new OrchestrationStatusQueryResult(OrchestrationStatusQueryOutcome.Error);
         }
     }