From fa56386a429d1751498348aedba96ac3a939df2b Mon Sep 17 00:00:00 2001
From: Kevin Hahn <kevin_hahn@sil.org>
Date: Tue, 12 Nov 2024 13:12:57 +0700
Subject: [PATCH] write test for creating a complex form type, upgrade lcm so
 we can use the new Create(Guid id) api when creating the complex form type
 (#1223)

---
 .../FwLite/FwDataMiniLcmBridge/Api/FwDataMiniLcmApi.cs   | 5 ++---
 .../FwDataMiniLcmBridge/FwDataMiniLcmBridge.csproj       | 4 ++--
 backend/FwLite/LcmCrdt/CrdtMiniLcmApi.cs                 | 2 +-
 backend/FwLite/LocalWebApp/LocalWebApp.csproj            | 2 +-
 .../MiniLcm.Tests/ComplexFormComponentTestsBase.cs       | 9 +++++++++
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/backend/FwLite/FwDataMiniLcmBridge/Api/FwDataMiniLcmApi.cs b/backend/FwLite/FwDataMiniLcmBridge/Api/FwDataMiniLcmApi.cs
index 50f2a2aa6..e9d8fbe69 100644
--- a/backend/FwLite/FwDataMiniLcmBridge/Api/FwDataMiniLcmApi.cs
+++ b/backend/FwLite/FwDataMiniLcmBridge/Api/FwDataMiniLcmApi.cs
@@ -337,7 +337,7 @@ private ComplexFormType ToComplexFormType(ICmPossibility t)
 
     public Task<ComplexFormType> CreateComplexFormType(ComplexFormType complexFormType)
     {
-        if (complexFormType.Id != default) throw new InvalidOperationException("Complex form type id must be empty");
+        if (complexFormType.Id == default) complexFormType.Id = Guid.NewGuid();
         UndoableUnitOfWorkHelper.DoUsingNewOrCurrentUOW("Create complex form type",
             "Remove complex form type",
             Cache.ActionHandlerAccessor,
@@ -345,10 +345,9 @@ public Task<ComplexFormType> CreateComplexFormType(ComplexFormType complexFormTy
             {
                 var lexComplexFormType = Cache.ServiceLocator
                     .GetInstance<ILexEntryTypeFactory>()
-                    .Create();
+                    .Create(complexFormType.Id);
                 ComplexFormTypes.PossibilitiesOS.Add(lexComplexFormType);
                 UpdateLcmMultiString(lexComplexFormType.Name, complexFormType.Name);
-                complexFormType.Id = lexComplexFormType.Guid;
             });
         return Task.FromResult(ToComplexFormType(ComplexFormTypes.PossibilitiesOS.Single(c => c.Guid == complexFormType.Id)));
     }
diff --git a/backend/FwLite/FwDataMiniLcmBridge/FwDataMiniLcmBridge.csproj b/backend/FwLite/FwDataMiniLcmBridge/FwDataMiniLcmBridge.csproj
index 2192d7724..5ab11b140 100644
--- a/backend/FwLite/FwDataMiniLcmBridge/FwDataMiniLcmBridge.csproj
+++ b/backend/FwLite/FwDataMiniLcmBridge/FwDataMiniLcmBridge.csproj
@@ -14,9 +14,9 @@
         <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
         <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
-        <PackageReference Include="SIL.Core" Version="14.2.0-beta0009" />
+        <PackageReference Include="SIL.Core" Version="14.2.0-beta0022" />
         <PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3" Condition="$([MSBuild]::IsOsPlatform('Windows'))" />
-        <PackageReference Include="SIL.LCModel" Version="11.0.0-beta0100 " />
+        <PackageReference Include="SIL.LCModel" Version="11.0.0-beta0111" />
         <PackageReference Include="structuremap.patched" Version="4.7.3" />
         <PackageReference Include="System.Linq.Async" Version="6.0.1" />
         <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
diff --git a/backend/FwLite/LcmCrdt/CrdtMiniLcmApi.cs b/backend/FwLite/LcmCrdt/CrdtMiniLcmApi.cs
index 83261e1d7..c6491705f 100644
--- a/backend/FwLite/LcmCrdt/CrdtMiniLcmApi.cs
+++ b/backend/FwLite/LcmCrdt/CrdtMiniLcmApi.cs
@@ -142,7 +142,7 @@ public IAsyncEnumerable<ComplexFormType> GetComplexFormTypes()
         return ComplexFormTypes.AsAsyncEnumerable();
     }
 
-    public async Task<ComplexFormType> CreateComplexFormType(MiniLcm.Models.ComplexFormType complexFormType)
+    public async Task<ComplexFormType> CreateComplexFormType(ComplexFormType complexFormType)
     {
         if (complexFormType.Id == default) complexFormType.Id = Guid.NewGuid();
         await dataModel.AddChange(ClientId, new CreateComplexFormType(complexFormType.Id, complexFormType.Name));
diff --git a/backend/FwLite/LocalWebApp/LocalWebApp.csproj b/backend/FwLite/LocalWebApp/LocalWebApp.csproj
index eedd69c3e..51e42e2a9 100644
--- a/backend/FwLite/LocalWebApp/LocalWebApp.csproj
+++ b/backend/FwLite/LocalWebApp/LocalWebApp.csproj
@@ -19,7 +19,7 @@
 
     <ItemGroup>
         <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-        <PackageReference Include="icu.net" Version="2.10.1-beta.5" GeneratePathProperty="true" />
+        <PackageReference Include="icu.net" Version="3.0.0-beta.297" GeneratePathProperty="true" />
         <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.10" />
         <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.10" />
         <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.10" />
diff --git a/backend/FwLite/MiniLcm.Tests/ComplexFormComponentTestsBase.cs b/backend/FwLite/MiniLcm.Tests/ComplexFormComponentTestsBase.cs
index 80dac29d2..4f51ca275 100644
--- a/backend/FwLite/MiniLcm.Tests/ComplexFormComponentTestsBase.cs
+++ b/backend/FwLite/MiniLcm.Tests/ComplexFormComponentTestsBase.cs
@@ -74,4 +74,13 @@ public async Task CreateComplexFormComponent_CanCreateMultipleComponentSenses()
         component2.ComponentEntryId.Should().Be(_componentEntryId);
         component2.ComponentSenseId.Should().Be(_componentSenseId2);
     }
+
+    [Fact]
+    public async Task CreateComplexFormType_Works()
+    {
+        var complexFormType = new ComplexFormType() { Id = Guid.NewGuid(), Name = new() { { "en", "test" } } };
+        await Api.CreateComplexFormType(complexFormType);
+        var types = await Api.GetComplexFormTypes().ToArrayAsync();
+        types.Should().ContainSingle(t => t.Id == complexFormType.Id);
+    }
 }