mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-22 12:42: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>
134 lines
4.3 KiB
Dart
134 lines
4.3 KiB
Dart
import 'dart:convert';
|
|
import 'dart:io';
|
|
|
|
import 'package:diet_guard_app/services/budget_history_service.dart';
|
|
import 'package:diet_guard_app/services/budget_schedule.dart';
|
|
import 'package:diet_guard_app/services/document_store_io.dart';
|
|
import 'package:flutter_test/flutter_test.dart';
|
|
|
|
void main() {
|
|
TestWidgetsFlutterBinding.ensureInitialized();
|
|
late Directory tempDir;
|
|
|
|
setUp(() async {
|
|
tempDir = await Directory.systemTemp.createTemp('diet_guard_hist_');
|
|
BudgetHistoryService.resetForTesting(store: FileDocumentStore(tempDir));
|
|
});
|
|
|
|
tearDown(() async {
|
|
BudgetHistoryService.resetForTesting();
|
|
await tempDir.delete(recursive: true);
|
|
});
|
|
|
|
test('schedule is empty when the singleton is uninitialised', () {
|
|
BudgetHistoryService.resetForTesting();
|
|
expect(BudgetHistoryService.schedule.entries, isEmpty);
|
|
expect(BudgetHistoryService.schedule.forDay('2026-06-01'), 2200);
|
|
});
|
|
|
|
test('seedIfEmpty grandfathers the current value to the epoch', () async {
|
|
await BudgetHistoryService.instance.seedIfEmpty(
|
|
2200,
|
|
DateTime.utc(2026, 7, 13),
|
|
);
|
|
|
|
expect(BudgetHistoryService.schedule.forDay('2026-06-01'), 2200);
|
|
expect(
|
|
BudgetHistoryService.schedule.entries.single.effectiveFrom,
|
|
kEpochDay,
|
|
);
|
|
});
|
|
|
|
test('seedIfEmpty does nothing when the goal was never set', () async {
|
|
// A null updatedAt means this device has nothing of its own to
|
|
// grandfather; the default fallback already covers every day.
|
|
await BudgetHistoryService.instance.seedIfEmpty(2200, null);
|
|
expect(BudgetHistoryService.schedule.entries, isEmpty);
|
|
});
|
|
|
|
test('seedIfEmpty never overwrites an existing history', () async {
|
|
await BudgetHistoryService.instance.recordChange(
|
|
1800,
|
|
when: DateTime(2026, 7, 26),
|
|
);
|
|
await BudgetHistoryService.instance.seedIfEmpty(
|
|
2200,
|
|
DateTime.utc(2026, 7, 13),
|
|
);
|
|
expect(BudgetHistoryService.schedule.entries, hasLength(1));
|
|
expect(BudgetHistoryService.schedule.entries.single.kcal, 1800);
|
|
});
|
|
|
|
test('recordChange persists and reloads', () async {
|
|
await BudgetHistoryService.instance.recordChange(
|
|
2000,
|
|
when: DateTime(2026, 7, 26),
|
|
);
|
|
|
|
await BudgetHistoryService.initForTesting(FileDocumentStore(tempDir));
|
|
|
|
expect(BudgetHistoryService.schedule.forDay('2026-07-26'), 2000);
|
|
});
|
|
|
|
test('overlapping same-day writes leave exactly one entry', () async {
|
|
// settings_screen saves as the user types, so several of these are in
|
|
// flight at once; the service serializes its whole in-memory schedule
|
|
// rather than read-modify-writing, so they cannot race into duplicates.
|
|
final when = DateTime(2026, 7, 26, 12);
|
|
await Future.wait([
|
|
BudgetHistoryService.instance.recordChange(2, when: when),
|
|
BudgetHistoryService.instance.recordChange(20, when: when),
|
|
BudgetHistoryService.instance.recordChange(200, when: when),
|
|
BudgetHistoryService.instance.recordChange(2000, when: when),
|
|
]);
|
|
|
|
expect(BudgetHistoryService.schedule.entries, hasLength(1));
|
|
});
|
|
|
|
test('applyMerged replaces the stored history', () async {
|
|
await BudgetHistoryService.instance.recordChange(
|
|
1800,
|
|
when: DateTime(2026, 7, 26),
|
|
);
|
|
|
|
await BudgetHistoryService.instance.applyMerged([
|
|
const BudgetEntry(
|
|
effectiveFrom: kEpochDay,
|
|
kcal: 2200,
|
|
editedAt: '2026-07-13T00:00:00.000Z',
|
|
),
|
|
]);
|
|
|
|
expect(BudgetHistoryService.schedule.entries.single.kcal, 2200);
|
|
});
|
|
|
|
test('a corrupt document degrades to no history', () async {
|
|
await File(
|
|
'${tempDir.path}/budget_history.json',
|
|
).writeAsString('not json{{{');
|
|
|
|
await BudgetHistoryService.initForTesting(FileDocumentStore(tempDir));
|
|
|
|
expect(BudgetHistoryService.schedule.entries, isEmpty);
|
|
});
|
|
|
|
test('an absent document loads as no history', () async {
|
|
await BudgetHistoryService.initForTesting(FileDocumentStore(tempDir));
|
|
expect(BudgetHistoryService.schedule.entries, isEmpty);
|
|
});
|
|
|
|
test('the stored document is plain readable JSON', () async {
|
|
await BudgetHistoryService.instance.recordChange(
|
|
2000,
|
|
when: DateTime(2026, 7, 26),
|
|
);
|
|
|
|
final raw = await File(
|
|
'${tempDir.path}/budget_history.json',
|
|
).readAsString();
|
|
final data = jsonDecode(raw) as Map;
|
|
expect(data['v'], 1);
|
|
expect((data['e'] as Map)['2026-07-26'], isA<Map>());
|
|
});
|
|
}
|