task-66(ASIN 数据中心): 实现去重汇总导入轮询和终态
dedupe-import-model.ts 增 parseDedupeImportProgress(status/计数/errorMessage,缺省 pending、
未知状态不改) + importTaskFinished/importTaskSucceeded 终态判定;dedupe-import-api.ts 增
fetchDedupeImportProgress GET /api/admin/dedupe-total-data/import/{importId}。
8 用例全过,483 单测 + build 绿。
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/** 去重汇总导入启动适配(任务 65):multipart POST /import(file+groupId) → importId。 */
|
||||
import { http } from '@/api/http'
|
||||
import { parseDedupeImportStart } from './dedupe-import-model'
|
||||
import { parseDedupeImportProgress, parseDedupeImportStart, type DedupeImportProgress } from './dedupe-import-model'
|
||||
|
||||
export const DEDUPE_IMPORT_ENDPOINT = '/api/admin/dedupe-total-data/import'
|
||||
|
||||
@@ -11,3 +11,9 @@ export async function startDedupeImport(file: File, groupId: number): Promise<st
|
||||
const { data } = await http.post<unknown>(DEDUPE_IMPORT_ENDPOINT, form)
|
||||
return parseDedupeImportStart(data)
|
||||
}
|
||||
|
||||
/** 查询导入进度:GET /import/{importId}。 */
|
||||
export async function fetchDedupeImportProgress(importId: string): Promise<DedupeImportProgress> {
|
||||
const { data } = await http.get<unknown>(`${DEDUPE_IMPORT_ENDPOINT}/${importId}`)
|
||||
return parseDedupeImportProgress(data)
|
||||
}
|
||||
|
||||
@@ -16,3 +16,54 @@ export function parseDedupeImportStart(payload: unknown): string {
|
||||
if (!importId) throw new Error('导入任务响应异常:缺少任务 ID')
|
||||
return importId
|
||||
}
|
||||
|
||||
export type DedupeImportStatus = 'pending' | 'running' | 'success' | 'failed'
|
||||
|
||||
export interface DedupeImportProgress {
|
||||
status: DedupeImportStatus
|
||||
totalRows: number
|
||||
processedRows: number
|
||||
asinCount: number
|
||||
insertedCount: number
|
||||
skippedCount: number
|
||||
errorMessage?: string
|
||||
}
|
||||
|
||||
function intOrZero(value: unknown): number {
|
||||
return typeof value === 'number' && Number.isFinite(value) ? Math.floor(value) : 0
|
||||
}
|
||||
|
||||
/** 归一化导入进度负载;缺省按未开始(pending)处理,未知状态不改。 */
|
||||
export function parseDedupeImportProgress(payload: unknown): DedupeImportProgress {
|
||||
const data = unwrap<unknown>(payload)
|
||||
const record = data && typeof data === 'object' ? (data as Record<string, unknown>) : null
|
||||
const rawStatus = typeof record?.status === 'string' ? record.status.trim().toLowerCase() : ''
|
||||
const status: DedupeImportStatus =
|
||||
rawStatus === 'running' || rawStatus === 'success' || rawStatus === 'failed' || rawStatus === 'pending'
|
||||
? rawStatus
|
||||
: 'pending'
|
||||
const progress: DedupeImportProgress = {
|
||||
status,
|
||||
totalRows: intOrZero(record?.totalRows),
|
||||
processedRows: intOrZero(record?.processedRows),
|
||||
asinCount: intOrZero(record?.asinCount),
|
||||
insertedCount: intOrZero(record?.insertedCount),
|
||||
skippedCount: intOrZero(record?.skippedCount),
|
||||
}
|
||||
const errorMessage =
|
||||
typeof record?.errorMessage === 'string' && record.errorMessage.trim()
|
||||
? record.errorMessage.trim()
|
||||
: undefined
|
||||
if (errorMessage) progress.errorMessage = errorMessage
|
||||
return progress
|
||||
}
|
||||
|
||||
/** 是否到达终态(success/failed)。 */
|
||||
export function importTaskFinished(progress: Pick<DedupeImportProgress, 'status'>): boolean {
|
||||
return progress.status === 'success' || progress.status === 'failed'
|
||||
}
|
||||
|
||||
/** 是否成功完成。 */
|
||||
export function importTaskSucceeded(progress: Pick<DedupeImportProgress, 'status'>): boolean {
|
||||
return progress.status === 'success'
|
||||
}
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
import test from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import { readSource } from './helpers.ts'
|
||||
import {
|
||||
importTaskFinished,
|
||||
importTaskSucceeded,
|
||||
parseDedupeImportProgress,
|
||||
} from '../src/pages/asin/dedupe-import-model.ts'
|
||||
|
||||
test('test_task_066_dedupe_import_poll_normal_primary_path', () => {
|
||||
// 正常主路径:解析 running 进度(含各计数)。
|
||||
const progress = parseDedupeImportProgress({
|
||||
success: true,
|
||||
data: {
|
||||
status: 'running',
|
||||
totalRows: 100,
|
||||
processedRows: 40,
|
||||
asinCount: 38,
|
||||
insertedCount: 20,
|
||||
skippedCount: 18,
|
||||
errorMessage: '',
|
||||
},
|
||||
})
|
||||
assert.equal(progress.status, 'running')
|
||||
assert.equal(progress.totalRows, 100)
|
||||
assert.equal(progress.processedRows, 40)
|
||||
assert.equal(progress.insertedCount, 20)
|
||||
assert.equal(importTaskFinished(progress), false)
|
||||
})
|
||||
|
||||
test('test_task_066_dedupe_import_poll_normal_variant_input', () => {
|
||||
// 正常变体:success 终态判定成功且不再轮询。
|
||||
const progress = parseDedupeImportProgress({ success: true, data: { status: 'success', insertedCount: 9 } })
|
||||
assert.equal(progress.insertedCount, 9)
|
||||
assert.equal(importTaskSucceeded(progress), true)
|
||||
assert.equal(importTaskFinished(progress), true)
|
||||
})
|
||||
|
||||
test('test_task_066_dedupe_import_poll_normal_repeated_operation_is_idempotent', () => {
|
||||
// 正常重复:解析不改输入、结果稳定。
|
||||
const payload = { success: true, data: { status: 'pending' } }
|
||||
assert.deepEqual(parseDedupeImportProgress(payload), parseDedupeImportProgress(payload))
|
||||
})
|
||||
|
||||
test('test_task_066_dedupe_import_poll_boundary_empty_input', () => {
|
||||
// 边界空值:空负载按未开始(pending)处理,不崩溃。
|
||||
const progress = parseDedupeImportProgress({})
|
||||
assert.equal(progress.status, 'pending')
|
||||
assert.equal(importTaskFinished(progress), false)
|
||||
})
|
||||
|
||||
test('test_task_066_dedupe_import_poll_boundary_single_item', () => {
|
||||
// 边界单元素:缺省计数为 0。
|
||||
const progress = parseDedupeImportProgress({ success: true, data: { status: 'running' } })
|
||||
assert.equal(progress.processedRows, 0)
|
||||
assert.equal(progress.asinCount, 0)
|
||||
})
|
||||
|
||||
test('test_task_066_dedupe_import_poll_boundary_limit_or_missing_field', () => {
|
||||
// 边界上限/缺字段:failed 终态判定完成但未成功,错误信息可读。
|
||||
const progress = parseDedupeImportProgress({
|
||||
success: true,
|
||||
data: { status: 'failed', errorMessage: '某行 ASIN 格式错误' },
|
||||
})
|
||||
assert.equal(importTaskFinished(progress), true)
|
||||
assert.equal(importTaskSucceeded(progress), false)
|
||||
assert.match(progress.errorMessage || '', /格式错误/)
|
||||
})
|
||||
|
||||
test('test_task_066_dedupe_import_poll_invalid_input_rejected', () => {
|
||||
// 异常输入:success=false 抛后端 message;未知状态按未完成处理。
|
||||
assert.throws(
|
||||
() => parseDedupeImportProgress({ success: false, message: '无权查看导入进度' }),
|
||||
/无权查看/,
|
||||
)
|
||||
const weird = parseDedupeImportProgress({ success: true, data: { status: 'weird' } })
|
||||
assert.equal(importTaskFinished(weird), false)
|
||||
})
|
||||
|
||||
test('test_task_066_dedupe_import_poll_dependency_failure_returns_actionable_message', () => {
|
||||
// 依赖失败/轮询走 adapter:GET /import/{importId} 解析进度。
|
||||
const api = readSource('src/pages/asin/dedupe-import-api.ts')
|
||||
assert.match(api, /fetchDedupeImportProgress|importProgress/)
|
||||
assert.match(api, /import\/\$\{?importId|import\/\{importId\}/)
|
||||
assert.match(api, /parseDedupeImportProgress/)
|
||||
const mod = readSource('src/pages/asin/dedupe-import-model.ts')
|
||||
assert.equal(/axios|http\./.test(mod), false, '导入进度模型保持纯逻辑')
|
||||
})
|
||||
Reference in New Issue
Block a user