From 4c12f3dd6218db4e8ee377703a6157d1e8cd4739 Mon Sep 17 00:00:00 2001
From: Tim Haasdyk <tim_haasdyk@sil.org>
Date: Mon, 24 Mar 2025 16:05:13 +0100
Subject: [PATCH] Fix IsNew logic

---
 ...hangesAtOnceWithMergedHistory.verified.txt | 39 +++++++++++++------
 src/SIL.Harmony/SnapshotWorker.cs             |  8 ++--
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/SIL.Harmony.Tests/DataModelSimpleChanges.Writing2ChangesAtOnceWithMergedHistory.verified.txt b/src/SIL.Harmony.Tests/DataModelSimpleChanges.Writing2ChangesAtOnceWithMergedHistory.verified.txt
index 56c2ada..acd4e0b 100644
--- a/src/SIL.Harmony.Tests/DataModelSimpleChanges.Writing2ChangesAtOnceWithMergedHistory.verified.txt
+++ b/src/SIL.Harmony.Tests/DataModelSimpleChanges.Writing2ChangesAtOnceWithMergedHistory.verified.txt
@@ -50,12 +50,29 @@
   },
   {
     $type: Commit,
+    Snapshots: [
+      {
+        $type: ObjectSnapshot,
+        Id: Guid_5,
+        TypeName: Word,
+        Entity: {
+          $type: Word,
+          Text: first,
+          Note: a word note,
+          Id: Guid_2
+        },
+        EntityId: Guid_2,
+        EntityIsDeleted: false,
+        CommitId: Guid_6,
+        IsRoot: false
+      }
+    ],
     Hash: Hash_2,
     ParentHash: Hash_1,
     ChangeEntities: [
       {
         $type: ChangeEntity<IChange>,
-        CommitId: Guid_5,
+        CommitId: Guid_6,
         EntityId: Guid_2,
         Change: {
           $type: SetWordNoteChange,
@@ -68,9 +85,9 @@
     CompareKey: {
       $type: ValueTuple<DateTimeOffset, long,
       Item1: DateTimeOffset_2,
-      Item3: Guid_5
+      Item3: Guid_6
     },
-    Id: Guid_5,
+    Id: Guid_6,
     HybridDateTime: {
       $type: HybridDateTime,
       DateTime: DateTimeOffset_2
@@ -88,7 +105,7 @@
     ChangeEntities: [
       {
         $type: ChangeEntity<IChange>,
-        CommitId: Guid_6,
+        CommitId: Guid_7,
         EntityId: Guid_2,
         Change: {
           $type: SetWordTextChange,
@@ -101,9 +118,9 @@
     CompareKey: {
       $type: ValueTuple<DateTimeOffset, long,
       Item1: DateTimeOffset_3,
-      Item3: Guid_6
+      Item3: Guid_7
     },
-    Id: Guid_6,
+    Id: Guid_7,
     HybridDateTime: {
       $type: HybridDateTime,
       DateTime: DateTimeOffset_3
@@ -119,7 +136,7 @@
     Snapshots: [
       {
         $type: ObjectSnapshot,
-        Id: Guid_7,
+        Id: Guid_8,
         TypeName: Word,
         Entity: {
           $type: Word,
@@ -129,7 +146,7 @@
         },
         EntityId: Guid_2,
         EntityIsDeleted: false,
-        CommitId: Guid_8,
+        CommitId: Guid_9,
         IsRoot: false
       }
     ],
@@ -138,7 +155,7 @@
     ChangeEntities: [
       {
         $type: ChangeEntity<IChange>,
-        CommitId: Guid_8,
+        CommitId: Guid_9,
         EntityId: Guid_2,
         Change: {
           $type: SetWordTextChange,
@@ -151,9 +168,9 @@
     CompareKey: {
       $type: ValueTuple<DateTimeOffset, long,
       Item1: DateTimeOffset_4,
-      Item3: Guid_8
+      Item3: Guid_9
     },
-    Id: Guid_8,
+    Id: Guid_9,
     HybridDateTime: {
       $type: HybridDateTime,
       DateTime: DateTimeOffset_4
diff --git a/src/SIL.Harmony/SnapshotWorker.cs b/src/SIL.Harmony/SnapshotWorker.cs
index acc6248..674dd63 100644
--- a/src/SIL.Harmony/SnapshotWorker.cs
+++ b/src/SIL.Harmony/SnapshotWorker.cs
@@ -242,13 +242,13 @@ private void AddSnapshot(ObjectSnapshot snapshot)
     private bool IsNew(ObjectSnapshot snapshot)
     {
         var entityId = snapshot.EntityId;
-        if (_rootSnapshots.TryGetValue(entityId, out var rootSnapshot))
+        if (_pendingSnapshots.TryGetValue(entityId, out var pendingSnapshot))
         {
-            return rootSnapshot.Id != snapshot.Id;
+            return pendingSnapshot.Id == snapshot.Id;
         }
-        if (_pendingSnapshots.TryGetValue(entityId, out var pendingSnapshot))
+        if (_rootSnapshots.TryGetValue(entityId, out var rootSnapshot))
         {
-            return pendingSnapshot.Id != snapshot.Id;
+            return rootSnapshot.Id == snapshot.Id;
         }
         return false;
     }