diff --git a/app/lib/services/sync_merge.dart b/app/lib/services/sync_merge.dart index 5d0e8fc..224d4ef 100644 --- a/app/lib/services/sync_merge.dart +++ b/app/lib/services/sync_merge.dart @@ -36,10 +36,9 @@ import 'package:crypto/crypto.dart'; import 'package:diet_guard_app/models/food_bank_record.dart'; import 'package:diet_guard_app/models/food_entry.dart'; import 'package:diet_guard_app/services/budget_schedule.dart'; +import 'package:diet_guard_app/services/github_client_factory.dart'; import 'package:diet_guard_app/services/log_storage_service.dart'; -const _syncDeviceId = 'phone'; - /// Derives a deterministic [Hlc] for [entry] from its own `time` field. /// /// The same entry always yields the same Hlc regardless of when this runs @@ -51,7 +50,7 @@ const _syncDeviceId = 'phone'; /// survives a merge. Hlc entryHlc(FoodEntry entry) { final wallTimeMs = DateTime.tryParse(entry.time)?.millisecondsSinceEpoch ?? 0; - return Hlc.newTick(_syncDeviceId, wallTimeMsOverride: wallTimeMs); + return Hlc.newTick(syncDeviceId, wallTimeMsOverride: wallTimeMs); } /// Deterministic id for a pre-`id` legacy entry, from `(time, desc)`. @@ -207,7 +206,7 @@ Log foodBankToLog(Map bank) { 'body': ( mapEntry.value.toJson(), Hlc.newTick( - _syncDeviceId, + syncDeviceId, wallTimeMsOverride: mapEntry.value.count.toInt(), ), ), @@ -271,7 +270,7 @@ Log manualBankToLog(Map bank) { fields: { 'body': ( body, - Hlc.newTick(_syncDeviceId, wallTimeMsOverride: wallTimeMs), + Hlc.newTick(syncDeviceId, wallTimeMsOverride: wallTimeMs), ), }, ); @@ -338,7 +337,7 @@ Hlc budgetHlc(Map record) { record['t'] as String? ?? '', )?.toUtc().millisecondsSinceEpoch ?? 0; - return Hlc.newTick(_syncDeviceId, wallTimeMsOverride: wallTimeMs); + return Hlc.newTick(syncDeviceId, wallTimeMsOverride: wallTimeMs); } /// Field-name prefix for the effective-from budget history, one field per @@ -356,7 +355,7 @@ const budgetHistoryFieldPrefix = 'hist:'; Hlc historyHlc(BudgetEntry entry) { final wallTimeMs = DateTime.tryParse(entry.editedAt)?.toUtc().millisecondsSinceEpoch ?? 0; - return Hlc.newTick(_syncDeviceId, wallTimeMsOverride: wallTimeMs); + return Hlc.newTick(syncDeviceId, wallTimeMsOverride: wallTimeMs); } /// Converts a raw local budget record plus its history into a [Log].