mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-11 20:33:54 +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>
322 lines
11 KiB
Dart
322 lines
11 KiB
Dart
import 'dart:convert';
|
|
import 'dart:io';
|
|
|
|
import 'package:diet_guard_app/services/document_store_io.dart';
|
|
import 'package:diet_guard_app/services/app_settings_service.dart';
|
|
import 'package:diet_guard_app/services/budget_history_service.dart';
|
|
import 'package:flutter_test/flutter_test.dart';
|
|
|
|
void main() {
|
|
late Directory tempDir;
|
|
|
|
setUp(() async {
|
|
tempDir = await Directory.systemTemp.createTemp(
|
|
'diet_guard_settings_test_',
|
|
);
|
|
AppSettingsService.resetForTesting();
|
|
BudgetHistoryService.resetForTesting();
|
|
});
|
|
|
|
tearDown(() async {
|
|
AppSettingsService.resetForTesting();
|
|
BudgetHistoryService.resetForTesting();
|
|
await tempDir.delete(recursive: true);
|
|
});
|
|
|
|
group('dailyKcalGoal static getter', () {
|
|
test('returns 2200 when singleton is uninitialised', () {
|
|
// Singleton is null after resetForTesting() — exercises the ?? 2200 branch.
|
|
expect(AppSettingsService.dailyKcalGoal, 2200);
|
|
});
|
|
});
|
|
|
|
group('resetForTesting', () {
|
|
test('with testDir creates a working instance', () {
|
|
AppSettingsService.resetForTesting(store: FileDocumentStore(tempDir));
|
|
BudgetHistoryService.resetForTesting(
|
|
store: FileDocumentStore(tempDir),
|
|
);
|
|
expect(AppSettingsService.instance, isNotNull);
|
|
});
|
|
|
|
test('without testDir nulls the singleton', () {
|
|
AppSettingsService.resetForTesting(store: FileDocumentStore(tempDir));
|
|
BudgetHistoryService.resetForTesting(
|
|
store: FileDocumentStore(tempDir),
|
|
);
|
|
AppSettingsService.resetForTesting();
|
|
BudgetHistoryService.resetForTesting();
|
|
// instance getter throws when null — verify via dailyKcalGoal fallback.
|
|
expect(AppSettingsService.dailyKcalGoal, 2200);
|
|
});
|
|
});
|
|
|
|
group('init early-return', () {
|
|
test('returns existing instance without re-initialising', () async {
|
|
AppSettingsService.resetForTesting(store: FileDocumentStore(tempDir));
|
|
BudgetHistoryService.resetForTesting(
|
|
store: FileDocumentStore(tempDir),
|
|
);
|
|
final first = AppSettingsService.instance;
|
|
// init() sees _instance != null and returns early (no platform channel).
|
|
final second = await AppSettingsService.init();
|
|
expect(identical(first, second), isTrue);
|
|
});
|
|
});
|
|
|
|
group('saveDailyKcalGoal', () {
|
|
test('updates in-memory value and persists to file', () async {
|
|
AppSettingsService.resetForTesting(store: FileDocumentStore(tempDir));
|
|
BudgetHistoryService.resetForTesting(
|
|
store: FileDocumentStore(tempDir),
|
|
);
|
|
await AppSettingsService.instance.saveDailyKcalGoal(1800);
|
|
|
|
expect(AppSettingsService.dailyKcalGoal, 1800);
|
|
|
|
final raw = await File(
|
|
'${tempDir.path}/app_settings.json',
|
|
).readAsString();
|
|
final data = jsonDecode(raw) as Map;
|
|
expect(data['daily_kcal_goal'], 1800);
|
|
});
|
|
|
|
test('grandfathers the previous value to every past day', () async {
|
|
// The load-bearing ordering test, on the real upgrade path: a device
|
|
// that already had a goal (with an updatedAt, i.e. genuinely set)
|
|
// gains a history the first time it loads, and a later edit must not
|
|
// drag past days along with it. Asserts a PAST day -- a today-only
|
|
// assertion passes even when the seed happens after the upsert.
|
|
await File('${tempDir.path}/app_settings.json').writeAsString(
|
|
jsonEncode({
|
|
'daily_kcal_goal': 2200,
|
|
'daily_kcal_goal_updated_at': '2026-07-13T21:15:09.000',
|
|
}),
|
|
);
|
|
BudgetHistoryService.resetForTesting(store: FileDocumentStore(tempDir));
|
|
await AppSettingsService.initForTesting(FileDocumentStore(tempDir));
|
|
|
|
await AppSettingsService.instance.saveDailyKcalGoal(2000);
|
|
|
|
expect(BudgetHistoryService.schedule.forDay('2020-01-01'), 2200);
|
|
expect(BudgetHistoryService.schedule.current, 2000);
|
|
expect(AppSettingsService.dailyKcalGoal, 2000);
|
|
});
|
|
|
|
test('loading an already-set goal seeds the history on its own', () async {
|
|
// Seeding must not depend on the user making an edit: a device that
|
|
// merely *synced* a goal still has to classify its history against
|
|
// that goal, matching _budget.current_schedule's seed-on-read.
|
|
await File('${tempDir.path}/app_settings.json').writeAsString(
|
|
jsonEncode({
|
|
'daily_kcal_goal': 1800,
|
|
'daily_kcal_goal_updated_at': '2026-07-13T21:15:09.000',
|
|
}),
|
|
);
|
|
BudgetHistoryService.resetForTesting(store: FileDocumentStore(tempDir));
|
|
|
|
await AppSettingsService.initForTesting(FileDocumentStore(tempDir));
|
|
|
|
expect(BudgetHistoryService.schedule.forDay('2020-01-01'), 1800);
|
|
});
|
|
|
|
test('a never-set goal seeds no phantom history', () async {
|
|
AppSettingsService.resetForTesting(store: FileDocumentStore(tempDir));
|
|
BudgetHistoryService.resetForTesting(store: FileDocumentStore(tempDir));
|
|
|
|
await AppSettingsService.instance.saveDailyKcalGoal(2000);
|
|
|
|
// Nothing to grandfather, so the only entry is today's; past days fall
|
|
// back to the current goal, exactly as _budget.current_schedule does.
|
|
expect(BudgetHistoryService.schedule.entries, hasLength(1));
|
|
expect(BudgetHistoryService.schedule.forDay('2020-01-01'), 2000);
|
|
});
|
|
|
|
test('a merge write-back records no history change', () async {
|
|
AppSettingsService.resetForTesting(store: FileDocumentStore(tempDir));
|
|
BudgetHistoryService.resetForTesting(store: FileDocumentStore(tempDir));
|
|
|
|
await AppSettingsService.instance.applySyncedBudget(
|
|
1700,
|
|
updatedAt: DateTime(2026, 7, 26),
|
|
);
|
|
|
|
// The sync layer applies merged history entries itself; a write-back
|
|
// must not manufacture a local edit on top of them.
|
|
expect(BudgetHistoryService.schedule.entries, isEmpty);
|
|
});
|
|
|
|
test('stamps a fresh dailyKcalGoalUpdatedAt', () async {
|
|
AppSettingsService.resetForTesting(store: FileDocumentStore(tempDir));
|
|
BudgetHistoryService.resetForTesting(
|
|
store: FileDocumentStore(tempDir),
|
|
);
|
|
final before = DateTime.now();
|
|
await AppSettingsService.instance.saveDailyKcalGoal(1800);
|
|
final after = DateTime.now();
|
|
|
|
final updatedAt = AppSettingsService.dailyKcalGoalUpdatedAt;
|
|
expect(updatedAt, isNotNull);
|
|
expect(updatedAt!.isBefore(before), isFalse);
|
|
expect(updatedAt.isAfter(after), isFalse);
|
|
});
|
|
});
|
|
|
|
group('applySyncedBudget', () {
|
|
test(
|
|
'persists the given value and updatedAt verbatim, not "now"',
|
|
() async {
|
|
AppSettingsService.resetForTesting(store: FileDocumentStore(tempDir));
|
|
BudgetHistoryService.resetForTesting(
|
|
store: FileDocumentStore(tempDir),
|
|
);
|
|
final winningEdit = DateTime.utc(2020);
|
|
|
|
await AppSettingsService.instance.applySyncedBudget(
|
|
1700,
|
|
updatedAt: winningEdit,
|
|
);
|
|
|
|
expect(AppSettingsService.dailyKcalGoal, 1700);
|
|
expect(AppSettingsService.dailyKcalGoalUpdatedAt, winningEdit);
|
|
|
|
final raw = await File(
|
|
'${tempDir.path}/app_settings.json',
|
|
).readAsString();
|
|
final data = jsonDecode(raw) as Map;
|
|
expect(data['daily_kcal_goal'], 1700);
|
|
expect(
|
|
data['daily_kcal_goal_updated_at'],
|
|
winningEdit.toIso8601String(),
|
|
);
|
|
},
|
|
);
|
|
|
|
test('a null updatedAt is accepted and persisted as null', () async {
|
|
AppSettingsService.resetForTesting(store: FileDocumentStore(tempDir));
|
|
BudgetHistoryService.resetForTesting(
|
|
store: FileDocumentStore(tempDir),
|
|
);
|
|
await AppSettingsService.instance.applySyncedBudget(1700);
|
|
expect(AppSettingsService.dailyKcalGoalUpdatedAt, isNull);
|
|
});
|
|
});
|
|
|
|
group('initForTesting (_load paths)', () {
|
|
test('loads daily_kcal_goal from an existing file', () async {
|
|
await File(
|
|
'${tempDir.path}/app_settings.json',
|
|
).writeAsString(jsonEncode({'daily_kcal_goal': 1600}));
|
|
|
|
await AppSettingsService.initForTesting(FileDocumentStore(tempDir));
|
|
BudgetHistoryService.resetForTesting(
|
|
store: FileDocumentStore(tempDir),
|
|
);
|
|
|
|
expect(AppSettingsService.dailyKcalGoal, 1600);
|
|
});
|
|
|
|
test('keeps default 2200 when file does not exist', () async {
|
|
await AppSettingsService.initForTesting(FileDocumentStore(tempDir));
|
|
BudgetHistoryService.resetForTesting(
|
|
store: FileDocumentStore(tempDir),
|
|
);
|
|
|
|
expect(AppSettingsService.dailyKcalGoal, 2200);
|
|
});
|
|
|
|
test('keeps default 2200 on unparsable JSON', () async {
|
|
await File(
|
|
'${tempDir.path}/app_settings.json',
|
|
).writeAsString('not json at all');
|
|
|
|
await AppSettingsService.initForTesting(FileDocumentStore(tempDir));
|
|
BudgetHistoryService.resetForTesting(
|
|
store: FileDocumentStore(tempDir),
|
|
);
|
|
|
|
expect(AppSettingsService.dailyKcalGoal, 2200);
|
|
});
|
|
|
|
test('keeps default 2200 when JSON root is not a Map', () async {
|
|
await File(
|
|
'${tempDir.path}/app_settings.json',
|
|
).writeAsString(jsonEncode([1, 2, 3]));
|
|
|
|
await AppSettingsService.initForTesting(FileDocumentStore(tempDir));
|
|
BudgetHistoryService.resetForTesting(
|
|
store: FileDocumentStore(tempDir),
|
|
);
|
|
|
|
expect(AppSettingsService.dailyKcalGoal, 2200);
|
|
});
|
|
|
|
test('keeps default 2200 when daily_kcal_goal is not an int', () async {
|
|
await File(
|
|
'${tempDir.path}/app_settings.json',
|
|
).writeAsString(jsonEncode({'daily_kcal_goal': 'two thousand'}));
|
|
|
|
await AppSettingsService.initForTesting(FileDocumentStore(tempDir));
|
|
BudgetHistoryService.resetForTesting(
|
|
store: FileDocumentStore(tempDir),
|
|
);
|
|
|
|
expect(AppSettingsService.dailyKcalGoal, 2200);
|
|
});
|
|
|
|
test('loads daily_kcal_goal_updated_at from an existing file', () async {
|
|
await File('${tempDir.path}/app_settings.json').writeAsString(
|
|
jsonEncode({
|
|
'daily_kcal_goal': 1600,
|
|
'daily_kcal_goal_updated_at': '2026-01-01T00:00:00.000Z',
|
|
}),
|
|
);
|
|
|
|
await AppSettingsService.initForTesting(FileDocumentStore(tempDir));
|
|
BudgetHistoryService.resetForTesting(
|
|
store: FileDocumentStore(tempDir),
|
|
);
|
|
|
|
expect(
|
|
AppSettingsService.dailyKcalGoalUpdatedAt,
|
|
DateTime.parse('2026-01-01T00:00:00.000Z'),
|
|
);
|
|
});
|
|
|
|
test(
|
|
'dailyKcalGoalUpdatedAt stays null when file has no such key',
|
|
() async {
|
|
await File(
|
|
'${tempDir.path}/app_settings.json',
|
|
).writeAsString(jsonEncode({'daily_kcal_goal': 1600}));
|
|
|
|
await AppSettingsService.initForTesting(FileDocumentStore(tempDir));
|
|
BudgetHistoryService.resetForTesting(
|
|
store: FileDocumentStore(tempDir),
|
|
);
|
|
|
|
expect(AppSettingsService.dailyKcalGoalUpdatedAt, isNull);
|
|
},
|
|
);
|
|
|
|
test(
|
|
'dailyKcalGoalUpdatedAt stays null when the field is not a string',
|
|
() async {
|
|
await File('${tempDir.path}/app_settings.json').writeAsString(
|
|
jsonEncode({
|
|
'daily_kcal_goal': 1600,
|
|
'daily_kcal_goal_updated_at': 12345,
|
|
}),
|
|
);
|
|
|
|
await AppSettingsService.initForTesting(FileDocumentStore(tempDir));
|
|
BudgetHistoryService.resetForTesting(
|
|
store: FileDocumentStore(tempDir),
|
|
);
|
|
|
|
expect(AppSettingsService.dailyKcalGoalUpdatedAt, isNull);
|
|
},
|
|
);
|
|
});
|
|
}
|