Disambiguate complex-forms that reference same entry (#1564)

Author: myieye

backend/FwLite/MiniLcm.Tests/ComplexFormComponentTestsBase.cs

@@ -115,6 +115,12 @@ public async Task CreateComplexFormComponent_CanCreateMultipleComponentSenses()
         component2.ComplexFormEntryId.Should().Be(_complexFormEntryId);
         component2.ComponentEntryId.Should().Be(_componentEntryId);
         component2.ComponentSenseId.Should().Be(_componentSenseId2);
+
+        // ensure our sync code can handle them too
+        _complexFormEntry = (await Api.GetEntry(_complexFormEntryId))!;
+        await Api.UpdateEntry(_complexFormEntry, _complexFormEntry);
+        _componentEntry = (await Api.GetEntry(_componentEntryId))!;
+        await Api.UpdateEntry(_componentEntry, _componentEntry);
     }
 
     [Fact]
@@ -137,7 +143,8 @@ public async Task CreateComplexFormComponent_ThrowsWhenMakingA3LayerReferenceCyc
     {
         var entry3 = await Api.CreateEntry(new()
         {
-            Id = Guid.NewGuid(), LexemeForm = { { "en", "entry3" } }
+            Id = Guid.NewGuid(),
+            LexemeForm = { { "en", "entry3" } }
         });
         await Api.CreateComplexFormComponent(ComplexFormComponent.FromEntries(_complexFormEntry, entry3));
         await Api.CreateComplexFormComponent(ComplexFormComponent.FromEntries(entry3, _componentEntry));
@@ -150,7 +157,8 @@ public async Task CreateComplexFormComponent_WorksWhenAComponentWasDeletedWhichW
     {
         var entry3 = await Api.CreateEntry(new()
         {
-            Id = Guid.NewGuid(), LexemeForm = { { "en", "entry3" } }
+            Id = Guid.NewGuid(),
+            LexemeForm = { { "en", "entry3" } }
         });
         await Api.CreateComplexFormComponent(ComplexFormComponent.FromEntries(_complexFormEntry, entry3));
         var complexFormComponent = await Api.CreateComplexFormComponent(ComplexFormComponent.FromEntries(entry3, _componentEntry));

backend/FwLite/MiniLcm/SyncHelpers/EntrySync.cs

@@ -130,12 +130,12 @@ public override Task<int> Replace(ComplexFormType before, ComplexFormType after)
         }
     }
 
-    private class ComplexFormsDiffApi(IMiniLcmApi api) : CollectionDiffApi<ComplexFormComponent, Guid>
+    private class ComplexFormsDiffApi(IMiniLcmApi api) : CollectionDiffApi<ComplexFormComponent, (Guid, Guid, Guid?)>
     {
-        public override Guid GetId(ComplexFormComponent component)
+        public override (Guid, Guid, Guid?) GetId(ComplexFormComponent component)
         {
             //we can't use the ID as there's none defined by Fw so it won't work as a sync key
-            return component.ComplexFormEntryId;
+            return (component.ComplexFormEntryId, component.ComponentEntryId, component.ComponentSenseId);
         }
 
         public override async Task<int> Add(ComplexFormComponent after)