handle deleted semantic domains and part of speech in CreateSenseChange

backend/FwLite/LcmCrdt/Changes/CreateSenseChange.cs

@@ -1,4 +1,5 @@
 using System.Text.Json.Serialization;
+using LcmCrdt.Utils;
 using SIL.Harmony;
 using SIL.Harmony.Changes;
 using SIL.Harmony.Entities;
@@ -40,8 +41,8 @@ public override async ValueTask<Sense> NewEntity(Commit commit, ChangeContext co
             Order = Order,
             Definition = Definition ?? new MultiString(),
             Gloss = Gloss ?? new MultiString(),
-            PartOfSpeechId = PartOfSpeechId,
-            SemanticDomains = SemanticDomains ?? [],
+            PartOfSpeechId = await context.DeletedAsNull(PartOfSpeechId),
+            SemanticDomains = await context.FilterDeleted(SemanticDomains ?? []).ToArrayAsync(),
             DeletedAt = await context.IsObjectDeleted(EntryId) ? commit.DateTime : (DateTime?)null
         };
     }

backend/FwLite/LcmCrdt/Utils/ChangeContextHelpers.cs

@@ -0,0 +1,27 @@
+using SIL.Harmony.Changes;
+
+namespace LcmCrdt.Utils;
+
+public static class ChangeContextHelpers
+{
+    public static async ValueTask<bool> IsObjectDeleted(this ChangeContext context, Guid? entityId)
+    {
+        return entityId is null || await context.IsObjectDeleted(entityId.Value);
+    }
+
+    public static async ValueTask<Guid?> DeletedAsNull(this ChangeContext context, Guid? entityId)
+    {
+        if (entityId is null) return null;
+        return await context.IsObjectDeleted(entityId.Value) ? null : entityId;
+    }
+
+    public static async IAsyncEnumerable<T> FilterDeleted<T>(this ChangeContext context, IEnumerable<T> entities)
+        where T : IObjectWithId
+    {
+        foreach (var objectWithId in entities)
+        {
+            if (await context.IsObjectDeleted(objectWithId.Id)) continue;
+            yield return objectWithId;
+        }
+    }
+}