mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-12 08:50:50 +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>
141 lines
4.3 KiB
Dart
141 lines
4.3 KiB
Dart
/// A single logged meal entry, mirroring one `food_log.json` array element.
|
|
library;
|
|
|
|
import 'package:diet_guard_app/models/meal_component.dart';
|
|
|
|
/// One logged meal, as stored in `food_log.json` under its date key.
|
|
///
|
|
/// Field names and shapes mirror diet_guard's `_state.log_meal` entry
|
|
/// exactly, so this app's local storage *is* the wire format -- no
|
|
/// translation layer is needed when syncing with the PC app.
|
|
class FoodEntry {
|
|
/// Creates a [FoodEntry] from its stored fields.
|
|
const FoodEntry({
|
|
required this.time,
|
|
required this.desc,
|
|
required this.grams,
|
|
required this.kcal,
|
|
required this.proteinG,
|
|
required this.carbsG,
|
|
required this.fatG,
|
|
required this.source,
|
|
this.id,
|
|
this.slot,
|
|
this.hmac,
|
|
this.components,
|
|
this.deleted = false,
|
|
});
|
|
|
|
/// Builds a [FoodEntry] from its JSON map representation.
|
|
///
|
|
/// Missing/non-numeric macro fields default to 0, mirroring
|
|
/// `_state._entry_float`'s tolerance of a hand-edited or partial entry.
|
|
factory FoodEntry.fromJson(Map<String, dynamic> json) => FoodEntry(
|
|
id: json['id'] as String?,
|
|
time: json['time'] as String? ?? '',
|
|
desc: json['desc'] as String? ?? '',
|
|
grams: (json['grams'] as num?)?.toDouble() ?? 0,
|
|
kcal: (json['kcal'] as num?)?.toDouble() ?? 0,
|
|
proteinG: (json['protein_g'] as num?)?.toDouble() ?? 0,
|
|
carbsG: (json['carbs_g'] as num?)?.toDouble() ?? 0,
|
|
fatG: (json['fat_g'] as num?)?.toDouble() ?? 0,
|
|
source: json['source'] as String? ?? 'manual',
|
|
slot: json['slot'] as int?,
|
|
hmac: json['hmac'] as String?,
|
|
components: (json['components'] as List?)
|
|
?.cast<Map<String, dynamic>>()
|
|
.map(MealComponent.fromJson)
|
|
.toList(),
|
|
deleted: json['deleted'] as bool? ?? false,
|
|
);
|
|
|
|
/// Stable identity for sync merge (UUID v4). Null only for legacy entries
|
|
/// written before this field existed.
|
|
final String? id;
|
|
|
|
/// ISO-8601 local timestamp with second precision, kept as a opaque
|
|
/// string (not parsed to [DateTime]) so it round-trips byte-for-byte --
|
|
/// the same field the PC's HMAC is computed over.
|
|
final String time;
|
|
|
|
/// The user's free-text meal description.
|
|
final String desc;
|
|
|
|
/// Portion weight in grams (0 if unknown).
|
|
final double grams;
|
|
|
|
/// Calories for this entry.
|
|
final double kcal;
|
|
|
|
/// Protein in grams.
|
|
final double proteinG;
|
|
|
|
/// Carbohydrate in grams.
|
|
final double carbsG;
|
|
|
|
/// Fat in grams.
|
|
final double fatG;
|
|
|
|
/// Provenance label (e.g. `"manual"`, `"food bank"`, `"meal"`).
|
|
final String source;
|
|
|
|
/// The meal-slot hour this entry satisfies (8/12/16/20), or null for a
|
|
/// snack that counts toward calories but satisfies no slot.
|
|
final int? slot;
|
|
|
|
/// HMAC signature, present on entries that have passed through the PC's
|
|
/// signing step. Never computed on the phone -- it never holds the key.
|
|
final String? hmac;
|
|
|
|
/// For a composite ("meal"-sourced) entry, each component's own macros.
|
|
final List<MealComponent>? components;
|
|
|
|
/// Tombstone flag: true once this entry has been undone. Kept (not
|
|
/// physically removed) so a sync merge can't resurrect a stale copy.
|
|
final bool deleted;
|
|
|
|
/// Returns the full local-storage representation.
|
|
///
|
|
/// Identical to [toSyncJson] now that nothing is device-local: every field
|
|
/// a device stores is a field it shares.
|
|
Map<String, Object?> toLocalJson() => toSyncJson();
|
|
|
|
/// Returns what gets pushed to this device's sync snapshot.
|
|
///
|
|
/// Excludes [hmac] (the phone never computes one; the PC re-signs on merge
|
|
/// regardless of origin, so an inbound signature would only be stripped
|
|
/// there anyway).
|
|
Map<String, Object?> toSyncJson() => {
|
|
if (id != null) 'id': id,
|
|
'time': time,
|
|
'desc': desc,
|
|
'grams': grams,
|
|
'kcal': kcal,
|
|
'protein_g': proteinG,
|
|
'carbs_g': carbsG,
|
|
'fat_g': fatG,
|
|
'source': source,
|
|
if (slot != null) 'slot': slot,
|
|
if (components != null)
|
|
'components': components!.map((c) => c.toJson()).toList(),
|
|
if (deleted) 'deleted': true,
|
|
};
|
|
|
|
/// Returns a copy of this entry tombstoned (`deleted: true`).
|
|
FoodEntry copyWithDeleted() => FoodEntry(
|
|
id: id,
|
|
time: time,
|
|
desc: desc,
|
|
grams: grams,
|
|
kcal: kcal,
|
|
proteinG: proteinG,
|
|
carbsG: carbsG,
|
|
fatG: fatG,
|
|
source: source,
|
|
slot: slot,
|
|
hmac: hmac,
|
|
components: components,
|
|
deleted: true,
|
|
);
|
|
}
|