mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-11 15:33:57 +01:00
Replace the bespoke GitHub-Gist sync with the shared crdt-sync / crdt_sync_dart libraries so diet-guard uses the same CRDT transport as the other apps. - Python: delete _sync_github.py (+ its test); rewrite _sync.py, _cli_sync.py, _sync_merge.py against crdt-sync. Add the crdt-sync git dependency (pyproject + pylint deps) and S107 to the test ignore list. - Dart: rewrite app sync_service.dart / sync_merge.dart against crdt_sync_dart (new git dep + crypto); update log_meal and settings screens and their tests. Verification: pytest 347 passed at 100% coverage; flutter analyze clean; flutter test 306 passed. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017RRCdR4D8SaVrN2xraMQxM
314 lines
9.8 KiB
Dart
314 lines
9.8 KiB
Dart
// Mirrors `test_sync.py`'s `TestRunSync` cases (own-id-skip, no-prior-push,
|
|
// non-object payload, corrupt JSON, remote merge, food bank rebuild), plus
|
|
// one Dart-specific case for the phone's `imagePath`-preserve-by-id step
|
|
// (plan decision 10) that has no PC-side equivalent.
|
|
|
|
import 'dart:convert';
|
|
import 'dart:io';
|
|
|
|
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/foodbank_service.dart';
|
|
import 'package:diet_guard_app/services/log_storage_service.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';
|
|
|
|
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 = [];
|
|
|
|
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') {
|
|
puts.add(jsonDecode(req.body) as Map<String, dynamic>);
|
|
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(testDir: tempDir);
|
|
FoodBankService.resetForTesting(testDir: tempDir);
|
|
});
|
|
|
|
tearDown(() async {
|
|
LogStorageService.resetForTesting();
|
|
FoodBankService.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);
|
|
expect(fake.puts, hasLength(1));
|
|
});
|
|
|
|
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': '{}'},
|
|
);
|
|
await runSync(fake.buildClient());
|
|
expect(fake.fileGets, ['diet-guard-sync/devices/pc/food_log.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 imagePath or hmac', () async {
|
|
await LogStorageService.instance.logMeal(
|
|
'oatmeal',
|
|
_manual,
|
|
imagePath: '/local/photo.jpg',
|
|
);
|
|
final fake = _FakeGitHub();
|
|
await runSync(fake.buildClient());
|
|
|
|
final pushed = fake.puts.single;
|
|
final pushedText = utf8.decode(base64.decode(pushed['content'] as String));
|
|
expect(pushedText, isNot(contains('imagePath')));
|
|
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.puts.single;
|
|
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.puts.single['sha'], 'f-phone');
|
|
});
|
|
|
|
test(
|
|
'preserves a local imagePath even when a remote tombstone wins the merge',
|
|
() async {
|
|
await LogStorageService.instance.writeLog({
|
|
'2026-06-22': [
|
|
const FoodEntry(
|
|
id: 'x',
|
|
time: '2026-06-22T08:00:00',
|
|
desc: 'photo meal',
|
|
grams: 100,
|
|
kcal: 200,
|
|
proteinG: 10,
|
|
carbsG: 20,
|
|
fatG: 5,
|
|
source: 'manual',
|
|
imagePath: '/local/photo.jpg',
|
|
),
|
|
],
|
|
});
|
|
final remoteLog = jsonEncode({
|
|
'2026-06-22': [
|
|
{
|
|
'id': 'x',
|
|
'time': '2026-06-22T08:00:00',
|
|
'desc': 'photo meal',
|
|
'kcal': 200.0,
|
|
'protein_g': 10.0,
|
|
'carbs_g': 20.0,
|
|
'fat_g': 5.0,
|
|
'grams': 100.0,
|
|
'source': 'manual',
|
|
'deleted': true,
|
|
},
|
|
],
|
|
});
|
|
final fake = _FakeGitHub(
|
|
deviceDirs: const ['pc'],
|
|
files: {'diet-guard-sync/devices/pc/food_log.json': remoteLog},
|
|
);
|
|
final merged = await runSync(fake.buildClient());
|
|
|
|
final entry = merged.values.expand((e) => e).single;
|
|
expect(entry.deleted, isTrue);
|
|
expect(entry.imagePath, '/local/photo.jpg');
|
|
},
|
|
);
|
|
}
|