mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-22 17:22:19 +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>
97 lines
3.2 KiB
Dart
97 lines
3.2 KiB
Dart
/// One entry in the local food bank (autocomplete index), mirroring
|
|
/// diet_guard's `_foodbank.BankRecord`.
|
|
library;
|
|
|
|
/// A previously-logged (or hand-curated) food's macros and use count.
|
|
///
|
|
/// Mirrors `_foodbank.py`'s on-disk shape: `{desc, kcal, protein_g,
|
|
/// carbs_g, fat_g, grams, count, components?}`. Unlike [FoodEntry], a
|
|
/// composite record's `components` here are bare names (the bank is an
|
|
/// autocomplete index, not the source of truth for component macros --
|
|
/// those live on the log entry itself, see `MealComponent`).
|
|
class FoodBankRecord {
|
|
/// Creates a [FoodBankRecord] from its stored fields.
|
|
const FoodBankRecord({
|
|
required this.desc,
|
|
required this.kcal,
|
|
required this.proteinG,
|
|
required this.carbsG,
|
|
required this.fatG,
|
|
required this.grams,
|
|
required this.count,
|
|
this.components,
|
|
this.editedAt,
|
|
});
|
|
|
|
/// Builds a [FoodBankRecord] from its JSON map representation.
|
|
///
|
|
/// Every field is type-*checked* rather than cast. These maps now arrive
|
|
/// from another device over the network, and a bad cast here throws a
|
|
/// Dart `TypeError` -- an `Error`, not an `Exception` -- which sails
|
|
/// straight past the `on Exception` guards in `background_sync_service`
|
|
/// and `settings_screen`. One malformed record in the shared repo would
|
|
/// otherwise break this device's sync permanently. Mirrors the `isinstance`
|
|
/// checks the Python side already uses.
|
|
factory FoodBankRecord.fromJson(Map<String, dynamic> json) {
|
|
double number(Object? value) => value is num ? value.toDouble() : 0;
|
|
final components = json['components'];
|
|
return FoodBankRecord(
|
|
desc: json['desc'] is String ? json['desc'] as String : '',
|
|
kcal: number(json['kcal']),
|
|
proteinG: number(json['protein_g']),
|
|
carbsG: number(json['carbs_g']),
|
|
fatG: number(json['fat_g']),
|
|
grams: number(json['grams']),
|
|
count: number(json['count']),
|
|
components: components is List
|
|
? components.whereType<String>().toList()
|
|
: null,
|
|
editedAt: json['t'] is String ? json['t'] as String : null,
|
|
);
|
|
}
|
|
|
|
/// The food or meal's display name, as the user typed it.
|
|
final String desc;
|
|
|
|
/// Calories per the stored portion.
|
|
final double kcal;
|
|
|
|
/// Protein in grams.
|
|
final double proteinG;
|
|
|
|
/// Carbohydrate in grams.
|
|
final double carbsG;
|
|
|
|
/// Fat in grams.
|
|
final double fatG;
|
|
|
|
/// Portion weight in grams.
|
|
final double grams;
|
|
|
|
/// Number of times this food has been logged (ranks staples first).
|
|
final double count;
|
|
|
|
/// Component names, for a composite meal record only.
|
|
final List<String>? components;
|
|
|
|
/// Local ISO-8601 stamp of the last hand-edit, for curated entries only.
|
|
///
|
|
/// Null on log-derived records: those are rebuilt from the (already synced)
|
|
/// log and need no clock of their own. On a curated entry it is what the
|
|
/// cross-device merge orders by -- see `foodbank_manual_sync`.
|
|
final String? editedAt;
|
|
|
|
/// Returns this record as a JSON-ready map with snake_case keys.
|
|
Map<String, Object?> toJson() => {
|
|
'desc': desc,
|
|
'kcal': kcal,
|
|
'protein_g': proteinG,
|
|
'carbs_g': carbsG,
|
|
'fat_g': fatG,
|
|
'grams': grams,
|
|
'count': count,
|
|
if (components != null) 'components': components,
|
|
if (editedAt != null) 't': editedAt,
|
|
};
|
|
}
|