mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-20 06:14:34 +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>
140 lines
3.8 KiB
Dart
140 lines
3.8 KiB
Dart
import 'package:diet_guard_app/models/food_entry.dart';
|
|
import 'package:diet_guard_app/models/meal_component.dart';
|
|
import 'package:flutter_test/flutter_test.dart';
|
|
|
|
void main() {
|
|
group('FoodEntry.fromJson', () {
|
|
test('parses a fully-populated entry', () {
|
|
final entry = FoodEntry.fromJson({
|
|
'id': 'abc-123',
|
|
'time': '2026-06-22T17:41:17+02:00',
|
|
'desc': 'label_food',
|
|
'grams': 150.0,
|
|
'kcal': 300.0,
|
|
'protein_g': 15.0,
|
|
'carbs_g': 30.0,
|
|
'fat_g': 7.5,
|
|
'source': 'manual',
|
|
'slot': 16,
|
|
'hmac': 'deadbeef',
|
|
'components': [
|
|
{
|
|
'name': 'rice',
|
|
'kcal': 200.0,
|
|
'protein_g': 4.0,
|
|
'carbs_g': 44.0,
|
|
'fat_g': 1.0,
|
|
'grams': 150.0,
|
|
},
|
|
],
|
|
'deleted': true,
|
|
});
|
|
expect(entry.id, 'abc-123');
|
|
expect(entry.desc, 'label_food');
|
|
expect(entry.kcal, 300.0);
|
|
expect(entry.slot, 16);
|
|
expect(entry.hmac, 'deadbeef');
|
|
expect(entry.components, hasLength(1));
|
|
expect(entry.components!.first.name, 'rice');
|
|
expect(entry.deleted, isTrue);
|
|
});
|
|
|
|
test('defaults missing macro fields to 0 and source to manual', () {
|
|
final entry = FoodEntry.fromJson(const {'desc': 'mystery food'});
|
|
expect(entry.id, isNull);
|
|
expect(entry.kcal, 0);
|
|
expect(entry.proteinG, 0);
|
|
expect(entry.source, 'manual');
|
|
expect(entry.slot, isNull);
|
|
expect(entry.deleted, isFalse);
|
|
expect(entry.components, isNull);
|
|
});
|
|
});
|
|
|
|
group('toLocalJson vs toSyncJson', () {
|
|
test('toLocalJson matches toSyncJson; both exclude hmac', () {
|
|
const entry = FoodEntry(
|
|
id: 'id-1',
|
|
time: '2026-06-22T08:00:00+02:00',
|
|
desc: 'toast',
|
|
grams: 50,
|
|
kcal: 120,
|
|
proteinG: 3,
|
|
carbsG: 20,
|
|
fatG: 2,
|
|
source: 'manual',
|
|
hmac: 'sig',
|
|
);
|
|
final local = entry.toLocalJson();
|
|
final sync = entry.toSyncJson();
|
|
expect(sync.containsKey('hmac'), isFalse);
|
|
expect(sync['desc'], 'toast');
|
|
});
|
|
|
|
test('omits optional fields entirely when unset', () {
|
|
const entry = FoodEntry(
|
|
time: '2026-06-22T08:00:00+02:00',
|
|
desc: 'toast',
|
|
grams: 50,
|
|
kcal: 120,
|
|
proteinG: 3,
|
|
carbsG: 20,
|
|
fatG: 2,
|
|
source: 'manual',
|
|
);
|
|
final sync = entry.toSyncJson();
|
|
expect(sync.containsKey('id'), isFalse);
|
|
expect(sync.containsKey('slot'), isFalse);
|
|
expect(sync.containsKey('components'), isFalse);
|
|
expect(sync.containsKey('deleted'), isFalse);
|
|
});
|
|
|
|
test('includes deleted: true only when tombstoned', () {
|
|
const entry = FoodEntry(
|
|
time: '2026-06-22T08:00:00+02:00',
|
|
desc: 'toast',
|
|
grams: 50,
|
|
kcal: 120,
|
|
proteinG: 3,
|
|
carbsG: 20,
|
|
fatG: 2,
|
|
source: 'manual',
|
|
deleted: true,
|
|
);
|
|
expect(entry.toSyncJson()['deleted'], isTrue);
|
|
});
|
|
});
|
|
|
|
group('copyWithImagePath / copyWithDeleted', () {
|
|
const base = FoodEntry(
|
|
id: 'id-1',
|
|
time: '2026-06-22T08:00:00+02:00',
|
|
desc: 'toast',
|
|
grams: 50,
|
|
kcal: 120,
|
|
proteinG: 3,
|
|
carbsG: 20,
|
|
fatG: 2,
|
|
source: 'manual',
|
|
components: [
|
|
MealComponent(
|
|
name: 'bread',
|
|
kcal: 120,
|
|
proteinG: 3,
|
|
carbsG: 20,
|
|
fatG: 2,
|
|
grams: 50,
|
|
),
|
|
],
|
|
);
|
|
|
|
test('copyWithDeleted sets deleted true and preserves everything else', () {
|
|
final tombstoned = base.copyWithDeleted();
|
|
expect(tombstoned.deleted, isTrue);
|
|
expect(tombstoned.id, base.id);
|
|
expect(tombstoned.kcal, base.kcal);
|
|
expect(tombstoned.components, base.components);
|
|
});
|
|
});
|
|
}
|