Touch old record to ensure backup provider picks it up for sync later

theachoem · Jan 25, 2025 · efee8f2 · efee8f2
1 parent fe74bd8
commit efee8f2
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 2 deletions.
diff --git a/lib/core/databases/adapters/base_db_adapter.dart b/lib/core/databases/adapters/base_db_adapter.dart
@@ -18,6 +18,7 @@ abstract class BaseDbAdapter<T extends BaseDbModel> {
     Map<String, dynamic>? options,
   });
 
+  Future<T?> touch(T record);
   Future<T?> set(T record);
   Future<void> setAll(List<T> records);
 
@@ -29,7 +30,7 @@ abstract class BaseDbAdapter<T extends BaseDbModel> {
 
   T modelFromJson(Map<String, dynamic> json);
 
-  Future<void> afterCommit(int id) async {
+  Future<void> afterCommit([int? id]) async {
     debugPrint("BaseDbAdapter#afterCommit $id");
 
     for (FutureOr<void> Function() globalCallback in _globalListeners) {

diff --git a/lib/core/databases/adapters/objectbox/base_box.dart b/lib/core/databases/adapters/objectbox/base_box.dart
@@ -86,6 +86,20 @@ abstract class BaseBox<B extends BaseObjectBox, T extends BaseDbModel> extends B
     return CollectionDbModel<T>(items: docs);
   }
 
+  @override
+  Future<T?> touch(
+    T record, {
+    bool runCallbacks = true,
+  }) async {
+    B constructed = await modelToObject(record);
+
+    constructed.touch();
+    await box.putAsync(constructed, mode: PutMode.put);
+
+    if (runCallbacks) afterCommit(record.id);
+    return record;
+  }
+
   @override
   Future<T?> set(
     T record, {
@@ -101,13 +115,17 @@ abstract class BaseBox<B extends BaseObjectBox, T extends BaseDbModel> extends B
   }
 
   @override
-  Future<void> setAll(List<T> records) async {
+  Future<void> setAll(
+    List<T> records, {
+    bool runCallbacks = true,
+  }) async {
     List<B> objects = await modelsToObjects(records.whereType<T>().toList());
 
     for (B obj in objects) {
       obj.setDeviceId();
     }
 
+    if (runCallbacks) afterCommit();
     await box.putManyAsync(objects, mode: PutMode.put);
   }
 

diff --git a/lib/core/databases/adapters/objectbox/entities.dart b/lib/core/databases/adapters/objectbox/entities.dart
@@ -9,6 +9,8 @@ abstract class BaseObjectBox<T> {
     lastSavedDeviceId = kDeviceInfo.id;
   }
 
+  void touch();
+
   DateTime? permanentlyDeletedAt;
   String? lastSavedDeviceId;
 }
@@ -82,6 +84,11 @@ class StoryObjectBox extends BaseObjectBox {
     updatedAt = DateTime.now();
     permanentlyDeletedAt = DateTime.now();
   }
+
+  @override
+  void touch() {
+    updatedAt = DateTime.now();
+  }
 }
 
 @Entity()
@@ -126,6 +133,11 @@ class TagObjectBox extends BaseObjectBox {
     updatedAt = DateTime.now();
     permanentlyDeletedAt = DateTime.now();
   }
+
+  @override
+  void touch() {
+    updatedAt = DateTime.now();
+  }
 }
 
 @Entity()
@@ -163,4 +175,9 @@ class PreferenceObjectBox extends BaseObjectBox {
     updatedAt = DateTime.now();
     permanentlyDeletedAt = DateTime.now();
   }
+
+  @override
+  void touch() {
+    updatedAt = DateTime.now();
+  }
 }
diff --git a/lib/core/databases/adapters/sqlite/base_sqlite_db_adapter.dart b/lib/core/databases/adapters/sqlite/base_sqlite_db_adapter.dart
@@ -45,6 +45,11 @@ class BaseSqliteDbAdapter extends BaseDbAdapter {
     throw UnimplementedError();
   }
 
+  @override
+  Future<BaseDbModel?> touch(BaseDbModel record) {
+    throw UnimplementedError();
+  }
+
   @override
   Future<BaseDbModel?> set(BaseDbModel record) {
     throw UnimplementedError();

diff --git a/lib/core/services/restore_backup_service.dart b/lib/core/services/restore_backup_service.dart
@@ -32,8 +32,14 @@ class RestoreBackupService {
           if (existingRecord != null) {
             if (existingRecord.updatedAt != null && newRecord.updatedAt != null) {
               bool newContent = existingRecord.updatedAt!.isBefore(newRecord.updatedAt!);
+              bool unSyncContent = existingRecord.updatedAt!.isBefore(newRecord.updatedAt!);
+
               if (newContent) {
                 await db.set(newRecord);
+              } else if (unSyncContent) {
+                // Update `updatedAt` to mark the record as unsynced, ensuring the backup provider picks it up later.
+                // This prevents the app from incorrectly assuming the database is fully synced after restoration.
+                await db.touch(existingRecord);
               }
             }
           } else {