mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-11 12:07:42 +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>
393 lines
13 KiB
Dart
393 lines
13 KiB
Dart
// Mirrors `test_sync.py`'s `TestRunSync` and `TestSyncBudget` cases
|
|
// (own-id-skip, no-prior-push, non-object payload, corrupt JSON, remote
|
|
// merge, food bank rebuild, budget last-writer-wins), plus one Dart-specific
|
|
// that has no PC-side equivalent.
|
|
|
|
import 'dart:convert';
|
|
import 'dart:io';
|
|
|
|
import 'package:diet_guard_app/services/document_store_io.dart';
|
|
import 'package:crdt_sync/crdt_sync.dart';
|
|
import 'package:diet_guard_app/models/food_entry.dart';
|
|
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/foodbank_service.dart';
|
|
import 'package:diet_guard_app/services/log_storage_service.dart';
|
|
import 'package:diet_guard_app/services/sync_merge.dart';
|
|
import 'package:diet_guard_app/services/sync_service.dart';
|
|
import 'package:flutter_test/flutter_test.dart';
|
|
import 'package:http/http.dart' as http;
|
|
import 'package:http/testing.dart';
|
|
|
|
/// Builds the wire text a remote device would push for a given budget edit.
|
|
String _remoteBudgetJson({required int kcal, required String t}) {
|
|
final record = <String, dynamic>{'v': 2, 'b': kcal, 't': t};
|
|
final log = budgetToLog(record);
|
|
return jsonEncode({
|
|
for (final entry in log.entries) entry.key: entry.value.toJson(),
|
|
});
|
|
}
|
|
|
|
const _manual = Nutrition(
|
|
kcal: 200,
|
|
proteinG: 10,
|
|
carbsG: 20,
|
|
fatG: 5,
|
|
grams: 100,
|
|
source: 'manual',
|
|
);
|
|
|
|
/// A tiny in-memory stand-in for the GitHub Contents API, scoped to exactly
|
|
/// the calls [runSync] makes via crdt_sync's [GitHubClient]: list `devices`,
|
|
/// get a device's file text (which crdt_sync also uses internally to
|
|
/// resolve this device's own existing sha before a push), and put this
|
|
/// device's file text.
|
|
class _FakeGitHub {
|
|
_FakeGitHub({this.deviceDirs = const [], Map<String, String>? files})
|
|
: files = {...?files};
|
|
|
|
final List<String> deviceDirs;
|
|
final Map<String, String> files;
|
|
|
|
/// Every `diet-guard-sync/devices/<id>/food_log.json` path this fake
|
|
/// actually served a file-content GET for.
|
|
final List<String> fileGets = [];
|
|
|
|
/// Every PUT this fake received, decoded.
|
|
final List<Map<String, dynamic>> puts = [];
|
|
|
|
/// Same PUTs, keyed by the repo-relative path they targeted -- lets a
|
|
/// test pick out the food-log push from the budget push, now that a
|
|
/// sync tick does both.
|
|
final Map<String, Map<String, dynamic>> putsByPath = {};
|
|
|
|
GitHubClient buildClient() => GitHubClient(
|
|
owner: 'o',
|
|
repo: 'r',
|
|
token: 't',
|
|
httpClient: MockClient(_handle),
|
|
);
|
|
|
|
Future<http.Response> _handle(http.Request req) async {
|
|
if (req.url.path == '/repos/o/r') {
|
|
// Repo-existence probe: crdt_sync's GitHubClient calls this to
|
|
// disambiguate "path unused yet" (still 404, but a real repo) from
|
|
// "repo missing/inaccessible" whenever a content-path GET 404s.
|
|
return http.Response('{}', 200);
|
|
}
|
|
final path = req.url.path.replaceFirst('/repos/o/r/contents/', '');
|
|
if (req.method == 'PUT') {
|
|
final body = jsonDecode(req.body) as Map<String, dynamic>;
|
|
puts.add(body);
|
|
putsByPath[path] = body;
|
|
return http.Response('{}', 200);
|
|
}
|
|
if (path == 'diet-guard-sync/devices') {
|
|
return http.Response(
|
|
jsonEncode([
|
|
for (final d in deviceDirs)
|
|
{
|
|
'type': 'dir',
|
|
'name': d,
|
|
'path': 'diet-guard-sync/devices/$d',
|
|
'sha': 'd-$d',
|
|
},
|
|
]),
|
|
200,
|
|
);
|
|
}
|
|
if (!files.containsKey(path)) return http.Response('', 404);
|
|
fileGets.add(path);
|
|
final content = base64.encode(utf8.encode(files[path]!));
|
|
// Real GitHub always returns `sha` alongside `content` for a
|
|
// get-file-contents call -- crdt_sync's GitHubClient reads it back to
|
|
// resolve this device's own existing sha before a push.
|
|
final segments = path.split('/');
|
|
final sha =
|
|
segments.length == 4 &&
|
|
segments[0] == 'diet-guard-sync' &&
|
|
segments[1] == 'devices'
|
|
? 'f-${segments[2]}'
|
|
: null;
|
|
return http.Response(
|
|
jsonEncode({'content': content, if (sha != null) 'sha': sha}),
|
|
200,
|
|
);
|
|
}
|
|
}
|
|
|
|
void main() {
|
|
late Directory tempDir;
|
|
|
|
setUp(() async {
|
|
tempDir = await Directory.systemTemp.createTemp('diet_guard_sync_test_');
|
|
LogStorageService.resetForTesting(store: FileDocumentStore(tempDir));
|
|
FoodBankService.resetForTesting(store: FileDocumentStore(tempDir));
|
|
await AppSettingsService.initForTesting(FileDocumentStore(tempDir));
|
|
BudgetHistoryService.resetForTesting(
|
|
store: FileDocumentStore(tempDir),
|
|
);
|
|
});
|
|
|
|
tearDown(() async {
|
|
LogStorageService.resetForTesting();
|
|
FoodBankService.resetForTesting();
|
|
AppSettingsService.resetForTesting();
|
|
BudgetHistoryService.resetForTesting();
|
|
await tempDir.delete(recursive: true);
|
|
});
|
|
|
|
test('pushes the local log when no other devices have synced', () async {
|
|
await LogStorageService.instance.logMeal('oatmeal', _manual);
|
|
final fake = _FakeGitHub();
|
|
final merged = await runSync(fake.buildClient());
|
|
|
|
expect(merged.values.expand((e) => e).length, 1);
|
|
// syncLog always pushes, even an empty merged result: food_log.json,
|
|
// budget.json, food_bank.json, food_bank_manual.json.
|
|
expect(fake.puts, hasLength(4));
|
|
});
|
|
|
|
test("skips its own device id ('phone') when listing", () async {
|
|
final fake = _FakeGitHub(
|
|
deviceDirs: const ['pc', 'phone'],
|
|
files: const {
|
|
'diet-guard-sync/devices/pc/food_log.json': '{}',
|
|
'diet-guard-sync/devices/pc/budget.json': '{}',
|
|
},
|
|
);
|
|
await runSync(fake.buildClient());
|
|
// Both the food-log and budget pulls skip "phone" (this device) and
|
|
// only ever read "pc"'s files.
|
|
expect(fake.fileGets, [
|
|
'diet-guard-sync/devices/pc/food_log.json',
|
|
'diet-guard-sync/devices/pc/budget.json',
|
|
]);
|
|
});
|
|
|
|
test('skips a device with no pushed file yet', () async {
|
|
final fake = _FakeGitHub(deviceDirs: const ['pc']);
|
|
final merged = await runSync(fake.buildClient());
|
|
expect(merged, isEmpty);
|
|
});
|
|
|
|
test('ignores a device whose pushed file is not a JSON object', () async {
|
|
final fake = _FakeGitHub(
|
|
deviceDirs: const ['pc'],
|
|
files: const {'diet-guard-sync/devices/pc/food_log.json': '[]'},
|
|
);
|
|
final merged = await runSync(fake.buildClient());
|
|
expect(merged, isEmpty);
|
|
});
|
|
|
|
test('skips a device whose pushed file is corrupt json', () async {
|
|
final fake = _FakeGitHub(
|
|
deviceDirs: const ['pc'],
|
|
files: const {
|
|
'diet-guard-sync/devices/pc/food_log.json': '{not valid json',
|
|
},
|
|
);
|
|
final merged = await runSync(fake.buildClient());
|
|
expect(merged, isEmpty);
|
|
});
|
|
|
|
test(
|
|
"merges in a remote device's entries (old pre-migration format)",
|
|
() async {
|
|
final remoteLog = jsonEncode({
|
|
'2026-06-22': [
|
|
{
|
|
'id': 'pc-1',
|
|
'time': '2026-06-22T09:00:00+02:00',
|
|
'desc': 'pc meal',
|
|
'kcal': 400.0,
|
|
'protein_g': 20.0,
|
|
'carbs_g': 40.0,
|
|
'fat_g': 10.0,
|
|
'grams': 300.0,
|
|
'source': 'manual',
|
|
},
|
|
],
|
|
});
|
|
final fake = _FakeGitHub(
|
|
deviceDirs: const ['pc'],
|
|
files: {'diet-guard-sync/devices/pc/food_log.json': remoteLog},
|
|
);
|
|
final merged = await runSync(fake.buildClient());
|
|
final descs = merged.values.expand((e) => e).map((e) => e.desc).toSet();
|
|
expect(descs, contains('pc meal'));
|
|
},
|
|
);
|
|
|
|
test(
|
|
"merges in a remote device's entries (new Record-based format)",
|
|
() async {
|
|
const remoteEntry = FoodEntry(
|
|
id: 'pc-1',
|
|
time: '2026-06-22T09:00:00+02:00',
|
|
desc: 'pc meal',
|
|
kcal: 400,
|
|
proteinG: 20,
|
|
carbsG: 40,
|
|
fatG: 10,
|
|
grams: 300,
|
|
source: 'manual',
|
|
);
|
|
final remoteLog = jsonEncode({
|
|
'pc-1': Record(
|
|
id: 'pc-1',
|
|
fields: {
|
|
'body': (
|
|
remoteEntry.toSyncJson(),
|
|
Hlc.newTick('pc', wallTimeMsOverride: 0),
|
|
),
|
|
},
|
|
).toJson(),
|
|
});
|
|
final fake = _FakeGitHub(
|
|
deviceDirs: const ['pc'],
|
|
files: {'diet-guard-sync/devices/pc/food_log.json': remoteLog},
|
|
);
|
|
final merged = await runSync(fake.buildClient());
|
|
final descs = merged.values.expand((e) => e).map((e) => e.desc).toSet();
|
|
expect(descs, contains('pc meal'));
|
|
},
|
|
);
|
|
|
|
test('rebuilds the food bank after merge', () async {
|
|
await LogStorageService.instance.logMeal('oatmeal', _manual);
|
|
final fake = _FakeGitHub();
|
|
await runSync(fake.buildClient());
|
|
|
|
final bank = await FoodBankService.instance.readBank();
|
|
expect(bank.containsKey('oatmeal'), isTrue);
|
|
});
|
|
|
|
test('pushes a payload without hmac', () async {
|
|
await LogStorageService.instance.logMeal(
|
|
'oatmeal',
|
|
_manual,
|
|
);
|
|
final fake = _FakeGitHub();
|
|
await runSync(fake.buildClient());
|
|
|
|
final pushed =
|
|
fake.putsByPath['diet-guard-sync/devices/phone/food_log.json']!;
|
|
final pushedText = utf8.decode(base64.decode(pushed['content'] as String));
|
|
expect(pushedText, isNot(contains('hmac')));
|
|
});
|
|
|
|
test('pushes in the new Record-based wire format', () async {
|
|
await LogStorageService.instance.logMeal('oatmeal', _manual);
|
|
final fake = _FakeGitHub();
|
|
await runSync(fake.buildClient());
|
|
|
|
final pushed =
|
|
fake.putsByPath['diet-guard-sync/devices/phone/food_log.json']!;
|
|
final pushedText = utf8.decode(base64.decode(pushed['content'] as String));
|
|
final decoded = jsonDecode(pushedText) as Map<String, dynamic>;
|
|
final record = decoded.values.single as Map<String, dynamic>;
|
|
expect(record, containsPair('id', isA<String>()));
|
|
expect(record, contains('fields'));
|
|
});
|
|
|
|
test("reuses this device's existing sha when it has pushed before", () async {
|
|
final fake = _FakeGitHub(
|
|
files: const {'diet-guard-sync/devices/phone/food_log.json': '{}'},
|
|
);
|
|
await runSync(fake.buildClient());
|
|
expect(
|
|
fake.putsByPath['diet-guard-sync/devices/phone/food_log.json']!['sha'],
|
|
'f-phone',
|
|
);
|
|
});
|
|
|
|
group('budget sync', () {
|
|
test(
|
|
'pushes the local budget when no other devices have synced',
|
|
() async {
|
|
await AppSettingsService.instance.saveDailyKcalGoal(2000);
|
|
final fake = _FakeGitHub();
|
|
await runSync(fake.buildClient());
|
|
|
|
expect(
|
|
fake.putsByPath.containsKey(
|
|
'diet-guard-sync/devices/phone/budget.json',
|
|
),
|
|
isTrue,
|
|
);
|
|
},
|
|
);
|
|
|
|
test('remote-only budget is adopted locally', () async {
|
|
final remoteJson = _remoteBudgetJson(
|
|
kcal: 1800,
|
|
t: '2026-01-01T09:00:00',
|
|
);
|
|
final fake = _FakeGitHub(
|
|
deviceDirs: const ['pc'],
|
|
files: {'diet-guard-sync/devices/pc/budget.json': remoteJson},
|
|
);
|
|
await runSync(fake.buildClient());
|
|
expect(AppSettingsService.dailyKcalGoal, 1800);
|
|
});
|
|
|
|
test('a local edit later than a remote edit wins', () async {
|
|
await AppSettingsService.instance.saveDailyKcalGoal(1500); // now
|
|
final remoteJson = _remoteBudgetJson(
|
|
kcal: 1800,
|
|
t: '2020-01-01T09:00:00',
|
|
);
|
|
final fake = _FakeGitHub(
|
|
deviceDirs: const ['pc'],
|
|
files: {'diet-guard-sync/devices/pc/budget.json': remoteJson},
|
|
);
|
|
await runSync(fake.buildClient());
|
|
expect(AppSettingsService.dailyKcalGoal, 1500);
|
|
});
|
|
|
|
test('a remote edit later than a local edit wins', () async {
|
|
await AppSettingsService.instance.saveDailyKcalGoal(1500); // now
|
|
final remoteJson = _remoteBudgetJson(
|
|
kcal: 1800,
|
|
t: '2999-01-01T09:00:00',
|
|
);
|
|
final fake = _FakeGitHub(
|
|
deviceDirs: const ['pc'],
|
|
files: {'diet-guard-sync/devices/pc/budget.json': remoteJson},
|
|
);
|
|
await runSync(fake.buildClient());
|
|
expect(AppSettingsService.dailyKcalGoal, 1800);
|
|
});
|
|
|
|
test('a malformed remote budget is skipped, not a crash', () async {
|
|
await AppSettingsService.instance.saveDailyKcalGoal(2000);
|
|
final fake = _FakeGitHub(
|
|
deviceDirs: const ['pc'],
|
|
files: const {
|
|
'diet-guard-sync/devices/pc/budget.json': '{not valid json',
|
|
},
|
|
);
|
|
await runSync(fake.buildClient());
|
|
expect(AppSettingsService.dailyKcalGoal, 2000);
|
|
});
|
|
|
|
test(
|
|
'a fresh install with no budget ever set contributes nothing',
|
|
() async {
|
|
final fake = _FakeGitHub();
|
|
await runSync(fake.buildClient());
|
|
|
|
final pushed =
|
|
fake.putsByPath['diet-guard-sync/devices/phone/budget.json']!;
|
|
final pushedText = utf8.decode(
|
|
base64.decode(pushed['content'] as String),
|
|
);
|
|
expect(jsonDecode(pushedText), isEmpty);
|
|
expect(AppSettingsService.dailyKcalGoal, 2200);
|
|
},
|
|
);
|
|
});
|
|
}
|