mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-22 00:22:18 +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>
212 lines
7.5 KiB
Dart
212 lines
7.5 KiB
Dart
// `checkAndNotify` is the scheduler-independent half of the periodic
|
|
// check; `backgroundCheckCallbackDispatcher` itself is integration-only
|
|
// (real WorkManager isolate, manual on-device smoke test) per the project
|
|
// plan, and is excluded from coverage.
|
|
|
|
import 'dart:convert';
|
|
import 'dart:io';
|
|
|
|
import 'package:diet_guard_app/models/nutrition.dart';
|
|
import 'package:diet_guard_app/services/app_settings_service.dart';
|
|
import 'package:diet_guard_app/services/budget_history_service.dart';
|
|
import 'package:diet_guard_app/services/document_store_io.dart';
|
|
import 'package:diet_guard_app/services/due_slot_check.dart';
|
|
import 'package:diet_guard_app/services/foodbank_service.dart';
|
|
import 'package:diet_guard_app/services/log_storage_service.dart';
|
|
import 'package:diet_guard_app/services/notification_backend_io.dart';
|
|
import 'package:diet_guard_app/services/notification_service.dart';
|
|
import 'package:flutter/services.dart';
|
|
import 'package:flutter_local_notifications/flutter_local_notifications.dart';
|
|
import 'package:flutter_test/flutter_test.dart';
|
|
import 'package:http/http.dart' as http;
|
|
import 'package:http/testing.dart';
|
|
import 'package:shared_preferences/shared_preferences.dart';
|
|
|
|
import '../fake_notifications.dart';
|
|
import '../fake_secure_storage.dart';
|
|
|
|
const _manual = Nutrition(
|
|
kcal: 200,
|
|
proteinG: 10,
|
|
carbsG: 20,
|
|
fatG: 5,
|
|
grams: 100,
|
|
source: 'manual',
|
|
);
|
|
|
|
void main() {
|
|
TestWidgetsFlutterBinding.ensureInitialized();
|
|
late Directory tempDir;
|
|
late List<MethodCall> notificationLog;
|
|
|
|
setUp(() async {
|
|
tempDir = await Directory.systemTemp.createTemp('diet_guard_bg_check_');
|
|
LogStorageService.resetForTesting(store: FileDocumentStore(tempDir));
|
|
// The due-slot pull reuses backgroundSyncPush, which re-inits these two;
|
|
// pre-seeding the singletons keeps that off the real path_provider
|
|
// channel, exactly as background_sync_service_test.dart does.
|
|
FoodBankService.resetForTesting(store: FileDocumentStore(tempDir));
|
|
AppSettingsService.resetForTesting(store: FileDocumentStore(tempDir));
|
|
BudgetHistoryService.resetForTesting(
|
|
store: FileDocumentStore(tempDir),
|
|
);
|
|
SharedPreferences.setMockInitialValues({});
|
|
installFakeSecureStorage();
|
|
notificationLog = installFakeAndroidNotifications();
|
|
NotificationService.resetForTesting(
|
|
backend: LocalNotificationsBackend(FlutterLocalNotificationsPlugin()),
|
|
);
|
|
});
|
|
|
|
tearDown(() async {
|
|
LogStorageService.resetForTesting();
|
|
FoodBankService.resetForTesting();
|
|
AppSettingsService.resetForTesting();
|
|
BudgetHistoryService.resetForTesting();
|
|
NotificationService.resetForTesting();
|
|
await tempDir.delete(recursive: true);
|
|
});
|
|
|
|
test(
|
|
'shows due-and-unlogged slots, cancels logged and upcoming ones',
|
|
() async {
|
|
await LogStorageService.instance.logMeal('lunch', _manual, slot: 12);
|
|
|
|
await checkAndNotify(now: DateTime(2026, 1, 1, 16));
|
|
|
|
final shown = notificationLog
|
|
.where((c) => c.method == 'show')
|
|
.map((c) => (c.arguments as Map)['id'])
|
|
.toSet();
|
|
final cancelled = notificationLog
|
|
.where((c) => c.method == 'cancel')
|
|
.map((c) => (c.arguments as Map)['id'])
|
|
.toSet();
|
|
expect(shown, {8, 16});
|
|
expect(cancelled, {12, 20});
|
|
},
|
|
);
|
|
|
|
test('cancels everything when every due slot is logged', () async {
|
|
await LogStorageService.instance.logMeal('breakfast', _manual, slot: 8);
|
|
|
|
await checkAndNotify(now: DateTime(2026, 1, 1, 8));
|
|
|
|
expect(notificationLog.where((c) => c.method == 'show'), isEmpty);
|
|
expect(notificationLog.where((c) => c.method == 'cancel'), hasLength(4));
|
|
});
|
|
|
|
test('uses the real clock when now is omitted', () async {
|
|
// Just exercises the `now ?? DateTime.now()` branch without asserting
|
|
// on specific slots (which depend on the actual time the test runs).
|
|
await checkAndNotify();
|
|
expect(
|
|
notificationLog.where(
|
|
(c) => c.method == 'show' || c.method == 'cancel',
|
|
),
|
|
isNotEmpty,
|
|
);
|
|
});
|
|
|
|
test('does not pull when nothing is due', () async {
|
|
await LogStorageService.instance.logMeal('breakfast', _manual, slot: 8);
|
|
SharedPreferences.setMockInitialValues({
|
|
'sync.owner': 'o',
|
|
'sync.repo': 'r',
|
|
});
|
|
installFakeSecureStorage(initial: {'sync.token': 't'});
|
|
var requests = 0;
|
|
final mock = MockClient((req) async {
|
|
requests++;
|
|
return http.Response('', 404);
|
|
});
|
|
|
|
await checkAndNotify(now: DateTime(2026, 1, 1, 8), httpClient: mock);
|
|
|
|
// Every due slot was already satisfied locally, so the network is never
|
|
// touched -- the check stays cheap on the overwhelmingly common tick.
|
|
expect(requests, 0);
|
|
});
|
|
|
|
test('pullWhenDue false skips the network even with a slot due', () async {
|
|
SharedPreferences.setMockInitialValues({
|
|
'sync.owner': 'o',
|
|
'sync.repo': 'r',
|
|
});
|
|
installFakeSecureStorage(initial: {'sync.token': 't'});
|
|
var requests = 0;
|
|
final mock = MockClient((req) async {
|
|
requests++;
|
|
return http.Response('', 404);
|
|
});
|
|
|
|
await checkAndNotify(
|
|
now: DateTime(2026, 1, 1, 16),
|
|
httpClient: mock,
|
|
pullWhenDue: false,
|
|
);
|
|
|
|
expect(requests, 0);
|
|
// Still reconciles notifications from the local log alone.
|
|
expect(
|
|
notificationLog.where((c) => c.method == 'show'),
|
|
isNotEmpty,
|
|
);
|
|
});
|
|
|
|
test('a meal pulled from another device cancels its reminder', () async {
|
|
SharedPreferences.setMockInitialValues({
|
|
'sync.owner': 'o',
|
|
'sync.repo': 'r',
|
|
});
|
|
installFakeSecureStorage(initial: {'sync.token': 't'});
|
|
// Must be *today* in the real clock's terms: `now` only steers which
|
|
// slots are due, while "which day's entries count" comes from the
|
|
// system date inside loggedSlotsToday.
|
|
final today = DateTime.now();
|
|
final day =
|
|
'${today.year.toString().padLeft(4, '0')}-'
|
|
'${today.month.toString().padLeft(2, '0')}-'
|
|
'${today.day.toString().padLeft(2, '0')}';
|
|
// The PC pushed a 12:00 meal this device has never seen locally.
|
|
final remote =
|
|
'{"pc-entry":{"id":"pc-entry","fields":{"body":[{"time":'
|
|
'"${day}T12:30:00+01:00","desc":"pc lunch","kcal":500,'
|
|
'"protein_g":30,"carbs_g":50,"fat_g":15,"grams":300,'
|
|
'"source":"manual","slot":12,"day":"$day"},'
|
|
'"${day}T11:30:00.000Z-0000-pc"]},"deleted":false,'
|
|
'"deleted_hlc":null}}';
|
|
final mock = MockClient((req) async {
|
|
if (req.method == 'PUT') return http.Response('{}', 200);
|
|
if (req.method == 'GET' && req.url.pathSegments.length == 3) {
|
|
return http.Response('{}', 200);
|
|
}
|
|
if (req.url.path.endsWith('/devices')) {
|
|
return http.Response('[{"name":"pc","type":"dir"}]', 200);
|
|
}
|
|
if (req.url.path.endsWith('/devices/pc/food_log.json')) {
|
|
// The Contents API returns base64 in a `content` field, not raw JSON.
|
|
return http.Response(
|
|
jsonEncode({'content': base64.encode(utf8.encode(remote))}),
|
|
200,
|
|
);
|
|
}
|
|
return http.Response('', 404);
|
|
});
|
|
|
|
await checkAndNotify(
|
|
now: DateTime(today.year, today.month, today.day, 12),
|
|
httpClient: mock,
|
|
);
|
|
|
|
// This is the false alarm the fix exists to kill: 12:00 was unlogged
|
|
// locally, so the pre-fix code fired a reminder for a meal that was
|
|
// already logged on the PC.
|
|
final shown = notificationLog
|
|
.where((c) => c.method == 'show')
|
|
.map((c) => (c.arguments as Map)['id'])
|
|
.toSet();
|
|
expect(shown, isNot(contains(12)));
|
|
});
|
|
}
|