Add merge status API to fw-headless

backend/FwHeadless/FwHeadlessKernel.cs

@@ -17,6 +17,7 @@ public static void AddFwHeadless(this IServiceCollection services)
             .BindConfiguration("FwHeadlessConfig")
             .ValidateDataAnnotations()
             .ValidateOnStart();
+        services.AddSingleton<ProjectSyncStatusService>();
         services.AddScoped<SendReceiveService>();
         services.AddScoped<ProjectLookupService>();
         services.AddScoped<LogSanitizerService>();

backend/FwHeadless/Program.cs

@@ -1,4 +1,5 @@
 using FwHeadless;
+using FwHeadless.Services;
 using FwDataMiniLcmBridge;
 using FwDataMiniLcmBridge.Api;
 using FwLiteProjectSync;
@@ -49,6 +50,7 @@
 app.MapHealthChecks("/api/healthz");
 
 app.MapPost("/api/crdt-sync", ExecuteMergeRequest);
+app.MapGet("/api/crdt-sync-status", GetMergeStatus);
 
 app.Run();
 
@@ -60,6 +62,7 @@ static async Task<Results<Ok<SyncResult>, NotFound, ProblemHttpResult>> ExecuteM
     FwDataFactory fwDataFactory,
     CrdtProjectsService projectsService,
     ProjectLookupService projectLookupService,
+    ProjectSyncStatusService syncStatusService,
     CrdtFwdataProjectSyncService syncService,
     CrdtHttpSyncService crdtHttpSyncService,
     IHttpClientFactory httpClientFactory,
@@ -73,6 +76,8 @@ static async Task<Results<Ok<SyncResult>, NotFound, ProblemHttpResult>> ExecuteM
         return TypedResults.Ok(new SyncResult(0, 0));
     }
 
+    using var syncStatusUpdater = new ProjectSyncStatusUpdater(syncStatusService, projectId);
+
     var projectCode = await projectLookupService.GetProjectCode(projectId);
     if (projectCode is null)
     {
@@ -103,7 +108,6 @@ static async Task<Results<Ok<SyncResult>, NotFound, ProblemHttpResult>> ExecuteM
     var crdtSyncService = services.GetRequiredService<CrdtSyncService>();
     await crdtSyncService.Sync();
 
-
     var result = await syncService.Sync(miniLcmApi, fwdataApi, dryRun);
     logger.LogInformation("Sync result, CrdtChanges: {CrdtChanges}, FwdataChanges: {FwdataChanges}", result.CrdtChanges, result.FwdataChanges);
 
@@ -113,6 +117,18 @@ static async Task<Results<Ok<SyncResult>, NotFound, ProblemHttpResult>> ExecuteM
     return TypedResults.Ok(result);
 }
 
+static async Task<Results<Ok<ProjectSyncStatus>, NotFound>> GetMergeStatus(
+    ProjectLookupService projectLookupService,
+    ProjectSyncStatusService syncStatusService,
+    Guid projectId)
+{
+    var status = syncStatusService.SyncStatus(projectId);
+    if (status is not null) return TypedResults.Ok(status.Value);
+    // 404 only means "project doesn't exist"; if we don't know the status, then it hasn't synced before and is therefore ready to sync
+    if (await projectLookupService.ProjectExists(projectId)) return TypedResults.Ok(ProjectSyncStatus.ReadyToSync);
+    else return TypedResults.NotFound();
+}
+
 static async Task<FwDataMiniLcmApi> SetupFwData(FwDataProject fwDataProject,
     SendReceiveService srService,
     string projectCode,

backend/FwHeadless/Services/AppVersionService.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
 
-namespace FwHeadless;
+namespace FwHeadless.Services;
 
 public static class AppVersionService
 {

backend/FwHeadless/CrdtSyncService.cs → backend/FwHeadless/Services/CrdtSyncService.cs

@@ -2,7 +2,7 @@
 using LcmCrdt.RemoteSync;
 using SIL.Harmony;
 
-namespace FwHeadless;
+namespace FwHeadless.Services;
 
 public class CrdtSyncService(
     CrdtHttpSyncService httpSyncService,

backend/FwHeadless/ProjectLookupService.cs → backend/FwHeadless/Services/ProjectLookupService.cs

@@ -2,7 +2,7 @@
 using Microsoft.EntityFrameworkCore;
 using SIL.Harmony.Core;
 
-namespace FwHeadless;
+namespace FwHeadless.Services;
 
 public class ProjectLookupService(LexBoxDbContext dbContext)
 {
@@ -15,6 +15,11 @@ public class ProjectLookupService(LexBoxDbContext dbContext)
         return projectCode;
     }
 
+    public async Task<bool> ProjectExists(Guid projectId)
+    {
+        return await dbContext.Projects.AnyAsync(p => p.Id == projectId);
+    }
+
     public async Task<bool> IsCrdtProject(Guid projectId)
     {
         return await dbContext.Set<ServerCommit>().AnyAsync(c => c.ProjectId == projectId);

backend/FwHeadless/Services/ProjectSyncStatusService.cs

@@ -0,0 +1,47 @@
+using System.Collections.Concurrent;
+
+namespace FwHeadless.Services;
+
+public class ProjectSyncStatusService()
+{
+    private ConcurrentDictionary<Guid, ProjectSyncStatus> Status { get; init; } = new();
+
+    public void StartSyncing(Guid projectId)
+    {
+        Status.AddOrUpdate(projectId, (_) => ProjectSyncStatus.Syncing, (_, _) => ProjectSyncStatus.Syncing);
+    }
+
+    public void StopSyncing(Guid projectId)
+    {
+        Status.AddOrUpdate(projectId, (_) => ProjectSyncStatus.ReadyToSync, (_, _) => ProjectSyncStatus.ReadyToSync);
+    }
+
+    public ProjectSyncStatus? SyncStatus(Guid projectId)
+    {
+        return Status.TryGetValue(projectId, out var status) ? status : null;
+    }
+}
+
+public class ProjectSyncStatusUpdater : IDisposable
+{
+    private readonly Guid _projectId;
+    private readonly ProjectSyncStatusService _statusService;
+
+    public ProjectSyncStatusUpdater(ProjectSyncStatusService statusService, Guid projectId)
+    {
+        _projectId = projectId;
+        _statusService = statusService;
+        _statusService.StartSyncing(_projectId);
+    }
+
+    public void Dispose()
+    {
+        _statusService.StopSyncing(_projectId);
+    }
+}
+
+public enum ProjectSyncStatus
+{
+    ReadyToSync,
+    Syncing,
+}

backend/FwHeadless/SendReceiveHelpers.cs → backend/FwHeadless/Services/SendReceiveHelpers.cs

@@ -1,7 +1,7 @@
 using FwDataMiniLcmBridge;
 using SIL.Progress;
 
-namespace FwHeadless;
+namespace FwHeadless.Services;
 
 public static class SendReceiveHelpers
 {

backend/FwHeadless/SendReceiveService.cs → backend/FwHeadless/Services/SendReceiveService.cs

@@ -1,8 +1,7 @@
 using FwDataMiniLcmBridge;
-using FwHeadless.Services;
 using Microsoft.Extensions.Options;
 
-namespace FwHeadless;
+namespace FwHeadless.Services;
 
 public class SendReceiveService(IOptions<FwHeadlessConfig> config, SafeLoggingProgress progress)
 {