mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-11 14:07:40 +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>
85 lines
3.0 KiB
Dart
85 lines
3.0 KiB
Dart
/// Pure meal-slot arithmetic, mirroring diet_guard's `_slots.py`.
|
|
///
|
|
/// Deliberately I/O-free and clock-free: every function is a total function
|
|
/// of its `now` argument and the fixed slot constants below, so the
|
|
/// time-of-day edges are exhaustively unit-testable without mocking the
|
|
/// wall clock. Shared between the in-app status bar and the background
|
|
/// notification check (Milestone 4), exactly like the Python original is
|
|
/// shared between the gate dashboard and the lock decision.
|
|
library;
|
|
|
|
/// First slot hour of the day (08:00), mirrors `GATE_DAY_START_HOUR`.
|
|
const int gateDayStartHour = 8;
|
|
|
|
/// Hours between slots, mirrors `GATE_SLOT_INTERVAL_HOURS`.
|
|
const int gateSlotIntervalHours = 4;
|
|
|
|
/// Exclusive end of the enforcement window (22:00), mirrors
|
|
/// `GATE_EATING_END_HOUR`.
|
|
const int gateEatingEndHour = 22;
|
|
|
|
/// Returns the fixed meal-slot hours for a day, e.g. `(8, 12, 16, 20)`.
|
|
///
|
|
/// Mirrors `_slots.day_slots`.
|
|
List<int> daySlots() {
|
|
final slots = <int>[];
|
|
for (
|
|
var hour = gateDayStartHour;
|
|
hour < gateEatingEndHour;
|
|
hour += gateSlotIntervalHours
|
|
) {
|
|
slots.add(hour);
|
|
}
|
|
return slots;
|
|
}
|
|
|
|
/// Returns true if [now] is inside the daily slot-enforcement window.
|
|
///
|
|
/// Mirrors `_slots.within_enforcement_window`.
|
|
bool withinEnforcementWindow(DateTime now) =>
|
|
now.hour >= gateDayStartHour && now.hour < gateEatingEndHour;
|
|
|
|
/// Returns today's slots whose hour has arrived as of [now].
|
|
///
|
|
/// Empty outside the enforcement window. Mirrors `_slots.elapsed_slots`.
|
|
List<int> elapsedSlots(DateTime now) {
|
|
if (!withinEnforcementWindow(now)) return const [];
|
|
return daySlots().where((slot) => slot <= now.hour).toList();
|
|
}
|
|
|
|
/// Returns elapsed slots not yet covered by [logged].
|
|
///
|
|
/// Mirrors `_slots.missing_slots`.
|
|
List<int> missingSlots(DateTime now, Set<int> logged) =>
|
|
elapsedSlots(now).where((slot) => !logged.contains(slot)).toList();
|
|
|
|
/// Returns the most recent elapsed slot as of [now], or null.
|
|
///
|
|
/// Mirrors `_slots.current_slot`.
|
|
int? currentSlot(DateTime now) {
|
|
final elapsed = elapsedSlots(now);
|
|
return elapsed.isEmpty ? null : elapsed.last;
|
|
}
|
|
|
|
/// Returns the slot a meal logged at [now] should be attributed to.
|
|
///
|
|
/// CLAMP RULE (keep byte-identical with `_slots.slot_for_log`): before the
|
|
/// first window, clamp to the first slot; after the last window, clamp to the
|
|
/// last slot; behaviour inside a window is unchanged.
|
|
///
|
|
/// Unlike [currentSlot] this never returns null, which is the point: an
|
|
/// off-hours meal used to satisfy no slot at all, so eating at 07:30 or
|
|
/// 22:30 still produced a "you haven't logged your meal" reminder. Attribution
|
|
/// is deliberately separate from [elapsedSlots]/[missingSlots] -- widening
|
|
/// *those* would instead make every slot fall due at 23:00.
|
|
int slotForLog(DateTime now) {
|
|
final slots = daySlots();
|
|
if (now.hour < gateDayStartHour) return slots.first;
|
|
return currentSlot(now) ?? slots.last;
|
|
}
|
|
|
|
/// Returns a human `HH:00` label for [slot], e.g. `"08:00"`.
|
|
///
|
|
/// Mirrors `_slots.slot_label`.
|
|
String slotLabel(int slot) => '${(slot % 24).toString().padLeft(2, '0')}:00';
|