优化任务状态投影和部署文档
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
import { query, withTransaction } from '../db/client.js'
|
||||
import type { PoolClient } from 'pg'
|
||||
|
||||
import { syncKuaishouCloudTaskStateForTask } from './kuaishou-cloud-task-state-repo.js'
|
||||
import type {
|
||||
TaskCreateInput,
|
||||
TaskListQueryInput,
|
||||
@@ -42,13 +43,24 @@ const TASK_FIELDS = `
|
||||
ctx.partition_name,
|
||||
ctx.screenshot_path,
|
||||
ctx.artifacts_json,
|
||||
ctx.state_json
|
||||
ctx.state_json,
|
||||
kcts.ticket_status AS kuaishou_ticket_status,
|
||||
kcts.ticket_code_masked AS kuaishou_ticket_code_masked,
|
||||
kcts.bind_url AS kuaishou_bind_url,
|
||||
kcts.vn_phone AS kuaishou_vn_phone,
|
||||
kcts.role_name AS kuaishou_role_name,
|
||||
kcts.role_id AS kuaishou_role_id,
|
||||
kcts.dispatch_status AS kuaishou_dispatch_status,
|
||||
kcts.consume_status AS kuaishou_consume_status,
|
||||
kcts.source_key AS kuaishou_source_key,
|
||||
kcts.updated_at AS kuaishou_state_updated_at
|
||||
`
|
||||
|
||||
const TASK_JOINS = `
|
||||
FROM fulfillment_tasks ft
|
||||
LEFT JOIN claim_tokens ct ON ct.task_id = ft.id
|
||||
LEFT JOIN task_runtime_contexts ctx ON ctx.task_id = ft.id
|
||||
LEFT JOIN kuaishou_cloud_task_states kcts ON kcts.task_id = ft.id
|
||||
`
|
||||
|
||||
function buildTaskSelect(extraFields = ''): string {
|
||||
@@ -138,6 +150,13 @@ export async function createTask(input: TaskCreateInput): Promise<TaskRow | null
|
||||
await upsertTaskRuntimeContextWithClient(client, taskId, input.runtimeContext, input.createdAt)
|
||||
}
|
||||
|
||||
await syncKuaishouCloudTaskStateForTask({
|
||||
taskId,
|
||||
executorKey: input.executorKey,
|
||||
contextJson: input.contextJson || '{}',
|
||||
updatedAt: input.updatedAt,
|
||||
}, client.query.bind(client) as TaskQueryExecutor)
|
||||
|
||||
return getTaskByIdWithExecutor(client.query.bind(client) as TaskQueryExecutor, taskId)
|
||||
})
|
||||
}
|
||||
@@ -210,6 +229,13 @@ export async function updateTask(taskId: number | string, patch: TaskUpdatePatch
|
||||
await upsertTaskRuntimeContextWithClient(client, Number(taskId), runtimeContextPatch, patch.updated_at || current.updated_at)
|
||||
}
|
||||
|
||||
await syncKuaishouCloudTaskStateForTask({
|
||||
taskId,
|
||||
executorKey: next.executor_key,
|
||||
contextJson: next.context_json,
|
||||
updatedAt: next.updated_at,
|
||||
}, client.query.bind(client) as TaskQueryExecutor)
|
||||
|
||||
return getTaskByIdWithExecutor(client.query.bind(client) as TaskQueryExecutor, taskId)
|
||||
})
|
||||
}
|
||||
@@ -220,47 +246,62 @@ export async function updateTaskStatusIfCurrent(
|
||||
patch: TaskUpdatePatch,
|
||||
): Promise<TaskRow | null> {
|
||||
const now = String(patch.updated_at || '').trim()
|
||||
const result = await query<{ id: number }>(
|
||||
`
|
||||
UPDATE fulfillment_tasks
|
||||
SET
|
||||
task_status = $1,
|
||||
delivery_status = COALESCE($2, delivery_status),
|
||||
result_code = COALESCE($3, result_code),
|
||||
result_message = COALESCE($4, result_message),
|
||||
user_action_status = COALESCE($5, user_action_status),
|
||||
last_error = COALESCE($6, last_error),
|
||||
context_json = COALESCE($7::jsonb, context_json),
|
||||
redeemed_at = COALESCE($8, redeemed_at),
|
||||
updated_at = COALESCE($9, updated_at)
|
||||
WHERE id = $10
|
||||
AND task_status = $11
|
||||
RETURNING id
|
||||
`,
|
||||
[
|
||||
patch.task_status,
|
||||
patch.delivery_status ?? null,
|
||||
patch.result_code ?? null,
|
||||
patch.result_message ?? null,
|
||||
patch.user_action_status ?? null,
|
||||
patch.last_error ?? null,
|
||||
typeof patch.context_json === 'undefined'
|
||||
? null
|
||||
: typeof patch.context_json === 'string'
|
||||
? patch.context_json
|
||||
: JSON.stringify(patch.context_json || {}),
|
||||
patch.redeemed_at ?? null,
|
||||
now || null,
|
||||
Number(taskId),
|
||||
currentStatus,
|
||||
],
|
||||
)
|
||||
return withTransaction(async (client) => {
|
||||
const result = await client.query<{
|
||||
id: number
|
||||
executor_key: string
|
||||
context_json: string | Record<string, unknown>
|
||||
updated_at: string
|
||||
}>(
|
||||
`
|
||||
UPDATE fulfillment_tasks
|
||||
SET
|
||||
task_status = $1,
|
||||
delivery_status = COALESCE($2, delivery_status),
|
||||
result_code = COALESCE($3, result_code),
|
||||
result_message = COALESCE($4, result_message),
|
||||
user_action_status = COALESCE($5, user_action_status),
|
||||
last_error = COALESCE($6, last_error),
|
||||
context_json = COALESCE($7::jsonb, context_json),
|
||||
redeemed_at = COALESCE($8, redeemed_at),
|
||||
updated_at = COALESCE($9, updated_at)
|
||||
WHERE id = $10
|
||||
AND task_status = $11
|
||||
RETURNING id, executor_key, context_json, updated_at
|
||||
`,
|
||||
[
|
||||
patch.task_status,
|
||||
patch.delivery_status ?? null,
|
||||
patch.result_code ?? null,
|
||||
patch.result_message ?? null,
|
||||
patch.user_action_status ?? null,
|
||||
patch.last_error ?? null,
|
||||
typeof patch.context_json === 'undefined'
|
||||
? null
|
||||
: typeof patch.context_json === 'string'
|
||||
? patch.context_json
|
||||
: JSON.stringify(patch.context_json || {}),
|
||||
patch.redeemed_at ?? null,
|
||||
now || null,
|
||||
Number(taskId),
|
||||
currentStatus,
|
||||
],
|
||||
)
|
||||
|
||||
if (!result.rows[0]) {
|
||||
return null
|
||||
}
|
||||
const updated = result.rows[0]
|
||||
if (!updated) {
|
||||
return null
|
||||
}
|
||||
|
||||
return getTaskById(taskId)
|
||||
await syncKuaishouCloudTaskStateForTask({
|
||||
taskId: updated.id,
|
||||
executorKey: updated.executor_key,
|
||||
contextJson: updated.context_json,
|
||||
updatedAt: updated.updated_at,
|
||||
}, client.query.bind(client) as TaskQueryExecutor)
|
||||
|
||||
return getTaskByIdWithExecutor(client.query.bind(client) as TaskQueryExecutor, taskId)
|
||||
})
|
||||
}
|
||||
|
||||
export async function getTaskById(taskId: number | string): Promise<TaskRow | null> {
|
||||
@@ -315,7 +356,7 @@ export async function listTasks({
|
||||
|
||||
if (roleId) {
|
||||
params.push(`%${roleId}%`)
|
||||
filters.push(`ctx.role_id ILIKE $${params.length}`)
|
||||
filters.push(`COALESCE(NULLIF(kcts.role_id, ''), ctx.role_id) ILIKE $${params.length}`)
|
||||
}
|
||||
|
||||
if (dateFrom) {
|
||||
@@ -335,6 +376,7 @@ export async function listTasks({
|
||||
FROM fulfillment_tasks ft
|
||||
LEFT JOIN order_items oi ON oi.id = ft.order_item_id
|
||||
LEFT JOIN task_runtime_contexts ctx ON ctx.task_id = ft.id
|
||||
LEFT JOIN kuaishou_cloud_task_states kcts ON kcts.task_id = ft.id
|
||||
${whereClause}
|
||||
`,
|
||||
params,
|
||||
|
||||
Reference in New Issue
Block a user