feat(app): server-side duplicate pre-check at enqueue moment
Task 2 of docs/plans/2026-09-28-上传查重前置到入队前-实施计划.md:
surface server-side duplicate history at the "click upload" moment,
merged with the local check into the EXISTING dialog.
- ApiClient.checkUploadDuplicates: POST /v1/uploads/duplicates/check
(commit 805f77b endpoint); 500/chunk sequential requests; chunk-local
index translated to global; empty list short-circuits (no request);
errors normalized to AppException via _send.
- enqueue.checkDuplicatesUnified: local TaskStore history ∪ server
history; server hits map back to filename via global index into the
stat'd picks; merged, de-duplicated (filename+bytes) list; server
failure (network/permission/any) silently degrades to local-only —
init 409 remains the backstop.
- capture_page + album_detail_page _pickFromGallery now call the
unified entry; dialog/skip/force logic untouched.
Tests: api_client chunking (1200 → 500/500/200) + index translation +
merge + 404 normalization + empty no-request; page-level three states
(hit/no-hit/network failure) incl. fresh-install server-only-hit dialog
on both pages; pre-existing Task 8 dialog tests keep passing via the
degrade path.
Co-Authored-By: Claude Code <noreply@anthropic.com>
This commit is contained in:
浅念
@@ -557,4 +557,136 @@ void main() {
|
||||
expect(store.session?.token, 'tok-live-1', reason: '旧密码错误不清会话');
|
||||
expect(unauthorizedCalls, 0, reason: 'password-change 401 不驱逐');
|
||||
});
|
||||
|
||||
group('checkUploadDuplicates：上传查重预检（Task 2，分块）', () {
|
||||
test('≤500 项单请求：albumId + items 透传，命中含共享 bytes 逐条返回',
|
||||
() async {
|
||||
seedSession();
|
||||
final adapter = FakeAdapter(
|
||||
(o) => (
|
||||
200,
|
||||
{
|
||||
'duplicates': [
|
||||
{'index': 1, 'bytes': 2048, 'uploadedAt': '2026-09-25T08:00:00Z'},
|
||||
{'index': 0, 'bytes': 1024, 'uploadedAt': '2026-09-24T08:00:00Z'},
|
||||
// 两个请求条目共享同一命中 bytes：契约保证各返回一条。
|
||||
{'index': 2, 'bytes': 1024, 'uploadedAt': '2026-09-24T08:00:00Z'},
|
||||
],
|
||||
},
|
||||
),
|
||||
);
|
||||
|
||||
final hits = await wired(adapter).checkUploadDuplicates('alb-1', const [
|
||||
(filename: 'a.jpg', bytes: 1024),
|
||||
(filename: 'b.jpg', bytes: 2048),
|
||||
(filename: 'c.jpg', bytes: 1024),
|
||||
]);
|
||||
|
||||
expect(adapter.requests, hasLength(1), reason: '≤500 项不分块');
|
||||
final req = adapter.requests.single;
|
||||
expect(req.method, 'POST');
|
||||
expect(req.path, '/v1/uploads/duplicates/check');
|
||||
expect(req.headers['Authorization'], 'Bearer tok-live-1');
|
||||
expect(req.body, {
|
||||
'albumId': 'alb-1',
|
||||
'items': [
|
||||
{'filename': 'a.jpg', 'bytes': 1024},
|
||||
{'filename': 'b.jpg', 'bytes': 2048},
|
||||
{'filename': 'c.jpg', 'bytes': 1024},
|
||||
],
|
||||
}, reason: '请求体对齐契约 UploadDuplicateCheckRequest');
|
||||
expect(hits, [
|
||||
(
|
||||
index: 1,
|
||||
bytes: 2048,
|
||||
uploadedAt: DateTime.utc(2026, 9, 25, 8),
|
||||
),
|
||||
(
|
||||
index: 0,
|
||||
bytes: 1024,
|
||||
uploadedAt: DateTime.utc(2026, 9, 24, 8),
|
||||
),
|
||||
(
|
||||
index: 2,
|
||||
bytes: 1024,
|
||||
uploadedAt: DateTime.utc(2026, 9, 24, 8),
|
||||
),
|
||||
]);
|
||||
});
|
||||
|
||||
test('>500 项分块：1200 项 → 3 个请求（500/500/200）+ 局部下标换算全局',
|
||||
() async {
|
||||
seedSession();
|
||||
final adapter = FakeAdapter((o) {
|
||||
// 每块只命中块内第 0 项：全局下标 = 分块起点 + 0。
|
||||
final items = (o.data as Map<String, dynamic>)['items'] as List<dynamic>;
|
||||
return (
|
||||
200,
|
||||
{
|
||||
'duplicates': [
|
||||
{
|
||||
'index': 0,
|
||||
'bytes': items[0]['bytes'],
|
||||
'uploadedAt': '2026-09-25T08:00:00Z',
|
||||
},
|
||||
],
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
final items = List.generate(
|
||||
1200,
|
||||
(i) => (filename: 'f$i.jpg', bytes: 1000 + i),
|
||||
);
|
||||
final hits = await wired(adapter).checkUploadDuplicates('alb-1', items);
|
||||
|
||||
expect(adapter.requests, hasLength(3), reason: '契约单批上限 500');
|
||||
expect(
|
||||
adapter.requests.map(
|
||||
(r) => ((r.body as Map<String, dynamic>)['items'] as List).length,
|
||||
),
|
||||
[500, 500, 200],
|
||||
reason: '顺序分块，末块为余量',
|
||||
);
|
||||
expect(hits.map((h) => h.index), [0, 500, 1000],
|
||||
reason: '分块局部下标换算为对原始列表的全局下标');
|
||||
expect(hits.map((h) => h.bytes), [1000, 1500, 2000]);
|
||||
});
|
||||
|
||||
test('空列表不发起请求（契约 items minItems=1）', () async {
|
||||
final adapter = FakeAdapter((_) => throw StateError('不应发起请求'));
|
||||
|
||||
final hits = await wired(adapter).checkUploadDuplicates('alb-1', const []);
|
||||
|
||||
expect(hits, isEmpty);
|
||||
expect(adapter.requests, isEmpty);
|
||||
});
|
||||
|
||||
test('错误响应经 _send 归一为 AppException（404 ALBUM_NOT_FOUND）',
|
||||
() async {
|
||||
seedSession();
|
||||
final adapter = FakeAdapter(
|
||||
(o) => (
|
||||
404,
|
||||
{
|
||||
'code': 'ALBUM_NOT_FOUND',
|
||||
'message': 'no such album',
|
||||
'requestId': 'r1',
|
||||
},
|
||||
),
|
||||
);
|
||||
|
||||
final err = await captureError(
|
||||
() => wired(adapter).checkUploadDuplicates('alb-x', const [
|
||||
(filename: 'a.jpg', bytes: 1024),
|
||||
]),
|
||||
);
|
||||
|
||||
expect(
|
||||
err,
|
||||
isA<AppException>()
|
||||
.having((e) => e.code, 'code', ErrorCodes.albumNotFound),
|
||||
);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -47,11 +47,13 @@ void main() {
|
||||
});
|
||||
|
||||
/// 路由：GET 详情（反映可变分类表）/ GET 照片预览（scope 自适应；默认
|
||||
/// 管理者空列表）/ 分类 CRUD；其余路径直接抛错。
|
||||
/// 管理者空列表）/ 分类 CRUD / 查重预检（[duplicateCheck]，Task 2）；
|
||||
/// 其余路径直接抛错（含未配置的查重预检——驱动「服务器失败静默降级」）。
|
||||
FakeAdapter detailAdapter({
|
||||
List<Map<String, dynamic>>? photos,
|
||||
bool collaborator = false,
|
||||
(int, Object?)? Function(String method, String path)? onCategoryMutation,
|
||||
(int, Object?)? duplicateCheck,
|
||||
}) =>
|
||||
FakeAdapter((o) {
|
||||
if (o.path == '/v1/albums/alb-1' && o.method == 'GET') {
|
||||
@@ -75,6 +77,10 @@ void main() {
|
||||
if (o.path.startsWith('/v1/categories/') && o.method == 'DELETE') {
|
||||
return onCategoryMutation?.call('DELETE', o.path) ?? (204, null);
|
||||
}
|
||||
if (o.path == '/v1/uploads/duplicates/check' && o.method == 'POST') {
|
||||
if (duplicateCheck != null) return duplicateCheck;
|
||||
throw StateError('unexpected ${o.method} ${o.path}');
|
||||
}
|
||||
throw StateError('unexpected ${o.method} ${o.path}');
|
||||
});
|
||||
|
||||
@@ -325,16 +331,19 @@ void main() {
|
||||
});
|
||||
|
||||
/// 详情页 + 上传链路替身（内存任务库/临时目录准备器/多选替身/
|
||||
/// 非平台相机源）。
|
||||
Future<void> pumpDetailForUpload(WidgetTester tester) async {
|
||||
final adapter = detailAdapter();
|
||||
/// 非平台相机源；[adapter] 可注入查重预检路由，Task 2）。
|
||||
Future<void> pumpDetailForUpload(
|
||||
WidgetTester tester, {
|
||||
FakeAdapter? adapter,
|
||||
}) async {
|
||||
final effective = adapter ?? detailAdapter();
|
||||
await tester.pumpWidget(
|
||||
ProviderScope(
|
||||
overrides: [
|
||||
...pageTestOverrides(
|
||||
session: store,
|
||||
taskStore: taskStore,
|
||||
client: clientOf(adapter),
|
||||
client: clientOf(effective),
|
||||
),
|
||||
multiImagePickerProvider
|
||||
.overrideWith((ref) => (context) async => galleryPaths),
|
||||
@@ -464,6 +473,132 @@ void main() {
|
||||
reason: '非重复项正常查重语义',
|
||||
);
|
||||
});
|
||||
|
||||
testWidgets('服务器历史命中（本机无记录）→ 统一查重弹窗 + force 入队（Task 2）',
|
||||
(tester) async {
|
||||
// THE 用户场景：新设备/重装——本机 TaskStore 空，服务器有同 bytes
|
||||
// 历史（预检命中也应在点击上传时刻弹确认）。
|
||||
final adapter = detailAdapter(
|
||||
duplicateCheck: (
|
||||
200,
|
||||
{
|
||||
'duplicates': [
|
||||
{
|
||||
'index': 0,
|
||||
'bytes': kJpgBytes.length,
|
||||
'uploadedAt': '2026-09-25T08:00:00Z',
|
||||
},
|
||||
],
|
||||
},
|
||||
),
|
||||
);
|
||||
// pick1 与服务器历史同 bytes（命中）；pick2 字节数不同（不命中）。
|
||||
final pick1 = File('${tmp.path}/pick1.jpg')..writeAsBytesSync(kJpgBytes);
|
||||
final pick2 = File('${tmp.path}/pick2.jpg')
|
||||
..writeAsBytesSync([...kJpgBytes, 0x00]);
|
||||
galleryPaths.addAll([pick1.path, pick2.path]);
|
||||
await pumpDetailForUpload(tester, adapter: adapter);
|
||||
|
||||
final button = find.widgetWithText(OutlinedButton, 'Pick from gallery');
|
||||
await tester.runAsync(() async {
|
||||
(button.evaluate().single.widget as OutlinedButton).onPressed!();
|
||||
await Future<void>.delayed(const Duration(milliseconds: 300));
|
||||
});
|
||||
await tester.pump(const Duration(milliseconds: 300));
|
||||
expect(
|
||||
find.text('可能已上传过'),
|
||||
findsOneWidget,
|
||||
reason: '服务器历史命中（本机空）也弹查重确认',
|
||||
);
|
||||
expect(find.textContaining('1 张照片可能已上传到该相册'), findsOneWidget);
|
||||
expect(
|
||||
find.text('跳过重复，上传 1 张'),
|
||||
findsOneWidget,
|
||||
reason: '另 1 张不重复 → 提供跳过重复入口',
|
||||
);
|
||||
// 请求形状：albumId + 逐项 filename/bytes（index 指向该 items 数组）。
|
||||
final req = adapter.requests.firstWhere(
|
||||
(r) => r.path == '/v1/uploads/duplicates/check',
|
||||
);
|
||||
expect(req.method, 'POST');
|
||||
expect(req.body, {
|
||||
'albumId': 'alb-1',
|
||||
'items': [
|
||||
{'filename': 'pick1.jpg', 'bytes': kJpgBytes.length},
|
||||
{'filename': 'pick2.jpg', 'bytes': kJpgBytes.length + 1},
|
||||
],
|
||||
});
|
||||
|
||||
// 「全部上传」= 确认强传：仅服务器命中的 pick1 force=true。
|
||||
await tester.tap(find.text('全部上传 2 张'));
|
||||
await tester.pump(const Duration(milliseconds: 100));
|
||||
await tester.runAsync(() async {
|
||||
await Future<void>.delayed(const Duration(milliseconds: 300));
|
||||
});
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(
|
||||
find.text('Added 2 photo(s) to the upload queue'),
|
||||
findsOneWidget,
|
||||
);
|
||||
final tasks = await taskStore.listByAccount('alice');
|
||||
expect(tasks, hasLength(2));
|
||||
expect(
|
||||
tasks.firstWhere((t) => t.filename == 'pick1.jpg').force,
|
||||
isTrue,
|
||||
reason: '服务器命中的重复项经「全部上传」确认强传',
|
||||
);
|
||||
expect(
|
||||
tasks.firstWhere((t) => t.filename == 'pick2.jpg').force,
|
||||
isFalse,
|
||||
reason: '非重复项正常查重语义',
|
||||
);
|
||||
});
|
||||
|
||||
testWidgets('服务器预检失败 → 静默降级本机-only：无重复不弹窗直接入队（Task 2）',
|
||||
(tester) async {
|
||||
// 本机 TaskStore 空 + 服务器 500：降级后无重复 → 不阻塞入队。
|
||||
final adapter = detailAdapter(
|
||||
duplicateCheck: (500, errorBody(ErrorCodes.internalError)),
|
||||
);
|
||||
final pick1 = File('${tmp.path}/pick1.jpg')..writeAsBytesSync(kJpgBytes);
|
||||
galleryPaths.add(pick1.path);
|
||||
await pumpDetailForUpload(tester, adapter: adapter);
|
||||
|
||||
final button = find.widgetWithText(OutlinedButton, 'Pick from gallery');
|
||||
await tester.runAsync(() async {
|
||||
(button.evaluate().single.widget as OutlinedButton).onPressed!();
|
||||
await Future<void>.delayed(const Duration(milliseconds: 300));
|
||||
});
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text('可能已上传过'), findsNothing, reason: '静默降级不弹窗');
|
||||
expect(
|
||||
find.text('Added 1 photo(s) to the upload queue'),
|
||||
findsOneWidget,
|
||||
reason: '降级不阻塞入队（服务端 init 409 仍是兜底）',
|
||||
);
|
||||
});
|
||||
|
||||
testWidgets('双方均无重复（服务器空命中）→ 不弹窗直接入队（Task 2）',
|
||||
(tester) async {
|
||||
final adapter = detailAdapter(
|
||||
duplicateCheck: (200, {'duplicates': <Map<String, dynamic>>[]}),
|
||||
);
|
||||
final pick1 = File('${tmp.path}/pick1.jpg')..writeAsBytesSync(kJpgBytes);
|
||||
galleryPaths.add(pick1.path);
|
||||
await pumpDetailForUpload(tester, adapter: adapter);
|
||||
|
||||
final button = find.widgetWithText(OutlinedButton, 'Pick from gallery');
|
||||
await tester.runAsync(() async {
|
||||
(button.evaluate().single.widget as OutlinedButton).onPressed!();
|
||||
await Future<void>.delayed(const Duration(milliseconds: 300));
|
||||
});
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text('可能已上传过'), findsNothing);
|
||||
expect(find.text('Added 1 photo(s) to the upload queue'), findsOneWidget);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -165,7 +165,11 @@ void main() {
|
||||
categories: categories,
|
||||
);
|
||||
|
||||
Future<void> pumpCapture(WidgetTester tester, {CaptureSource? cameraSource}) async {
|
||||
Future<void> pumpCapture(
|
||||
WidgetTester tester, {
|
||||
CaptureSource? cameraSource,
|
||||
FakeAdapter? apiAdapter,
|
||||
}) async {
|
||||
final effectiveSource = cameraSource ?? source;
|
||||
await tester.pumpWidget(
|
||||
ProviderScope(
|
||||
@@ -176,8 +180,12 @@ void main() {
|
||||
client: ApiClient(
|
||||
sessionStore: session,
|
||||
dio: Dio(BaseOptions(baseUrl: 'http://test.local'))
|
||||
..httpClientAdapter = FakeAdapter(
|
||||
(_) => throw StateError('连拍页不应发起 API 请求')),
|
||||
..httpClientAdapter = apiAdapter ??
|
||||
FakeAdapter(
|
||||
// 多选入队的查重预检会发 API 请求：默认打桩为失败，
|
||||
// 驱动「服务器预检失败 → 静默降级本机-only」路径。
|
||||
(_) => throw StateError('连拍页测试 API 请求一律失败'),
|
||||
),
|
||||
),
|
||||
),
|
||||
captureSourceFactoryProvider.overrideWith(
|
||||
@@ -462,6 +470,50 @@ void main() {
|
||||
);
|
||||
});
|
||||
|
||||
testWidgets('服务器历史查重命中（本机无记录）→ 统一查重弹窗，取消不上传（Task 2）',
|
||||
(tester) async {
|
||||
// 新设备场景：本机 TaskStore 空，服务器预检命中 pick1（bytes 一致）；
|
||||
// pick2 字节数不同不命中——弹窗应精确提示 1 张重复。
|
||||
final adapter = FakeAdapter((o) {
|
||||
if (o.path == '/v1/uploads/duplicates/check' && o.method == 'POST') {
|
||||
return (
|
||||
200,
|
||||
{
|
||||
'duplicates': [
|
||||
{
|
||||
'index': 0,
|
||||
'bytes': kJpgBytes.length,
|
||||
'uploadedAt': '2026-09-25T08:00:00Z',
|
||||
},
|
||||
],
|
||||
},
|
||||
);
|
||||
}
|
||||
throw StateError('unexpected ${o.method} ${o.path}');
|
||||
});
|
||||
final pick1 = File('${tmp.path}/pick1.jpg')..writeAsBytesSync(kJpgBytes);
|
||||
final pick2 = File('${tmp.path}/pick2.jpg')
|
||||
..writeAsBytesSync([...kJpgBytes, 0x00]);
|
||||
galleryPaths.addAll([pick1.path, pick2.path]);
|
||||
await pumpCapture(tester, apiAdapter: adapter);
|
||||
|
||||
await pressRealIo(tester, Icons.photo_library_outlined);
|
||||
await tester.pump(const Duration(milliseconds: 300));
|
||||
|
||||
expect(
|
||||
find.text('可能已上传过'),
|
||||
findsOneWidget,
|
||||
reason: '服务器历史命中（新设备场景）也弹查重确认',
|
||||
);
|
||||
expect(find.textContaining('1 张照片可能已上传到该相册'), findsOneWidget);
|
||||
expect(find.text('跳过重复，上传 1 张'), findsOneWidget);
|
||||
|
||||
// 取消：整批不上传（服务器命中同样尊重用户取消）。
|
||||
await tester.tap(find.text('取消'));
|
||||
await tester.pumpAndSettle();
|
||||
expect(await store.listByAccount('alice'), isEmpty);
|
||||
});
|
||||
|
||||
testWidgets('退出确认：有待传任务 → 弹确认；保留继续拍 / 确认才退出',
|
||||
(tester) async {
|
||||
await pumpCapture(tester);
|
||||
|
||||
Reference in New Issue
Block a user