Revert SyncDataBucket changes.

Author: Chriztiaan

PowerSync/PowerSync.Common/Client/Sync/Bucket/SyncDataBucket.cs

@@ -9,26 +9,31 @@ public class SyncDataBucketJSON
     [JsonProperty("bucket")]
     public string Bucket { get; set; } = null!;
 
-    // [JsonProperty("has_more")]
-    // public bool? HasMore { get; set; }
+    [JsonProperty("has_more")]
+    public bool? HasMore { get; set; }
 
-    // [JsonProperty("after")]
-    // public string? After { get; set; }
+    [JsonProperty("after")]
+    public string? After { get; set; }
 
-    // [JsonProperty("next_after")]
-    // public string? NextAfter { get; set; }
+    [JsonProperty("next_after")]
+    public string? NextAfter { get; set; }
 
     [JsonProperty("data")]
     public List<object> Data { get; set; } = [];
 }
 
 public class SyncDataBucket(
     string bucket,
-    OplogEntry[] data
-    )
+    OplogEntry[] data,
+    bool hasMore,
+    string? after = null,
+    string? nextAfter = null)
 {
     public string Bucket { get; private set; } = bucket;
     public OplogEntry[] Data { get; private set; } = data;
+    public bool HasMore { get; private set; } = hasMore;
+    public string? After { get; private set; } = after;
+    public string? NextAfter { get; private set; } = nextAfter;
 
     public static SyncDataBucket FromRow(SyncDataBucketJSON row)
     {
@@ -41,7 +46,10 @@ public static SyncDataBucket FromRow(SyncDataBucketJSON row)
 
         return new SyncDataBucket(
             row.Bucket,
-            dataEntries
+            dataEntries,
+            row.HasMore ?? false,
+            row.After,
+            row.NextAfter
         );
     }
 
@@ -55,6 +63,9 @@ public string ToJSON()
         var jsonObject = new SyncDataBucketJSON
         {
             Bucket = Bucket,
+            HasMore = HasMore,
+            After = After,
+            NextAfter = NextAfter,
             Data = dataObjects
         };
 

Tests/PowerSync/PowerSync.Common.Tests/Client/Sync/BucketStorageTests.cs

@@ -130,7 +130,7 @@ public async Task BasicSetup()
         var initialBucketStates = await bucketStorage.GetBucketStates();
         Assert.Empty(initialBucketStates);
 
-        await bucketStorage.SaveSyncData(new SyncDataBatch([new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.putAsset1_3])]));
+        await bucketStorage.SaveSyncData(new SyncDataBatch([new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.putAsset1_3], false)]));
 
         var bucketStates = await bucketStorage.GetBucketStates();
 
@@ -154,7 +154,7 @@ public async Task ShouldGetObjectFromMultipleBuckets()
     {
         await bucketStorage.SaveSyncData(
             new SyncDataBatch(
-            [new SyncDataBucket("bucket1", [TestData.putAsset1_3]), new SyncDataBucket("bucket2", [TestData.putAsset1_3])])
+            [new SyncDataBucket("bucket1", [TestData.putAsset1_3], false), new SyncDataBucket("bucket2", [TestData.putAsset1_3], false)])
         );
 
         await SyncLocalChecked(new Checkpoint
@@ -176,7 +176,7 @@ public async Task ShouldPrioritizeLaterUpdates()
 
         await bucketStorage.SaveSyncData(
             new SyncDataBatch(
-            [new SyncDataBucket("bucket1", [TestData.putAsset1_3]), new SyncDataBucket("bucket2", [TestData.putAsset1_1])])
+            [new SyncDataBucket("bucket1", [TestData.putAsset1_3], false), new SyncDataBucket("bucket2", [TestData.putAsset1_1], false)])
         );
 
         await SyncLocalChecked(new Checkpoint
@@ -193,7 +193,7 @@ public async Task ShouldIgnoreRemoveFromOneBucket()
     {
         // When we have 1 PUT and 1 REMOVE, the object must be kept.);   
         await bucketStorage.SaveSyncData(
-            new SyncDataBatch([new SyncDataBucket("bucket1", [TestData.putAsset1_3]), new SyncDataBucket("bucket2", [TestData.putAsset1_3, TestData.removeAsset1_4])])
+            new SyncDataBatch([new SyncDataBucket("bucket1", [TestData.putAsset1_3], false), new SyncDataBucket("bucket2", [TestData.putAsset1_3, TestData.removeAsset1_4], false)])
         );
 
         await SyncLocalChecked(new Checkpoint
@@ -210,7 +210,7 @@ public async Task ShouldRemoveWhenRemovedFromAllBuckets()
     {
         // When we only have REMOVE left for an object, it must be deleted.
         await bucketStorage.SaveSyncData(
-            new SyncDataBatch([new SyncDataBucket("bucket1", [TestData.putAsset1_3, TestData.removeAsset1_5]), new SyncDataBucket("bucket2", [TestData.putAsset1_3, TestData.removeAsset1_4])])
+            new SyncDataBatch([new SyncDataBucket("bucket1", [TestData.putAsset1_3, TestData.removeAsset1_5], false), new SyncDataBucket("bucket2", [TestData.putAsset1_3, TestData.removeAsset1_4], false)])
         );
 
         await SyncLocalChecked(new Checkpoint
@@ -250,7 +250,7 @@ public async Task ShouldUseSubkeys()
         });
 
         await bucketStorage.SaveSyncData(
-            new SyncDataBatch([new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset1_3, put4])])
+            new SyncDataBatch([new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset1_3, put4], false)])
         );
 
         await SyncLocalChecked(new Checkpoint
@@ -262,7 +262,7 @@ await SyncLocalChecked(new Checkpoint
         var result = await db.GetAll<AssetResult>("SELECT id, description, make FROM assets WHERE id = 'O1'");
         Assert.Equal(new AssetResult("O1", "B", null), result[0]);
 
-        await bucketStorage.SaveSyncData(new SyncDataBatch([new SyncDataBucket("bucket1", [remove5])]));
+        await bucketStorage.SaveSyncData(new SyncDataBatch([new SyncDataBucket("bucket1", [remove5], false)]));
 
         await SyncLocalChecked(new Checkpoint
         {
@@ -278,7 +278,7 @@ public async Task ShouldFailChecksumValidation()
     {
         // Simple checksum validation
         await bucketStorage.SaveSyncData(
-            new SyncDataBatch([new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.putAsset1_3])])
+            new SyncDataBatch([new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.putAsset1_3], false)])
         );
 
         var result = await bucketStorage.SyncLocalDatabase(new Checkpoint
@@ -304,7 +304,7 @@ public async Task ShouldDeleteBuckets()
     {
         await bucketStorage.SaveSyncData(
             new SyncDataBatch(
-            [new SyncDataBucket("bucket1", [TestData.putAsset1_3]), new SyncDataBucket("bucket2", [TestData.putAsset1_3])])
+            [new SyncDataBucket("bucket1", [TestData.putAsset1_3], false), new SyncDataBucket("bucket2", [TestData.putAsset1_3], false)])
         );
 
         await bucketStorage.RemoveBuckets(["bucket2"]);
@@ -335,23 +335,23 @@ public async Task ShouldDeleteAndRecreateBuckets()
     {
         // Save some data
         await bucketStorage.SaveSyncData(
-            new SyncDataBatch([new SyncDataBucket("bucket1", [TestData.putAsset1_1])])
+            new SyncDataBatch([new SyncDataBucket("bucket1", [TestData.putAsset1_1], false)])
         );
 
         // Delete the bucket
         await bucketStorage.RemoveBuckets(["bucket1"]);
 
         // Save some data again
         await bucketStorage.SaveSyncData(
-            new SyncDataBatch([new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset1_3])])
+            new SyncDataBatch([new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset1_3], false)])
         );
 
         // Delete again
         await bucketStorage.RemoveBuckets(["bucket1"]);
 
         // Final save of data
         await bucketStorage.SaveSyncData(
-            new SyncDataBatch([new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset1_3])])
+            new SyncDataBatch([new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset1_3], false)])
         );
 
         // Check that the data is there
@@ -388,12 +388,12 @@ await bucketStorage.SaveSyncData(
                         Op = new OpType(OpTypeEnum.MOVE).ToJSON(),
                         Checksum = 1
                     })
-                ])
+                ], false)
             ])
         );
 
         await bucketStorage.SaveSyncData(
-            new SyncDataBatch([new SyncDataBucket("bucket1", [TestData.putAsset1_3])])
+            new SyncDataBatch([new SyncDataBucket("bucket1", [TestData.putAsset1_3], false)])
         );
 
         await SyncLocalChecked(new Checkpoint
@@ -412,7 +412,7 @@ public async Task ShouldHandleClear()
         await bucketStorage.SaveSyncData(
             new SyncDataBatch(
             [
-                new SyncDataBucket("bucket1", [TestData.putAsset1_1])
+                new SyncDataBucket("bucket1", [TestData.putAsset1_1], false)
             ])
         );
 
@@ -446,7 +446,7 @@ await bucketStorage.SaveSyncData(
                         ObjectId = TestData.putAsset2_2.ObjectId,
                         ObjectType = TestData.putAsset2_2.ObjectType
                     })
-                ])
+                ], false)
             ])
         );
 
@@ -478,7 +478,7 @@ public async Task UpdateWithNewTypes()
 
         await bucketStorage.SaveSyncData(
             new SyncDataBatch(
-            [new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.putAsset1_3])])
+            [new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.putAsset1_3], false)])
         );
 
         await SyncLocalChecked(new Checkpoint
@@ -524,7 +524,7 @@ public async Task ShouldRemoveTypes()
         await bucketStorage.SaveSyncData(
             new SyncDataBatch(
             [
-                new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.putAsset1_3])
+                new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.putAsset1_3], false)
             ])
         );
 
@@ -578,7 +578,7 @@ public async Task ShouldCompact()
         await bucketStorage.SaveSyncData(
             new SyncDataBatch(
             [
-                new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.removeAsset1_4])
+                new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.removeAsset1_4], false)
             ])
         );
 
@@ -613,7 +613,7 @@ public async Task ShouldNotSyncLocalDbWithPendingCrud_ServerRemoved()
         await bucketStorage.SaveSyncData(
             new SyncDataBatch(
             [
-                new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.putAsset1_3])
+                new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.putAsset1_3], false)
             ])
         );
 
@@ -676,7 +676,7 @@ await SyncLocalChecked(new Checkpoint
         await bucketStorage.SaveSyncData(
             new SyncDataBatch(
             [
-            new SyncDataBucket("bucket1", Array.Empty<OplogEntry>())
+            new SyncDataBucket("bucket1", Array.Empty<OplogEntry>(), false)
             ])
         );
 
@@ -700,7 +700,7 @@ public async Task ShouldNotSyncLocalDbWithPendingCrud_WhenMoreCrudIsAdded_1()
         await bucketStorage.SaveSyncData(
             new SyncDataBatch(
             [
-                new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.putAsset1_3])
+                new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.putAsset1_3], false)
             ])
         );
 
@@ -743,7 +743,7 @@ await SyncLocalChecked(new Checkpoint
         await bucketStorage.SaveSyncData(
             new SyncDataBatch(
             [
-                new SyncDataBucket("bucket1", Array.Empty<OplogEntry>())
+                new SyncDataBucket("bucket1", Array.Empty<OplogEntry>(), false)
             ])
         );
 
@@ -769,7 +769,7 @@ public async Task ShouldNotSyncLocalDbWithPendingCrud_WhenMoreCrudIsAdded_2()
         await bucketStorage.SaveSyncData(
             new SyncDataBatch(
             [
-              new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.putAsset1_3])
+              new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.putAsset1_3], false)
             ])
         );
 
@@ -797,7 +797,7 @@ await SyncLocalChecked(new Checkpoint
         await bucketStorage.SaveSyncData(
             new SyncDataBatch(
             [
-            new SyncDataBucket("bucket1", [])
+            new SyncDataBucket("bucket1", [], false)
             ])
         );
 
@@ -826,7 +826,7 @@ public async Task ShouldNotSyncLocalDbWithPendingCrud_UpdateOnServer()
         await bucketStorage.SaveSyncData(
             new SyncDataBatch(
             [
-                new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.putAsset1_3])
+                new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.putAsset1_3], false)
             ])
         );
 
@@ -865,7 +865,7 @@ await bucketStorage.SaveSyncData(
                     Checksum = 5,
                     Data = new { description = "server updated" }
                 })
-            ])
+            ], false)
             ])
         );
 
@@ -889,7 +889,7 @@ public async Task ShouldRevertAFailingInsert()
         await bucketStorage.SaveSyncData(
             new SyncDataBatch(
             [
-                new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.putAsset1_3])
+                new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.putAsset1_3], false)
             ])
         );
 
@@ -931,7 +931,7 @@ public async Task ShouldRevertAFailingDelete()
         await bucketStorage.SaveSyncData(
             new SyncDataBatch(
             [
-                new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.putAsset1_3])
+                new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.putAsset1_3], false)
             ])
         );
 
@@ -974,7 +974,7 @@ public async Task ShouldRevertAFailingUpdate()
         await bucketStorage.SaveSyncData(
             new SyncDataBatch(
             [
-                new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.putAsset1_3])
+                new SyncDataBucket("bucket1", [TestData.putAsset1_1, TestData.putAsset2_2, TestData.putAsset1_3], false)
             ])
         );