Add test for syncing complex forms twice

backend/FwLite/FwDataMiniLcmBridge.Tests/Fixtures/FwDataTestsKernel.cs

@@ -6,13 +6,16 @@ namespace FwDataMiniLcmBridge.Tests.Fixtures;
 
 public static class FwDataTestsKernel
 {
-    public static IServiceCollection AddTestFwDataBridge(this IServiceCollection services)
+    public static IServiceCollection AddTestFwDataBridge(this IServiceCollection services, bool mockProjectLoader = true)
     {
         services.AddFwDataBridge();
         services.AddSingleton<IConfiguration>(_ => new ConfigurationRoot([]));
-        services.AddSingleton<MockFwProjectLoader>();
-        services.AddSingleton<IProjectLoader>(sp => sp.GetRequiredService<MockFwProjectLoader>());
-        services.AddSingleton<FieldWorksProjectList, MockFwProjectList>();
+        if (mockProjectLoader)
+        {
+            services.AddSingleton<MockFwProjectLoader>();
+            services.AddSingleton<IProjectLoader>(sp => sp.GetRequiredService<MockFwProjectLoader>());
+            services.AddSingleton<FieldWorksProjectList, MockFwProjectList>();
+        }
         return services;
     }
 }

backend/FwLite/FwDataMiniLcmBridge/Api/FwDataMiniLcmApi.cs

@@ -6,6 +6,7 @@
 using FwDataMiniLcmBridge.LcmUtils;
 using Microsoft.Extensions.Logging;
 using MiniLcm;
+using MiniLcm.Exceptions;
 using MiniLcm.Models;
 using MiniLcm.SyncHelpers;
 using SIL.LCModel;
@@ -37,6 +38,8 @@ public class FwDataMiniLcmApi(Lazy<LcmCache> cacheLazy, bool onCloseSave, ILogge
     private ICmTranslationFactory CmTranslationFactory => Cache.ServiceLocator.GetInstance<ICmTranslationFactory>();
     private ICmPossibilityRepository CmPossibilityRepository => Cache.ServiceLocator.GetInstance<ICmPossibilityRepository>();
     private ICmPossibilityList ComplexFormTypes => Cache.LangProject.LexDbOA.ComplexEntryTypesOA;
+    private IEnumerable<ILexEntryType> ComplexFormTypesFlattened => ComplexFormTypes.PossibilitiesOS.Cast<ILexEntryType>().Flatten();
+
     private ICmPossibilityList VariantTypes => Cache.LangProject.LexDbOA.VariantEntryTypesOA;
 
     public void Dispose()
@@ -326,12 +329,9 @@ public Task DeleteSemanticDomain(Guid id)
 
     public IAsyncEnumerable<ComplexFormType> GetComplexFormTypes()
     {
-        return ComplexFormTypes.PossibilitiesOS
-            .Select(ToComplexFormType)
-            .ToAsyncEnumerable();
+        return ComplexFormTypesFlattened.Select(ToComplexFormType).ToAsyncEnumerable();
     }
-
-    private ComplexFormType ToComplexFormType(ICmPossibility t)
+    private ComplexFormType ToComplexFormType(ILexEntryType t)
     {
         return new ComplexFormType() { Id = t.Guid, Name = FromLcmMultiString(t.Name) };
     }
@@ -350,7 +350,7 @@ public Task<ComplexFormType> CreateComplexFormType(ComplexFormType complexFormTy
                 ComplexFormTypes.PossibilitiesOS.Add(lexComplexFormType);
                 UpdateLcmMultiString(lexComplexFormType.Name, complexFormType.Name);
             });
-        return Task.FromResult(ToComplexFormType(ComplexFormTypes.PossibilitiesOS.Single(c => c.Guid == complexFormType.Id)));
+        return Task.FromResult(ToComplexFormType(ComplexFormTypesFlattened.Single(c => c.Guid == complexFormType.Id)));
     }
 
     public IAsyncEnumerable<VariantType> GetVariantTypes()
@@ -390,6 +390,15 @@ private Entry FromLexEntry(ILexEntry entry)
         };
     }
 
+    private string LexEntryHeadword(ILexEntry entry)
+    {
+        return new Entry()
+        {
+            LexemeForm = FromLcmMultiString(entry.LexemeFormOA.Form),
+            CitationForm = FromLcmMultiString(entry.CitationForm),
+        }.Headword();
+    }
+
     private IList<ComplexFormType> ToComplexFormTypes(ILexEntry entry)
     {
         return entry.ComplexFormEntryRefs.SingleOrDefault()
@@ -438,9 +447,9 @@ private ComplexFormComponent ToEntryReference(ILexEntry component, ILexEntry com
         return new ComplexFormComponent
         {
             ComponentEntryId = component.Guid,
-            ComponentHeadword = component.HeadWord.Text,
+            ComponentHeadword = LexEntryHeadword(component),
             ComplexFormEntryId = complexEntry.Guid,
-            ComplexFormHeadword = complexEntry.HeadWord.Text
+            ComplexFormHeadword = LexEntryHeadword(complexEntry)
         };
     }
 
@@ -452,7 +461,7 @@ private ComplexFormComponent ToSenseReference(ILexSense componentSense, ILexEntr
             ComponentSenseId = componentSense.Guid,
             ComponentHeadword = componentSense.Entry.HeadWord.Text,
             ComplexFormEntryId = complexEntry.Guid,
-            ComplexFormHeadword = complexEntry.HeadWord.Text
+            ComplexFormHeadword = LexEntryHeadword(complexEntry)
         };
     }
 
@@ -559,40 +568,48 @@ public IAsyncEnumerable<Entry> SearchEntries(string query, QueryOptions? options
     public async Task<Entry> CreateEntry(Entry entry)
     {
         entry.Id = entry.Id == default ? Guid.NewGuid() : entry.Id;
-        UndoableUnitOfWorkHelper.DoUsingNewOrCurrentUOW("Create Entry",
-            "Remove entry",
-            Cache.ServiceLocator.ActionHandler,
-            () =>
-            {
-                var lexEntry = LexEntryFactory.Create(entry.Id, Cache.ServiceLocator.GetInstance<ILangProjectRepository>().Singleton.LexDbOA);
-                lexEntry.LexemeFormOA = Cache.ServiceLocator.GetInstance<IMoStemAllomorphFactory>().Create();
-                UpdateLcmMultiString(lexEntry.LexemeFormOA.Form, entry.LexemeForm);
-                UpdateLcmMultiString(lexEntry.CitationForm, entry.CitationForm);
-                UpdateLcmMultiString(lexEntry.LiteralMeaning, entry.LiteralMeaning);
-                UpdateLcmMultiString(lexEntry.Comment, entry.Note);
-
-                foreach (var sense in entry.Senses)
-                {
-                    CreateSense(lexEntry, sense);
-                }
-
-                //form types should be created before components, otherwise the form type "unspecified" will be added
-                foreach (var complexFormType in entry.ComplexFormTypes)
-                {
-                    AddComplexFormType(lexEntry, complexFormType.Id);
-                }
-
-                foreach (var component in entry.Components)
-                {
-                    AddComplexFormComponent(lexEntry, component);
-                }
-
-                foreach (var complexForm in entry.ComplexForms)
+        try
+        {
+            UndoableUnitOfWorkHelper.DoUsingNewOrCurrentUOW("Create Entry",
+                "Remove entry",
+                Cache.ServiceLocator.ActionHandler,
+                () =>
                 {
-                    var complexLexEntry = EntriesRepository.GetObject(complexForm.ComplexFormEntryId);
-                    AddComplexFormComponent(complexLexEntry, complexForm);
-                }
-            });
+                    var lexEntry = LexEntryFactory.Create(entry.Id,
+                        Cache.ServiceLocator.GetInstance<ILangProjectRepository>().Singleton.LexDbOA);
+                    lexEntry.LexemeFormOA = Cache.ServiceLocator.GetInstance<IMoStemAllomorphFactory>().Create();
+                    UpdateLcmMultiString(lexEntry.LexemeFormOA.Form, entry.LexemeForm);
+                    UpdateLcmMultiString(lexEntry.CitationForm, entry.CitationForm);
+                    UpdateLcmMultiString(lexEntry.LiteralMeaning, entry.LiteralMeaning);
+                    UpdateLcmMultiString(lexEntry.Comment, entry.Note);
+
+                    foreach (var sense in entry.Senses)
+                    {
+                        CreateSense(lexEntry, sense);
+                    }
+
+                    //form types should be created before components, otherwise the form type "unspecified" will be added
+                    foreach (var complexFormType in entry.ComplexFormTypes)
+                    {
+                        AddComplexFormType(lexEntry, complexFormType.Id);
+                    }
+
+                    foreach (var component in entry.Components)
+                    {
+                        AddComplexFormComponent(lexEntry, component);
+                    }
+
+                    foreach (var complexForm in entry.ComplexForms)
+                    {
+                        var complexLexEntry = EntriesRepository.GetObject(complexForm.ComplexFormEntryId);
+                        AddComplexFormComponent(complexLexEntry, complexForm);
+                    }
+                });
+        }
+        catch (Exception e)
+        {
+            throw new CreateObjectException($"Failed to create entry {entry}", e);
+        }
 
         return await GetEntry(entry.Id) ?? throw new InvalidOperationException("Entry was not created");
     }
@@ -693,15 +710,16 @@ internal void AddComplexFormType(ILexEntry lexEntry, Guid complexFormTypeId)
             entryRef.HideMinorEntry = 0;
         }
 
-        var lexEntryType = (ILexEntryType)ComplexFormTypes.PossibilitiesOS.Single(c => c.Guid == complexFormTypeId);
+        var lexEntryType = ComplexFormTypesFlattened.Single(c => c.Guid == complexFormTypeId);
         entryRef.ComplexEntryTypesRS.Add(lexEntryType);
     }
 
     internal void RemoveComplexFormType(ILexEntry lexEntry, Guid complexFormTypeId)
     {
         ILexEntryRef? entryRef = lexEntry.ComplexFormEntryRefs.SingleOrDefault();
         if (entryRef is null) return;
-        var lexEntryType = (ILexEntryType)ComplexFormTypes.PossibilitiesOS.Single(c => c.Guid == complexFormTypeId);
+        var lexEntryType = entryRef.ComplexEntryTypesRS.SingleOrDefault(c => c.Guid == complexFormTypeId);
+        if (lexEntryType is null) return;
         entryRef.ComplexEntryTypesRS.Remove(lexEntryType);
     }
 

backend/FwLite/FwDataMiniLcmBridge/Api/PossibilityExtensions.cs

@@ -0,0 +1,18 @@
+using SIL.LCModel;
+
+namespace FwDataMiniLcmBridge.Api;
+
+public static class PossibilityExtensions
+{
+    public static IEnumerable<T> Flatten<T>(this IEnumerable<T> enumerable) where T : ICmPossibility
+    {
+        foreach (var cmPossibility in enumerable)
+        {
+            yield return cmPossibility;
+            foreach (var child in Flatten(cmPossibility.SubPossibilitiesOS.Cast<T>()))
+            {
+                yield return child;
+            }
+        }
+    }
+}

backend/FwLite/FwDataMiniLcmBridge/Api/UpdateProxy/UpdateEntryProxy.cs

@@ -4,7 +4,7 @@
 
 namespace FwDataMiniLcmBridge.Api.UpdateProxy;
 
-public class UpdateEntryProxy : Entry
+public record UpdateEntryProxy : Entry
 {
     private readonly ILexEntry _lcmEntry;
     private readonly FwDataMiniLcmApi _lexboxLcmApi;
@@ -50,7 +50,7 @@
         get =>
             new UpdateListProxy<Sense>(
                 sense => _lexboxLcmApi.CreateSense(_lcmEntry, sense),
                 sense => _lexboxLcmApi.DeleteSense(Id, sense.Id),
                 i => new UpdateSenseProxy(_lcmEntry.SensesOS[i], _lexboxLcmApi),
                 _lcmEntry.SensesOS.Count
             );

backend/FwLite/FwLiteProjectSync.Tests/EntrySyncTests.cs

@@ -95,8 +95,8 @@ public async Task CanChangeComplexFormViaSync_ComplexForms()
     [Fact]
     public async Task CanChangeComplexFormTypeViaSync()
     {
+        var complexFormType = await _fixture.CrdtApi.CreateComplexFormType(new() { Name = new() { { "en", "complexFormType" } } });
         var entry = await _fixture.CrdtApi.CreateEntry(new() { LexemeForm = { { "en", "complexForm1" } } });
-        var complexFormType = await _fixture.CrdtApi.GetComplexFormTypes().FirstAsync();
         var after = (Entry) entry.Copy();
         after.ComplexFormTypes = [complexFormType];
         await EntrySync.Sync(after, entry, _fixture.CrdtApi);

backend/FwLite/FwLiteProjectSync.Tests/Fixtures/LexboxConfig.cs

@@ -0,0 +1,14 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace FwLiteProjectSync.Tests.Fixtures;
+
+public class LexboxConfig
+{
+    [Required, Url, RegularExpression(@"^.+/$", ErrorMessage = "Must end with '/'")]
+    public required string LexboxUrl { get; set; }
+    public string HgWebUrl => $"{LexboxUrl}hg/";
+    [Required]
+    public required string LexboxUsername { get; set; }
+    [Required]
+    public required string LexboxPassword { get; set; }
+}

backend/FwLite/FwLiteProjectSync.Tests/Fixtures/MercurialTestHelper.cs

@@ -0,0 +1,31 @@
+using SIL.CommandLineProcessing;
+using SIL.PlatformUtilities;
+using SIL.Progress;
+
+namespace FwLiteProjectSync.Tests.Fixtures;
+
+public static class MercurialTestHelper
+{
+    public static string HgCommand =>
+        Path.Combine("Mercurial", Platform.IsWindows ? "hg.exe" : "hg");
+
+    private static string RunHgCommand(string repoPath, string args)
+    {
+        var result = CommandLineRunner.Run(HgCommand, args, repoPath, 120, new NullProgress());
+        if (result.ExitCode == 0) return result.StandardOutput;
+        throw new Exception(
+            $"hg {args} failed.\nStdOut: {result.StandardOutput}\nStdErr: {result.StandardError}");
+
+    }
+
+    public static void HgClean(string repoPath, string exclude)
+    {
+        RunHgCommand(repoPath, $"purge --no-confirm --exclude {exclude}");
+    }
+
+    public static void HgUpdate(string repoPath, string rev)
+    {
+        RunHgCommand(repoPath, $"update \"{rev}\"");
+    }
+}
+