Tidy up CrdtFwdataProjectSyncService

Author: myieye

backend/FwLite/FwLiteProjectSync/CrdtFwdataProjectSyncService.cs

@@ -1,5 +1,4 @@
 using System.Diagnostics;
-using FwDataMiniLcmBridge;
 using FwDataMiniLcmBridge.Api;
 using LcmCrdt;
 using LexCore.Sync;
@@ -11,8 +10,9 @@
 
 namespace FwLiteProjectSync;
 
-public class CrdtFwdataProjectSyncService(MiniLcmImport miniLcmImport, ProjectSnapshotService projectSnapshotService,
-    ILogger<CrdtFwdataProjectSyncService> logger, MiniLcmApiValidationWrapperFactory validationWrapperFactory,
+public class CrdtFwdataProjectSyncService(MiniLcmImport miniLcmImport,
+    ILogger<CrdtFwdataProjectSyncService> logger,
+    MiniLcmApiValidationWrapperFactory validationWrapperFactory,
     MiniLcmApiStringNormalizationWrapperFactory normalizationWrapperFactory)
 {
     public record DryRunSyncResult(
@@ -28,50 +28,32 @@ public async Task<DryRunSyncResult> SyncDryRun(IMiniLcmApi crdtApi, FwDataMiniLc
 
     public virtual async Task<SyncResult> Sync(IMiniLcmApi crdtApi, FwDataMiniLcmApi fwdataApi, ProjectSnapshot projectSnapshot, bool dryRun = false)
     {
-        using var activity = FwLiteProjectSyncActivitySource.Value.StartActivity();
-        if (crdtApi is not CrdtMiniLcmApi crdt) // maybe the argument type should be changed?
-            throw new InvalidOperationException("CrdtApi must be of type CrdtMiniLcmApi to sync.");
-        if (crdt.ProjectData.FwProjectId != fwdataApi.ProjectId)
-        {
-            activity?.SetStatus(ActivityStatusCode.Error, $"Project id mismatch, CRDT Id: {crdt.ProjectData.FwProjectId}, FWData Id: {fwdataApi.ProjectId}");
-            throw new InvalidOperationException($"Project id mismatch, CRDT Id: {crdt.ProjectData.FwProjectId}, FWData Id: {fwdataApi.ProjectId}");
-        }
-
-        // Repair any missing translation IDs before doing the full sync, so the sync doesn't have to deal with them
-        var syncedIdCount = await CrdtRepairs.SyncMissingTranslationIds(projectSnapshot.Entries, fwdataApi, crdt, dryRun);
-
-        SyncResult result = await Sync(crdtApi, fwdataApi, dryRun, projectSnapshot);
-        fwdataApi.Save();
-        return result;
+        return await SyncOrImportInternal(crdtApi, fwdataApi, dryRun, projectSnapshot);
     }
 
     public async Task<DryRunSyncResult> ImportDryRun(IMiniLcmApi crdtApi, FwDataMiniLcmApi fwdataApi)
     {
         return (DryRunSyncResult)await Import(crdtApi, fwdataApi, true);
     }
 
-    public virtual async Task<SyncResult> Import(IMiniLcmApi crdtApi, FwDataMiniLcmApi fwdataApi, bool dryRun = false, bool keepSnapshotBackup = false)
+    public virtual async Task<SyncResult> Import(IMiniLcmApi crdtApi, FwDataMiniLcmApi fwdataApi, bool dryRun = false)
+    {
+        return await SyncOrImportInternal(crdtApi, fwdataApi, dryRun, projectSnapshot: null);
+    }
+
+    private async Task<SyncResult> SyncOrImportInternal(IMiniLcmApi crdtApi, IMiniLcmApi fwdataApi, bool dryRun, ProjectSnapshot? projectSnapshot)
     {
         using var activity = FwLiteProjectSyncActivitySource.Value.StartActivity();
         if (crdtApi is not CrdtMiniLcmApi crdt) // maybe the argument type should be changed?
-            throw new InvalidOperationException("CrdtApi must be of type CrdtMiniLcmApi to import.");
-        if (crdt.ProjectData.FwProjectId != fwdataApi.ProjectId)
-        {
-            activity?.SetStatus(ActivityStatusCode.Error, $"Project id mismatch, CRDT Id: {crdt.ProjectData.FwProjectId}, FWData Id: {fwdataApi.ProjectId}");
-            throw new InvalidOperationException($"Project id mismatch, CRDT Id: {crdt.ProjectData.FwProjectId}, FWData Id: {fwdataApi.ProjectId}");
-        }
-
-        var result = await ImportInternal(crdtApi, fwdataApi, dryRun, fwdataApi.EntryCount);
-        fwdataApi.Save();
-        if (!dryRun)
+            throw new InvalidOperationException("CrdtApi must be of type CrdtMiniLcmApi to sync.");
+        if (fwdataApi is not FwDataMiniLcmApi fwdata) // maybe the argument type should be changed?
+            throw new InvalidOperationException("FwdataApi must be of type FwDataMiniLcmApi to sync.");
+        if (crdt.ProjectData.FwProjectId != fwdata.ProjectId)
         {
-            await projectSnapshotService.RegenerateProjectSnapshot(crdtApi, fwdataApi.Project, keepSnapshotBackup);
+            activity?.SetStatus(ActivityStatusCode.Error, $"Project id mismatch, CRDT Id: {crdt.ProjectData.FwProjectId}, FWData Id: {fwdata.ProjectId}");
+            throw new InvalidOperationException($"Project id mismatch, CRDT Id: {crdt.ProjectData.FwProjectId}, FWData Id: {fwdata.ProjectId}");
         }
-        return result;
-    }
 
-    private async Task<SyncResult> Sync(IMiniLcmApi crdtApi, IMiniLcmApi fwdataApi, bool dryRun, ProjectSnapshot projectSnapshot)
-    {
         crdtApi = normalizationWrapperFactory.Create(validationWrapperFactory.Create(crdtApi));
         fwdataApi = normalizationWrapperFactory.Create(validationWrapperFactory.Create(fwdataApi));
 
@@ -81,6 +63,30 @@ private async Task<SyncResult> Sync(IMiniLcmApi crdtApi, IMiniLcmApi fwdataApi,
             fwdataApi = new DryRunMiniLcmApi(fwdataApi);
         }
 
+        if (projectSnapshot is not null)
+        {
+            // Repair any missing translation IDs before doing the full sync, so the sync doesn't have to deal with them
+            var syncedIdCount = await CrdtRepairs.SyncMissingTranslationIds(projectSnapshot.Entries, fwdata, crdt, dryRun);
+        }
+
+        var syncResult = projectSnapshot is null
+            ? await ImportInternal(crdtApi, fwdataApi, fwdata.EntryCount)
+            : await SyncInternal(crdtApi, fwdataApi, projectSnapshot);
+
+        if (!dryRun)
+        {
+            fwdata.Save();
+            return syncResult;
+        }
+
+        LogDryRun(crdtApi, "crdt");
+        LogDryRun(fwdataApi, "fwdata");
+        return new DryRunSyncResult(syncResult.CrdtChanges, syncResult.FwdataChanges,
+            GetDryRunRecords(crdtApi), GetDryRunRecords(fwdataApi));
+    }
+
+    private async Task<SyncResult> SyncInternal(IMiniLcmApi crdtApi, IMiniLcmApi fwdataApi, ProjectSnapshot projectSnapshot)
+    {
         var currentFwDataWritingSystems = await fwdataApi.GetWritingSystems();
         var crdtChanges = await WritingSystemSync.Sync(projectSnapshot.WritingSystems, currentFwDataWritingSystems, crdtApi);
         var fwdataChanges = await WritingSystemSync.Sync(currentFwDataWritingSystems, await crdtApi.GetWritingSystems(), fwdataApi);
@@ -103,30 +109,14 @@ private async Task<SyncResult> Sync(IMiniLcmApi crdtApi, IMiniLcmApi fwdataApi,
 
         var currentFwDataEntries = await fwdataApi.GetAllEntries().ToArrayAsync();
         crdtChanges += await EntrySync.SyncFull(projectSnapshot.Entries, currentFwDataEntries, crdtApi);
-        LogDryRun(crdtApi, "crdt");
-
         fwdataChanges += await EntrySync.SyncFull(currentFwDataEntries, await crdtApi.GetAllEntries().ToArrayAsync(), fwdataApi);
-        LogDryRun(fwdataApi, "fwdata");
 
-        //todo push crdt changes to lexbox
-        if (dryRun) return new DryRunSyncResult(crdtChanges, fwdataChanges, GetDryRunRecords(crdtApi), GetDryRunRecords(fwdataApi));
         return new SyncResult(crdtChanges, fwdataChanges);
     }
 
-    private async Task<SyncResult> ImportInternal(IMiniLcmApi crdtApi, IMiniLcmApi fwdataApi, bool dryRun, int entryCount)
+    private async Task<SyncResult> ImportInternal(IMiniLcmApi crdtApi, IMiniLcmApi fwdataApi, int entryCount)
     {
-        crdtApi = normalizationWrapperFactory.Create(validationWrapperFactory.Create(crdtApi));
-        fwdataApi = normalizationWrapperFactory.Create(validationWrapperFactory.Create(fwdataApi));
-
-        if (dryRun)
-        {
-            crdtApi = new DryRunMiniLcmApi(crdtApi);
-            fwdataApi = new DryRunMiniLcmApi(fwdataApi);
-        }
-
         await miniLcmImport.ImportProject(crdtApi, fwdataApi, entryCount);
-        LogDryRun(crdtApi, "crdt");
-        if (dryRun) return new DryRunSyncResult(entryCount, 0, GetDryRunRecords(crdtApi), []);
         return new SyncResult(entryCount, 0);
     }
 
@@ -145,7 +135,4 @@ private void LogDryRun(IMiniLcmApi api, string type)
     {
         return ((DryRunMiniLcmApi)api).DryRunRecords;
     }
-
-    public static bool HasSyncedSuccessfully(FwDataProject project)
-        => ProjectSnapshotService.HasSyncedSuccessfully(project);
 }