mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-11 17:13:58 +01:00
Four asks, plus the fixes two review passes turned up. Removals (all unused): - "Repeat last meal" button, and the reward/temptation-bundling prompt it was the sole trigger for. Replaced with a post-log progress card showing kcal against budget, macros, and the adherence streak. - The multi-item meal builder, on both the gate and the phone. The stored `components` field stays: nothing writes it now, but historical composite entries and the food bank still read it and it is part of the wire format. - Meal photos entirely: 13 files, `imagePath`, the photo filter, the wrapper's /blobs/ route, image_picker, and the CAMERA permission. Reminder false alarms had three real causes, all fixed: - Logging never reconciled notifications, so a reminder sat on screen up to 15 minutes after the meal was logged -- on the phone itself. - The background check never pulled, so a PC-logged meal nagged forever until the app was opened. Now mirrors _cli_gate._should_lock: cheap local check, network only when a slot looks due, then re-check. - Meals before 08:00 / after 22:00 were attributed to no slot at all. New slot_for_log/slotForLog clamps them to the first/last slot, byte-identical across Python and Dart. Deliberately separate from elapsed_slots, which would otherwise make every slot fall due at 23:00. Budget history, so lowering the budget stops rewriting the past: - Forward-only (effective_from, kcal) entries; each day is judged against the budget in force then. Verified live: setting 2000 left a 36-day adherence streak and the whole calendar pixel-identical. - Rides as hist:<date> fields on the existing budget record. crdt_sync merges per-field over the union of field names and both devices push the merged log, so a device that predates the feature relays them untouched -- no coordinated rollout, no second document. - The seed guard tests emptiness, not file presence: _sync can write an empty history after merging with a pre-feature peer, and a presence check would then never seed again, silently reclassifying every past day. One shared source of truth for every piece of data: - Body weight now travels as its own `weight` CRDT field. Inside `value` it was collateral damage of whole-map LWW -- any phone budget edit deleted it, and the protein target with it. - Both halves of the food bank sync. The curated half (foods added without eating them) was the last device-local state. The derived half merges with count as the clock, so LWW means max-count-wins; the log stays authoritative for membership, because a CRDT union never shrinks and a peer's stale copy would otherwise resurrect a deleted food permanently. - Bank adapters honour tombstones, and Dart parses bank records defensively: a cast failure there is an Error, not an Exception, so one malformed remote record would have broken phone sync permanently. _test_guard.py blocks any pathlib write to real user state while pytest is in the process, whatever conftest is loaded. A throwaway test run outside the package conftest destroyed a real GitHub token during this work; this makes that class of accident impossible rather than merely discouraged. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
233 lines
8.1 KiB
Dart
233 lines
8.1 KiB
Dart
/// Local persistence for the food log, mirroring diet_guard's `_state.py`.
|
|
library;
|
|
|
|
import 'dart:convert';
|
|
|
|
import 'package:diet_guard_app/models/food_entry.dart';
|
|
import 'package:diet_guard_app/models/local_time.dart';
|
|
import 'package:diet_guard_app/models/meal_component.dart';
|
|
import 'package:diet_guard_app/models/nutrition.dart';
|
|
import 'package:diet_guard_app/services/document_store.dart';
|
|
import 'package:diet_guard_app/services/document_store_factory.dart';
|
|
import 'package:flutter/foundation.dart';
|
|
import 'package:uuid/uuid.dart';
|
|
|
|
/// The on-disk log shape: date key (`YYYY-MM-DD`) to that day's entries.
|
|
typedef DayLog = Map<String, List<FoodEntry>>;
|
|
|
|
/// Singleton service reading/writing `food_log.json` verbatim.
|
|
///
|
|
/// Stores plain JSON matching diet_guard's exact on-disk schema rather than
|
|
/// a SQL database: the canonical format already *is* this JSON (it is also
|
|
/// the sync payload, see Milestone 3), so a SQL schema would only add a
|
|
/// second representation to keep in lockstep for no query benefit --
|
|
/// autocomplete is small-corpus fuzzy string matching, not a relational
|
|
/// query.
|
|
class LogStorageService {
|
|
LogStorageService._(this._store);
|
|
|
|
/// Document name this service owns, unchanged from the pre-web on-disk
|
|
/// filename so an installed phone keeps reading its existing log.
|
|
static const documentName = 'food_log.json';
|
|
|
|
static LogStorageService? _instance;
|
|
|
|
/// Returns the initialized singleton; throws if [init] was not called.
|
|
static LogStorageService get instance => _instance!;
|
|
|
|
final DocumentStore _store;
|
|
|
|
/// Initializes the singleton against the platform document store: files in
|
|
/// the app's documents directory on Android (phone-sandboxed; no
|
|
/// external-storage permission needed), IndexedDB in the browser-hosted
|
|
/// desktop app.
|
|
static Future<LogStorageService> init() async {
|
|
if (_instance != null) return _instance!;
|
|
final svc = LogStorageService._(await openDocumentStore());
|
|
_instance = svc;
|
|
return svc;
|
|
}
|
|
|
|
/// Resets the singleton so [init] can be called again in tests.
|
|
///
|
|
/// When [store] is given, subsequent reads/writes go there instead of the
|
|
/// real platform store, so a test can never touch real data.
|
|
@visibleForTesting
|
|
static void resetForTesting({DocumentStore? store}) {
|
|
_instance = store == null ? null : LogStorageService._(store);
|
|
}
|
|
|
|
/// Reads the full log, including tombstoned entries.
|
|
///
|
|
/// Returns an empty log on a missing or unparsable file, mirroring
|
|
/// `_state._read_raw_log`'s defensive read.
|
|
Future<DayLog> readLog() async {
|
|
final raw = await _store.read(documentName);
|
|
if (raw == null) return {};
|
|
Object? data;
|
|
try {
|
|
data = jsonDecode(raw);
|
|
} on FormatException {
|
|
return {};
|
|
}
|
|
if (data is! Map) return {};
|
|
final result = <String, List<FoodEntry>>{};
|
|
for (final mapEntry in data.entries) {
|
|
final key = mapEntry.key;
|
|
final value = mapEntry.value;
|
|
if (key is! String || value is! List<dynamic>) continue;
|
|
result[key] = value
|
|
.whereType<Map<dynamic, dynamic>>()
|
|
.map((m) => FoodEntry.fromJson(m.cast<String, dynamic>()))
|
|
.toList();
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/// Persists the full log to the store, mirroring `_state._write_log`.
|
|
///
|
|
/// Atomicity against a concurrent reader is the store's job (see
|
|
/// `FileDocumentStore.write`'s temp-file-and-rename), not this method's.
|
|
Future<void> writeLog(DayLog log) async {
|
|
final encoded = <String, Object?>{
|
|
for (final mapEntry in log.entries)
|
|
mapEntry.key: mapEntry.value.map((e) => e.toLocalJson()).toList(),
|
|
};
|
|
await _store.write(documentName, jsonEncode(encoded));
|
|
}
|
|
|
|
/// Appends a signed-on-PC-eventually entry for [desc] to today's log.
|
|
///
|
|
/// Mirrors `_state.log_meal`: always assigns a fresh `id`, never computes
|
|
/// an `hmac` (the phone never holds the shared key -- the PC re-signs on
|
|
/// merge, see Milestone 3).
|
|
Future<FoodEntry> logMeal(
|
|
String desc,
|
|
Nutrition nutrition, {
|
|
int? slot,
|
|
List<MealComponent>? components,
|
|
}) async {
|
|
final now = DateTime.now();
|
|
final entry = FoodEntry(
|
|
id: const Uuid().v4(),
|
|
time: isoLocalSeconds(now),
|
|
desc: desc,
|
|
grams: nutrition.grams,
|
|
kcal: nutrition.kcal,
|
|
proteinG: nutrition.proteinG,
|
|
carbsG: nutrition.carbsG,
|
|
fatG: nutrition.fatG,
|
|
source: nutrition.source,
|
|
slot: slot,
|
|
components: components,
|
|
);
|
|
final log = await readLog();
|
|
log.putIfAbsent(localDateKey(now), () => []).add(entry);
|
|
await writeLog(log);
|
|
return entry;
|
|
}
|
|
|
|
/// Tombstones today's most recently logged, not-yet-undone entry.
|
|
///
|
|
/// Mirrors `_state.undo_last_today`: marks the entry `deleted` in place
|
|
/// rather than removing it, so a later sync merge can't resurrect a
|
|
/// stale copy of the same entry from another device.
|
|
Future<FoodEntry?> undoLastToday() async {
|
|
final log = await readLog();
|
|
final today = localDateKey(DateTime.now());
|
|
final entries = log[today];
|
|
if (entries == null || entries.isEmpty) return null;
|
|
for (var i = entries.length - 1; i >= 0; i--) {
|
|
if (entries[i].deleted) continue;
|
|
final tombstoned = entries[i].copyWithDeleted();
|
|
entries[i] = tombstoned;
|
|
log[today] = entries;
|
|
await writeLog(log);
|
|
return tombstoned;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
/// Returns today's non-tombstoned entries, mirrors `_state.today_entries`.
|
|
Future<List<FoodEntry>> todayEntries() async {
|
|
final log = await readLog();
|
|
final entries = log[localDateKey(DateTime.now())] ?? const <FoodEntry>[];
|
|
return entries.where((e) => !e.deleted).toList();
|
|
}
|
|
|
|
/// Returns every non-tombstoned entry across all days, newest first.
|
|
///
|
|
/// Backs the history screen -- the only place that needs to see more than
|
|
/// "today".
|
|
Future<List<FoodEntry>> allEntriesNewestFirst() async {
|
|
final log = await readLog();
|
|
final entries =
|
|
[
|
|
for (final dayEntries in log.values)
|
|
...dayEntries.where((e) => !e.deleted),
|
|
]..sort((a, b) {
|
|
final aTime = DateTime.tryParse(a.time);
|
|
final bTime = DateTime.tryParse(b.time);
|
|
if (aTime == null || bTime == null) return 0;
|
|
return bTime.compareTo(aTime);
|
|
});
|
|
return entries;
|
|
}
|
|
|
|
/// Returns today's total calories, mirrors `_state.today_total_kcal`.
|
|
Future<double> todayTotalKcal() async {
|
|
final entries = await todayEntries();
|
|
var total = 0.0;
|
|
for (final entry in entries) {
|
|
total += entry.kcal;
|
|
}
|
|
return double.parse(total.toStringAsFixed(1));
|
|
}
|
|
|
|
/// Tombstones the entry with [id] wherever it appears in the log.
|
|
///
|
|
/// Silently does nothing when the id is not found or the entry is already
|
|
/// deleted — covers both legacy null-id entries and double-delete races.
|
|
Future<void> deleteEntry(String id) async {
|
|
final log = await readLog();
|
|
for (final entries in log.values) {
|
|
for (var i = 0; i < entries.length; i++) {
|
|
if (entries[i].id == id && !entries[i].deleted) {
|
|
entries[i] = entries[i].copyWithDeleted();
|
|
await writeLog(log);
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Replaces the stored entry matching [original] with [updated].
|
|
///
|
|
/// Matches by [FoodEntry.id] when present; falls back to
|
|
/// `time + desc` for legacy entries that predate UUID support.
|
|
/// Silently does nothing when no match is found.
|
|
Future<void> updateEntry(FoodEntry original, FoodEntry updated) async {
|
|
final log = await readLog();
|
|
for (final entries in log.values) {
|
|
for (var i = 0; i < entries.length; i++) {
|
|
final e = entries[i];
|
|
final matches = original.id != null
|
|
? e.id == original.id
|
|
: e.time == original.time && e.desc == original.desc;
|
|
if (matches) {
|
|
entries[i] = updated;
|
|
await writeLog(log);
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Returns the slot hours already satisfied today, mirrors
|
|
/// `_state.logged_slots_today`.
|
|
Future<Set<int>> loggedSlotsToday() async {
|
|
final entries = await todayEntries();
|
|
return entries.where((e) => e.slot != null).map((e) => e.slot!).toSet();
|
|
}
|
|
}
|