Validate MiniLcm types

backend/FwLite/FwDataMiniLcmBridge/Api/FwDataMiniLcmApi.cs

@@ -162,6 +162,7 @@
 
     public Task<WritingSystem> CreateWritingSystem(WritingSystemType type, WritingSystem writingSystem)
     {
+        validators.ValidateAndThrow(writingSystem);
         var exitingWs = type == WritingSystemType.Analysis ? Cache.ServiceLocator.WritingSystems.AnalysisWritingSystems : Cache.ServiceLocator.WritingSystems.VernacularWritingSystems;
         if (exitingWs.Any(ws => ws.Id == writingSystem.WsId))
         {
@@ -205,7 +206,7 @@
         }
         await Cache.DoUsingNewOrCurrentUOW("Update WritingSystem",
             "Revert WritingSystem",
             async () =>
             {
                 var updateProxy = new UpdateWritingSystemProxy(lcmWritingSystem, this)
                 {
@@ -220,6 +221,7 @@
 
     public async Task<WritingSystem> UpdateWritingSystem(WritingSystem before, WritingSystem after)
     {
+        await validators.ValidateAndThrowAsync(after);
         await Cache.DoUsingNewOrCurrentUOW("Update WritingSystem",
             "Revert WritingSystem",
             async () =>
@@ -248,6 +250,7 @@
 
     public Task<PartOfSpeech> CreatePartOfSpeech(PartOfSpeech partOfSpeech)
     {
+        validators.ValidateAndThrow(partOfSpeech);
         IPartOfSpeech? lcmPartOfSpeech = null;
         if (partOfSpeech.Id == default) partOfSpeech.Id = Guid.NewGuid();
         UndoableUnitOfWorkHelper.DoUsingNewOrCurrentUOW("Create Part of Speech",
@@ -278,6 +281,7 @@
 
     public async Task<PartOfSpeech> UpdatePartOfSpeech(PartOfSpeech before, PartOfSpeech after)
     {
+        await validators.ValidateAndThrowAsync(after);
         await PartOfSpeechSync.Sync(before, after, this);
         return await GetPartOfSpeech(after.Id) ?? throw new NullReferenceException($"unable to find part of speech with id {after.Id}");
     }
@@ -301,7 +305,7 @@
             Id = semanticDomain.Guid,
             Name = FromLcmMultiString(semanticDomain.Name),
             Code = semanticDomain.Abbreviation.UiString ?? "",
-            Predefined = true, // TODO: Look up in a GUID list of predefined data
+            Predefined = CanonicalGuidsSemanticDomain.CanonicalSemDomGuids.Contains(semanticDomain.Guid),
         };
     }
 
@@ -323,6 +327,7 @@
 
     public async Task<SemanticDomain> CreateSemanticDomain(SemanticDomain semanticDomain)
     {
+        await validators.ValidateAndThrowAsync(semanticDomain);
         if (semanticDomain.Id == Guid.Empty) semanticDomain.Id = Guid.NewGuid();
         UndoableUnitOfWorkHelper.DoUsingNewOrCurrentUOW("Create Semantic Domain",
             "Remove semantic domain",
@@ -355,6 +360,7 @@
 
     public async Task<SemanticDomain> UpdateSemanticDomain(SemanticDomain before, SemanticDomain after)
     {
+        await validators.ValidateAndThrowAsync(after);
         await SemanticDomainSync.Sync(before, after, this);
         return await GetSemanticDomain(after.Id) ?? throw new NullReferenceException($"unable to find semantic domain with id {after.Id}");
     }
@@ -396,7 +402,7 @@
 
     public async Task<ComplexFormType> CreateComplexFormType(ComplexFormType complexFormType)
     {
-        await validators.ValidateAndThrow(complexFormType);
+        await validators.ValidateAndThrowAsync(complexFormType);
         if (complexFormType.Id == default) complexFormType.Id = Guid.NewGuid();
         UndoableUnitOfWorkHelper.DoUsingNewOrCurrentUOW("Create complex form type",
             "Remove complex form type",
@@ -429,6 +435,7 @@
 
     public async Task<ComplexFormType> UpdateComplexFormType(ComplexFormType before, ComplexFormType after)
     {
+        await validators.ValidateAndThrowAsync(after);
         await ComplexFormTypeSync.Sync(before, after, this);
         return ToComplexFormType(ComplexFormTypesFlattened.Single(c => c.Guid == after.Id));
     }
@@ -660,6 +667,7 @@
     public async Task<Entry> CreateEntry(Entry entry)
     {
         entry.Id = entry.Id == default ? Guid.NewGuid() : entry.Id;
+        await validators.ValidateAndThrowAsync(entry);
         try
         {
             UndoableUnitOfWorkHelper.DoUsingNewOrCurrentUOW("Create Entry",
@@ -852,6 +860,7 @@
 
     public async Task<Entry> UpdateEntry(Entry before, Entry after)
     {
+        await validators.ValidateAndThrowAsync(after);
         await Cache.DoUsingNewOrCurrentUOW("Update Entry",
             "Revert entry",
             async () =>
@@ -962,6 +971,7 @@
         if (sense.Id == default) sense.Id = Guid.NewGuid();
         if (!EntriesRepository.TryGetObject(entryId, out var lexEntry))
             throw new InvalidOperationException("Entry not found");
+        validators.ValidateAndThrow(sense);
         UndoableUnitOfWorkHelper.DoUsingNewOrCurrentUOW("Create Sense",
             "Remove sense",
             Cache.ServiceLocator.ActionHandler,
@@ -986,6 +996,7 @@
 
     public async Task<Sense> UpdateSense(Guid entryId, Sense before, Sense after)
     {
+        await validators.ValidateAndThrowAsync(after);
         await Cache.DoUsingNewOrCurrentUOW("Update Sense",
             "Revert Sense",
             async () =>
@@ -1072,6 +1083,7 @@
         if (exampleSentence.Id == default) exampleSentence.Id = Guid.NewGuid();
         if (!SenseRepository.TryGetObject(senseId, out var lexSense))
             throw new InvalidOperationException("Sense not found");
+        validators.ValidateAndThrow(exampleSentence);
         UndoableUnitOfWorkHelper.DoUsingNewOrCurrentUOW("Create Example Sentence",
             "Remove example sentence",
             Cache.ServiceLocator.ActionHandler,
@@ -1102,6 +1114,7 @@
         ExampleSentence before,
         ExampleSentence after)
     {
+        await validators.ValidateAndThrowAsync(after);
         await Cache.DoUsingNewOrCurrentUOW("Update Example Sentence",
             "Revert Example Sentence",
             async () =>

backend/FwLite/FwLiteProjectSync.Tests/Sena3SyncTests.cs

@@ -75,6 +75,7 @@ private async Task WorkaroundMissingWritingSystems()
     }
 
     [Fact]
+    [Trait("Category", "Integration")]
     public async Task DryRunImport_MakesNoChanges()
     {
         await WorkaroundMissingWritingSystems();
@@ -85,6 +86,7 @@ public async Task DryRunImport_MakesNoChanges()
     }
 
     [Fact]
+    [Trait("Category", "Integration")]
     public async Task DryRunImport_MakesTheSameChangesAsImport()
     {
         var dryRunSyncResult = await _syncService.SyncDryRun(_crdtApi, _fwDataApi);
@@ -93,6 +95,7 @@ public async Task DryRunImport_MakesTheSameChangesAsImport()
     }
 
     [Fact]
+    [Trait("Category", "Integration")]
     public async Task DryRunSync_MakesNoChanges()
     {
         await BypassImport();
@@ -105,6 +108,7 @@ public async Task DryRunSync_MakesNoChanges()
 
     [Fact]
     [Trait("Category", "Slow")]
+    [Trait("Category", "Integration")]
     public async Task DryRunSync_MakesTheSameChangesAsSync()
     {
         //syncing requires querying entries, which fails if there are no writing systems, so we import those first
@@ -119,6 +123,7 @@ public async Task DryRunSync_MakesTheSameChangesAsSync()
     }
 
     [Fact]
+    [Trait("Category", "Integration")]
     public async Task FirstSena3SyncJustDoesAnSync()
     {
         _fwDataApi.EntryCount.Should().BeGreaterThan(1000,
@@ -136,6 +141,7 @@ public async Task FirstSena3SyncJustDoesAnSync()
 
     [Fact]
     [Trait("Category", "Slow")]
+    [Trait("Category", "Integration")]
     public async Task SyncWithoutImport_CrdtShouldMatchFwdata()
     {
         await BypassImport();
@@ -151,6 +157,7 @@ public async Task SyncWithoutImport_CrdtShouldMatchFwdata()
     }
 
     [Fact]
+    [Trait("Category", "Integration")]
     public async Task SecondSena3SyncDoesNothing()
     {
         await _syncService.Sync(_crdtApi, _fwDataApi);

backend/FwLite/FwLiteProjectSync.Tests/SyncTests.cs

@@ -74,6 +74,7 @@ public SyncTests(SyncFixture fixture)
     }
 
     [Fact]
+    [Trait("Category", "Integration")]
     public async Task FirstSyncJustDoesAnImport()
     {
         var crdtApi = _fixture.CrdtApi;
@@ -90,6 +91,7 @@ public async Task FirstSyncJustDoesAnImport()
     }
 
     [Fact]
+    [Trait("Category", "Integration")]
     public async Task SecondSyncDoesNothing()
     {
         var crdtApi = _fixture.CrdtApi;
@@ -101,6 +103,7 @@ public async Task SecondSyncDoesNothing()
     }
 
     [Fact]
+    [Trait("Category", "Integration")]
     public static async Task SyncFailsWithMismatchedProjectIds()
     {
         var fixture = SyncFixture.Create();
@@ -120,6 +123,7 @@ await fixture.Services.GetRequiredService<LcmCrdtDbContext>().ProjectData.
     }
 
     [Fact]
+    [Trait("Category", "Integration")]
     public async Task CreatingAnEntryInEachProjectSyncsAcrossBoth()
     {
         var crdtApi = _fixture.CrdtApi;
@@ -154,6 +158,7 @@ await crdtApi.CreateEntry(new Entry()
     }
 
     [Fact]
+    [Trait("Category", "Integration")]
     public async Task SyncDryRun_NoChangesAreSynced()
     {
         var crdtApi = _fixture.CrdtApi;
@@ -189,6 +194,7 @@ await crdtApi.CreateEntry(new Entry()
     }
 
     [Fact]
+    [Trait("Category", "Integration")]
     public async Task CreatingAComplexEntryInFwDataSyncsWithoutIssue()
     {
         var crdtApi = _fixture.CrdtApi;
@@ -240,6 +246,7 @@ public async Task CreatingAComplexEntryInFwDataSyncsWithoutIssue()
 
 
     [Fact]
+    [Trait("Category", "Integration")]
     public async Task PartsOfSpeechSyncBothWays()
     {
         var crdtApi = _fixture.CrdtApi;
@@ -275,6 +282,7 @@ public async Task PartsOfSpeechSyncBothWays()
     }
 
     [Fact]
+    [Trait("Category", "Integration")]
     public async Task PartsOfSpeechSyncInEntries()
     {
         var crdtApi = _fixture.CrdtApi;
@@ -318,6 +326,7 @@ await crdtApi.CreateEntry(new Entry()
     }
 
     [Fact]
+    [Trait("Category", "Integration")]
     public async Task SemanticDomainsSyncBothWays()
     {
         var crdtApi = _fixture.CrdtApi;
@@ -355,6 +364,7 @@ public async Task SemanticDomainsSyncBothWays()
     }
 
     [Fact]
+    [Trait("Category", "Integration")]
     public async Task SemanticDomainsSyncInEntries()
     {
         var crdtApi = _fixture.CrdtApi;
@@ -399,6 +409,7 @@ await crdtApi.CreateEntry(new Entry()
     }
 
     [Fact]
+    [Trait("Category", "Integration")]
     public async Task UpdatingAnEntryInEachProjectSyncsAcrossBoth()
     {
         var crdtApi = _fixture.CrdtApi;
@@ -427,6 +438,7 @@ public async Task UpdatingAnEntryInEachProjectSyncsAcrossBoth()
     }
 
     [Fact]
+    [Trait("Category", "Integration")]
     public async Task CanSyncAnyEntryWithDeletedComplexForm()
     {
         var crdtApi = _fixture.CrdtApi;
@@ -464,6 +476,7 @@ await fwdataApi.CreateEntry(new Entry()
     }
 
     [Fact]
+    [Trait("Category", "Integration")]
     public async Task AddingASenseToAnEntryInEachProjectSyncsAcrossBoth()
     {
         var crdtApi = _fixture.CrdtApi;
@@ -493,6 +506,7 @@ public async Task AddingASenseToAnEntryInEachProjectSyncsAcrossBoth()
     }
 
     [Fact]
+    [Trait("Category", "Integration")]
     public async Task CanCreateAComplexFormAndItsComponentInOneSync()
     {
         //ensure they are synced so a real sync will happen when we want it to
@@ -513,6 +527,7 @@ public async Task CanCreateAComplexFormAndItsComponentInOneSync()
     }
 
     [Fact]
+    [Trait("Category", "Integration")]
     public async Task CanCreateAComplexFormTypeAndSyncsIt()
     {
         //ensure they are synced so a real sync will happen when we want it to