Remove CreateMorphType and DeleteMorphType from MiniLcm API (#2221)

myieye · rmunn · commit b66e33bd905c · 2026-05-08T15:36:47.000+07:00
diff --git a/backend/FwLite/FwDataMiniLcmBridge/Api/FwDataMiniLcmApi.cs b/backend/FwLite/FwDataMiniLcmBridge/Api/FwDataMiniLcmApi.cs
@@ -581,12 +581,6 @@ internal MorphType FromLcmMorphType(IMoMorphType morphType)
         };
     }
 
-    public Task<MorphType> CreateMorphType(MorphType morphType)
-    {
-        // Creating new morph types not allowed in FwData projects, so silently ignore operation
-        return Task.FromResult(morphType);
-    }
-
     public Task<MorphType> UpdateMorphType(Guid id, UpdateObjectInput<MorphType> update)
     {
         var lcmMorphType = MorphTypeRepository.GetObject(id);
@@ -608,12 +602,6 @@ public async Task<MorphType> UpdateMorphType(MorphType before, MorphType after,
         return await GetMorphType(after.Id) ?? throw new NullReferenceException("unable to find morph type with id " + after.Id);
     }
 
-    public Task DeleteMorphType(Guid id)
-    {
-        // Deleting morph types not allowed in FwData projects, so silently ignore operation
-        return Task.CompletedTask;
-    }
-
     public IAsyncEnumerable<VariantType> GetVariantTypes()
     {
         return VariantTypes.PossibilitiesOS
diff --git a/backend/FwLite/FwLiteProjectSync.Tests/Import/ResumableTests.cs b/backend/FwLite/FwLiteProjectSync.Tests/Import/ResumableTests.cs
@@ -189,11 +189,6 @@ Task<ComplexFormType> IMiniLcmWriteApi.CreateComplexFormType(ComplexFormType com
         ResumableTests.MaybeThrowRandom(random, 0.2);
         return _api.CreateComplexFormType(complexFormType);
     }
-    Task<MorphType> IMiniLcmWriteApi.CreateMorphType(MorphType morphType)
-    {
-        ResumableTests.MaybeThrowRandom(random, 0.02);
-        return _api.CreateMorphType(morphType);
-    }
     Task<SemanticDomain> IMiniLcmWriteApi.CreateSemanticDomain(SemanticDomain semanticDomain)
     {
         ResumableTests.MaybeThrowRandom(random, 0.2);
diff --git a/backend/FwLite/FwLiteProjectSync.Tests/SyncTestHelpers.cs b/backend/FwLite/FwLiteProjectSync.Tests/SyncTestHelpers.cs
@@ -1,29 +1,9 @@
-using FwDataMiniLcmBridge.Api;
 using MiniLcm.Models;
 
 namespace FwLiteProjectSync.Tests;
 
 public static class SyncTestHelpers
 {
-    public static MorphType CreateMorphType(MorphTypeKind kind, string? prefix = null, string? postfix = null, int secondaryOrder = 0)
-    {
-        var guid = LcmHelpers.ToLcmMorphTypeId(kind) ?? Guid.NewGuid();
-        var name = $"Test {kind}";
-        var abbr = $"Tst {kind}";
-        var desc = $"Test morph type {kind}";
-        return new MorphType
-        {
-            Id = guid,
-            Kind = kind,
-            Name = new MultiString() { { "en", name } },
-            Abbreviation = new MultiString() { { "en", abbr } },
-            Description = new RichMultiString() { { "en", new RichString(desc) } },
-            Prefix = prefix,
-            Postfix = postfix,
-            SecondaryOrder = secondaryOrder,
-        };
-    }
-
     public static MorphType UpdateMorphType(MorphType orig, string? newName = null, string? newAbbreviation = null)
     {
         var newby = orig.Copy();
diff --git a/backend/FwLite/FwLiteProjectSync.Tests/SyncTests.cs b/backend/FwLite/FwLiteProjectSync.Tests/SyncTests.cs
@@ -505,51 +505,6 @@ public async Task MorphTypeUpdatesSyncBothWays()
         fwdataStemAfterSync.Abbreviation["en"].Should().Be(newAbbr);
     }
 
-    [Fact]
-    [Trait("Category", "Integration")]
-    public async Task MorphTypeCreationDoesNotSyncCrdtToFw()
-    {
-        // FwDataMiniLcmApi.CreateMorphType is a no-op because FLEx forbids morph type creation or deletion
-        var crdtApi = _fixture.CrdtApi;
-        var fwdataApi = _fixture.FwDataApi;
-        await _syncService.Import(crdtApi, fwdataApi);
-        var projectSnapshot = await _fixture.RegenerateAndGetSnapshot();
-
-        var newMorphType = SyncTestHelpers.CreateMorphType(MorphTypeKind.Unknown, prefix: "!", postfix: "!");
-        await crdtApi.CreateMorphType(newMorphType);
-        var syncResult = await _syncService.Sync(crdtApi, fwdataApi, projectSnapshot);
-
-        var fwdataMorphTypes = await fwdataApi.GetMorphTypes().ToArrayAsync();
-        var crdtMorphTypes = await crdtApi.GetMorphTypes().ToArrayAsync();
-        crdtMorphTypes.Should().ContainEquivalentOf(newMorphType);
-        fwdataMorphTypes.Should().NotContainEquivalentOf(newMorphType);
-        crdtMorphTypes.Length.Should().Be(fwdataMorphTypes.Length + 1);
-        crdtMorphTypes.Where(m => m.Kind != MorphTypeKind.Unknown).Should().BeEquivalentTo(fwdataMorphTypes);
-    }
-
-    [Fact]
-    [Trait("Category", "Integration")]
-    public async Task MorphTypeDeletionDoesNotSyncCrdtToFw()
-    {
-        // FwDataMiniLcmApi.DeleteMorphType is a no-op because FLEx forbids morph type creation or deletion
-        var crdtApi = _fixture.CrdtApi;
-        var fwdataApi = _fixture.FwDataApi;
-        await _syncService.Import(crdtApi, fwdataApi);
-        var projectSnapshot = await _fixture.RegenerateAndGetSnapshot();
-
-        var prefixingInterfix = await crdtApi.GetMorphType(MorphTypeKind.PrefixingInterfix);
-        prefixingInterfix.Should().NotBeNull();
-        await crdtApi.DeleteMorphType(prefixingInterfix.Id);
-        var syncResult = await _syncService.Sync(crdtApi, fwdataApi, projectSnapshot);
-
-        var fwdataMorphTypes = await fwdataApi.GetMorphTypes().ToArrayAsync();
-        var crdtMorphTypes = await crdtApi.GetMorphTypes().ToArrayAsync();
-        fwdataMorphTypes.Should().ContainEquivalentOf(prefixingInterfix);
-        crdtMorphTypes.Should().NotContainEquivalentOf(prefixingInterfix);
-        crdtMorphTypes.Length.Should().Be(fwdataMorphTypes.Length - 1);
-        crdtMorphTypes.Should().BeEquivalentTo(fwdataMorphTypes.Where(m => m.Kind != MorphTypeKind.PrefixingInterfix));
-    }
-
     [Fact]
     [Trait("Category", "Integration")]
     public async Task UpdatingAnEntryInEachProjectSyncsAcrossBoth()
diff --git a/backend/FwLite/FwLiteProjectSync/DryRunMiniLcmApi.cs b/backend/FwLite/FwLiteProjectSync/DryRunMiniLcmApi.cs
@@ -126,13 +126,6 @@ public Task DeleteComplexFormType(Guid id)
         return Task.CompletedTask;
     }
 
-    public Task<MorphType> CreateMorphType(MorphType morphType)
-    {
-        DryRunRecords.Add(new DryRunRecord(nameof(CreateMorphType),
-            $"Create morph type {morphType.Name}"));
-        return Task.FromResult(morphType);
-    }
-
     public async Task<MorphType> UpdateMorphType(Guid id, UpdateObjectInput<MorphType> update)
     {
         DryRunRecords.Add(new DryRunRecord(nameof(UpdateMorphType), $"Update morph type {id}"));
@@ -145,12 +138,6 @@ public Task<MorphType> UpdateMorphType(MorphType before, MorphType after, IMiniL
         return Task.FromResult(after);
     }
 
-    public Task DeleteMorphType(Guid id)
-    {
-        DryRunRecords.Add(new DryRunRecord(nameof(DeleteMorphType), $"Delete morph type {id}"));
-        return Task.CompletedTask;
-    }
-
     public Task<Entry> CreateEntry(Entry entry, CreateEntryOptions? options)
     {
         options ??= new CreateEntryOptions();
diff --git a/backend/FwLite/FwLiteProjectSync/Import/ResumableImportApi.cs b/backend/FwLite/FwLiteProjectSync/Import/ResumableImportApi.cs
@@ -58,10 +58,6 @@ async Task<ComplexFormType> IMiniLcmWriteApi.CreateComplexFormType(ComplexFormTy
     {
         return await HasCreated(complexFormType, _api.GetComplexFormTypes(), () => _api.CreateComplexFormType(complexFormType));
     }
-    async Task<MorphType> IMiniLcmWriteApi.CreateMorphType(MorphType morphType)
-    {
-        return await HasCreated(morphType, _api.GetMorphTypes(), () => _api.CreateMorphType(morphType), m => m.Kind.ToString());
-    }
     async Task<SemanticDomain> IMiniLcmWriteApi.CreateSemanticDomain(SemanticDomain semanticDomain)
     {
         return await HasCreated(semanticDomain, _api.GetSemanticDomains(), () => _api.CreateSemanticDomain(semanticDomain));
diff --git a/backend/FwLite/FwLiteWeb/Hubs/CrdtMiniLcmApiHub.cs b/backend/FwLite/FwLiteWeb/Hubs/CrdtMiniLcmApiHub.cs
@@ -99,13 +99,6 @@ public override IAsyncEnumerable<Entry> SearchEntries(string query, QueryOptions
         return base.SearchEntries(query, options);
     }
 
-    public override async Task<MorphType> CreateMorphType(MorphType morphType)
-    {
-        var newMorphType = await base.CreateMorphType(morphType);
-        TriggerSync();
-        return newMorphType;
-    }
-
     public override async Task<MorphType> UpdateMorphType(Guid id, JsonPatchDocument<MorphType> update)
     {
         var updatedMorphType = await base.UpdateMorphType(id, update);
diff --git a/backend/FwLite/FwLiteWeb/Hubs/MiniLcmApiHubBase.cs b/backend/FwLite/FwLiteWeb/Hubs/MiniLcmApiHubBase.cs
@@ -47,12 +47,6 @@ public IAsyncEnumerable<ComplexFormType> GetComplexFormTypes()
         return _miniLcmApi.GetComplexFormTypes();
     }
 
-    public virtual async Task<MorphType> CreateMorphType(MorphType morphType)
-    {
-        var newMorphType = await _miniLcmApi.CreateMorphType(morphType);
-        return newMorphType;
-    }
-
     public virtual async Task<MorphType> UpdateMorphType(Guid id, JsonPatchDocument<MorphType> update)
     {
         var updatedMorphType = await _miniLcmApi.UpdateMorphType(id, new UpdateObjectInput<MorphType>(update));
diff --git a/backend/FwLite/LcmCrdt/CrdtMiniLcmApi.cs b/backend/FwLite/LcmCrdt/CrdtMiniLcmApi.cs
@@ -370,23 +370,6 @@ public async IAsyncEnumerable<MorphType> GetMorphTypes()
         return await repo.MorphTypes.SingleOrDefaultAsync(m => m.Kind == kind);
     }
 
-    public async Task<MorphType> CreateMorphType(MorphType morphType)
-    {
-        await using var repo = await repoFactory.CreateRepoAsync();
-
-        // Duplicate MorphTypes (by kind) are not allowed
-        // Note: can't put this in validation wrapper since we need a repo
-        var exists = await repo.MorphTypes.AnyAsync(m => m.Kind == morphType.Kind);
-        if (exists) throw new DuplicateObjectException($"Morph type {morphType.Kind} already exists");
-
-        await AddChange(new CreateMorphTypeChange(morphType));
-        // MorphTypeKind value must be unique in DB, so return by MorphType rather than Id in case a race condition
-        // ended up causing two CreateMorphType calls to happen at the same time. It's possible that the other
-        // call went through, creating a MorphType entry with a different GUID but the same Kind (which would
-        // violate the constraint). So we fetch by Kind rather than by Id here to mitigate that rare case.
-        return await repo.MorphTypes.SingleAsync(c => c.Kind == morphType.Kind);
-    }
-
     public async Task<MorphType> UpdateMorphType(Guid id, UpdateObjectInput<MorphType> update)
     {
         await AddChange(new JsonPatchChange<MorphType>(id, update.Patch));
@@ -399,11 +382,6 @@ public async Task<MorphType> UpdateMorphType(MorphType before, MorphType after,
         return await GetMorphType(after.Id) ?? throw NotFoundException.ForType<MorphType>(after.Id);
     }
 
-    public async Task DeleteMorphType(Guid id)
-    {
-        await AddChange(new DeleteChange<MorphType>(id));
-    }
-
     public async Task<int> CountEntries(string? query = null, FilterQueryOptions? options = null)
     {
         await using var repo = await repoFactory.CreateRepoAsync();
diff --git a/backend/FwLite/MiniLcm.Tests/MorphTypeSyncTests.cs b/backend/FwLite/MiniLcm.Tests/MorphTypeSyncTests.cs
@@ -0,0 +1,36 @@
+using MiniLcm.SyncHelpers;
+
+namespace MiniLcm.Tests;
+
+public class MorphTypeSyncTests
+{
+    [Fact]
+    public async Task Sync_ThrowsOnAdd_WhenAfterContainsExtraMorphType()
+    {
+        var before = CanonicalMorphTypes.All.Values.ToArray();
+        var extraMorphType = new MorphType
+        {
+            Id = Guid.NewGuid(),
+            Kind = MorphTypeKind.Unknown,
+            Name = new MultiString { { "en", "bogus" } },
+        };
+        var after = before.Append(extraMorphType).ToArray();
+
+        var act = () => MorphTypeSync.Sync(before, after, null!);
+
+        await act.Should().ThrowAsync<InvalidOperationException>()
+            .WithMessage("*cannot be created*");
+    }
+
+    [Fact]
+    public async Task Sync_ThrowsOnRemove_WhenAfterIsMissingMorphType()
+    {
+        var before = CanonicalMorphTypes.All.Values.ToArray();
+        var after = before.Skip(1).ToArray(); // drop one
+
+        var act = () => MorphTypeSync.Sync(before, after, null!);
+
+        await act.Should().ThrowAsync<InvalidOperationException>()
+            .WithMessage("*cannot be deleted*");
+    }
+}
diff --git a/backend/FwLite/MiniLcm/IMiniLcmWriteApi.cs b/backend/FwLite/MiniLcm/IMiniLcmWriteApi.cs
@@ -45,10 +45,8 @@ Task<WritingSystem> UpdateWritingSystem(WritingSystemId id,
     #endregion
 
     #region MorphType
-    Task<MorphType> CreateMorphType(MorphType morphType);
     Task<MorphType> UpdateMorphType(Guid id, UpdateObjectInput<MorphType> update);
     Task<MorphType> UpdateMorphType(MorphType before, MorphType after, IMiniLcmApi? api = null);
-    Task DeleteMorphType(Guid id);
     #endregion
 
     #region Entry
diff --git a/backend/FwLite/MiniLcm/SyncHelpers/MorphTypeSync.cs b/backend/FwLite/MiniLcm/SyncHelpers/MorphTypeSync.cs
@@ -55,16 +55,16 @@ public static async Task<int> Sync(MorphType before,
 
     private class MorphTypeDiffApi(IMiniLcmApi api) : ObjectWithIdCollectionDiffApi<MorphType>
     {
-        public override async Task<int> Add(MorphType currentMorphType)
+        public override Task<int> Add(MorphType currentMorphType)
         {
-            await api.CreateMorphType(currentMorphType);
-            return 1;
+            throw new InvalidOperationException(
+                $"MorphTypes are predefined and cannot be created. Unexpected morph type: {currentMorphType.Kind} ({currentMorphType.Id}). This indicates a data inconsistency.");
         }
 
-        public override async Task<int> Remove(MorphType beforeMorphType)
+        public override Task<int> Remove(MorphType beforeMorphType)
         {
-            await api.DeleteMorphType(beforeMorphType.Id);
-            return 1;
+            throw new InvalidOperationException(
+                $"MorphTypes are predefined and cannot be deleted. Unexpected morph type removal: {beforeMorphType.Kind} ({beforeMorphType.Id}). This indicates a data inconsistency.");
         }
 
         public override Task<int> Replace(MorphType beforeMorphType, MorphType afterMorphType)

Original file line number	Diff line number	Diff line change
`@@ -581,12 +581,6 @@ internal MorphType FromLcmMorphType(IMoMorphType morphType)`
`581`	`581`	`};`
`582`	`582`	`}`
`583`	`583`
`584`		`- public Task<MorphType> CreateMorphType(MorphType morphType)`
`585`		`- {`
`586`		`- // Creating new morph types not allowed in FwData projects, so silently ignore operation`
`587`		`- return Task.FromResult(morphType);`
`588`		`- }`
`589`		`-`
`590`	`584`	`public Task<MorphType> UpdateMorphType(Guid id, UpdateObjectInput<MorphType> update)`
`591`	`585`	`{`
`592`	`586`	`var lcmMorphType = MorphTypeRepository.GetObject(id);`
`@@ -608,12 +602,6 @@ public async Task<MorphType> UpdateMorphType(MorphType before, MorphType after,`
`608`	`602`	`return await GetMorphType(after.Id) ?? throw new NullReferenceException("unable to find morph type with id " + after.Id);`
`609`	`603`	`}`
`610`	`604`
`611`		`- public Task DeleteMorphType(Guid id)`
`612`		`- {`
`613`		`- // Deleting morph types not allowed in FwData projects, so silently ignore operation`
`614`		`- return Task.CompletedTask;`
`615`		`- }`
`616`		`-`
`617`	`605`	`public IAsyncEnumerable<VariantType> GetVariantTypes()`
`618`	`606`	`{`
`619`	`607`	`return VariantTypes.PossibilitiesOS`
Original file line number	Diff line number	Diff line change
`@@ -189,11 +189,6 @@ Task<ComplexFormType> IMiniLcmWriteApi.CreateComplexFormType(ComplexFormType com`
`189`	`189`	`ResumableTests.MaybeThrowRandom(random, 0.2);`
`190`	`190`	`return _api.CreateComplexFormType(complexFormType);`
`191`	`191`	`}`
`192`		`- Task<MorphType> IMiniLcmWriteApi.CreateMorphType(MorphType morphType)`
`193`		`- {`
`194`		`- ResumableTests.MaybeThrowRandom(random, 0.02);`
`195`		`- return _api.CreateMorphType(morphType);`
`196`		`- }`
`197`	`192`	`Task<SemanticDomain> IMiniLcmWriteApi.CreateSemanticDomain(SemanticDomain semanticDomain)`
`198`	`193`	`{`
`199`	`194`	`ResumableTests.MaybeThrowRandom(random, 0.2);`
Original file line number	Diff line number	Diff line change
`@@ -126,13 +126,6 @@ public Task DeleteComplexFormType(Guid id)`
`126`	`126`	`return Task.CompletedTask;`
`127`	`127`	`}`
`128`	`128`
`129`		`- public Task<MorphType> CreateMorphType(MorphType morphType)`
`130`		`- {`
`131`		`- DryRunRecords.Add(new DryRunRecord(nameof(CreateMorphType),`
`132`		`- $"Create morph type {morphType.Name}"));`
`133`		`- return Task.FromResult(morphType);`
`134`		`- }`
`135`		`-`
`136`	`129`	`public async Task<MorphType> UpdateMorphType(Guid id, UpdateObjectInput<MorphType> update)`
`137`	`130`	`{`
`138`	`131`	`DryRunRecords.Add(new DryRunRecord(nameof(UpdateMorphType), $"Update morph type {id}"));`
`@@ -145,12 +138,6 @@ public Task<MorphType> UpdateMorphType(MorphType before, MorphType after, IMiniL`
`145`	`138`	`return Task.FromResult(after);`
`146`	`139`	`}`
`147`	`140`
`148`		`- public Task DeleteMorphType(Guid id)`
`149`		`- {`
`150`		`- DryRunRecords.Add(new DryRunRecord(nameof(DeleteMorphType), $"Delete morph type {id}"));`
`151`		`- return Task.CompletedTask;`
`152`		`- }`
`153`		`-`
`154`	`141`	`public Task<Entry> CreateEntry(Entry entry, CreateEntryOptions? options)`
`155`	`142`	`{`
`156`	`143`	`options ??= new CreateEntryOptions();`
Original file line number	Diff line number	Diff line change
`@@ -58,10 +58,6 @@ async Task<ComplexFormType> IMiniLcmWriteApi.CreateComplexFormType(ComplexFormTy`
`58`	`58`	`{`
`59`	`59`	`return await HasCreated(complexFormType, _api.GetComplexFormTypes(), () => _api.CreateComplexFormType(complexFormType));`
`60`	`60`	`}`
`61`		`- async Task<MorphType> IMiniLcmWriteApi.CreateMorphType(MorphType morphType)`
`62`		`- {`
`63`		`- return await HasCreated(morphType, _api.GetMorphTypes(), () => _api.CreateMorphType(morphType), m => m.Kind.ToString());`
`64`		`- }`
`65`	`61`	`async Task<SemanticDomain> IMiniLcmWriteApi.CreateSemanticDomain(SemanticDomain semanticDomain)`
`66`	`62`	`{`
`67`	`63`	`return await HasCreated(semanticDomain, _api.GetSemanticDomains(), () => _api.CreateSemanticDomain(semanticDomain));`
Original file line number	Diff line number	Diff line change
`@@ -99,13 +99,6 @@ public override IAsyncEnumerable<Entry> SearchEntries(string query, QueryOptions`
`99`	`99`	`return base.SearchEntries(query, options);`
`100`	`100`	`}`
`101`	`101`
`102`		`- public override async Task<MorphType> CreateMorphType(MorphType morphType)`
`103`		`- {`
`104`		`- var newMorphType = await base.CreateMorphType(morphType);`
`105`		`- TriggerSync();`
`106`		`- return newMorphType;`
`107`		`- }`
`108`		`-`
`109`	`102`	`public override async Task<MorphType> UpdateMorphType(Guid id, JsonPatchDocument<MorphType> update)`
`110`	`103`	`{`
`111`	`104`	`var updatedMorphType = await base.UpdateMorphType(id, update);`
Original file line number	Diff line number	Diff line change
`@@ -47,12 +47,6 @@ public IAsyncEnumerable<ComplexFormType> GetComplexFormTypes()`
`47`	`47`	`return _miniLcmApi.GetComplexFormTypes();`
`48`	`48`	`}`
`49`	`49`
`50`		`- public virtual async Task<MorphType> CreateMorphType(MorphType morphType)`
`51`		`- {`
`52`		`- var newMorphType = await _miniLcmApi.CreateMorphType(morphType);`
`53`		`- return newMorphType;`
`54`		`- }`
`55`		`-`
`56`	`50`	`public virtual async Task<MorphType> UpdateMorphType(Guid id, JsonPatchDocument<MorphType> update)`
`57`	`51`	`{`
`58`	`52`	`var updatedMorphType = await _miniLcmApi.UpdateMorphType(id, new UpdateObjectInput<MorphType>(update));`