- DemandController 新增 POST /{id}/Respond:校验 PUBLISHED -> 生成 Order
(买方=需求提出方, 卖方=当前登录用户, deliveryType 默认 PRIVACY_COMPUTE,
productId 用需求 id 占位);经 OrderController.sign 自动建 DeliveryTask(图4 枢纽)。
- ResourceGrantController 新增 POST /Apply(自助申请 PENDING) + POST /{id}/Approve(ACTIVE)。
- OrderController.createDeliveryTask 补 f_contract_id(订单 id 作合约引用),
修复签约后 deliveryTaskService.save 因 NOT NULL 抛异常、交付任务未生成的问题
(此前'链路可走'判断未经实跑验证,今证伪并修正)。
- 前端 tdc.ts 加 demand.respond / resourceGrant.apply+approve;
MarketView 加需求'响应'按钮 + '资源广场' tab(申请授权)。
- 新增 docs/sswflow_tdc_integration_plan.md(5 张时序图->实现映射+任务拆解表);
新增 docs/e2e/_verify_response.mjs,端到端验证 PASS 11/FAIL 0。
- 验证发现并修正:tdc_order 需 orderCode/productId 必填,已随响应逻辑补齐。
96 lines
4.5 KiB
JavaScript
96 lines
4.5 KiB
JavaScript
// 验证「发布资源/需求可直接响应」闭环:
|
|
// 需求响应 -> 生成订单 -> 审核/付款/签约 -> 自动建交付任务(PENDING_DELIVER)
|
|
// 资源申请授权 -> PENDING -> 审批 -> ACTIVE
|
|
import { apiLogin } from './lib/dsl.mjs'
|
|
import { BE_BASE } from './lib/config.mjs'
|
|
|
|
const token = await apiLogin()
|
|
const H = {
|
|
Authorization: token,
|
|
'App-Code': 'sswflow',
|
|
'Jnpf-Origin': 'pc',
|
|
'Vue-Version': '3',
|
|
'Content-Type': 'application/json'
|
|
}
|
|
async function call(method, url, body) {
|
|
const full = url.startsWith('http') ? url : BE_BASE + url
|
|
const res = await fetch(full, {
|
|
method,
|
|
headers: H,
|
|
...(body !== undefined ? { body: JSON.stringify(body) } : {})
|
|
})
|
|
const json = await res.json().catch(() => ({}))
|
|
return json
|
|
}
|
|
const j = (x) => JSON.stringify(x)
|
|
let pass = 0, fail = 0
|
|
function check(name, cond, extra = '') {
|
|
if (cond) { pass++; console.log(' ✅', name, extra) }
|
|
else { fail++; console.log(' ❌', name, extra) }
|
|
}
|
|
|
|
console.log('=== 1) 自建一条带提出方名称的已发布需求(保证断言可验) ===')
|
|
const created = await call('POST', '/api/ssw/tdc/Demand', {
|
|
title: '验证需求-响应闭环', memberId: 'M-verify', memberName: '验证需求方',
|
|
expectedDataType: 'csv', description: 'e2e 验证', status: 'DRAFT'
|
|
})
|
|
const pid = created.data?.id || created.data
|
|
await call('PUT', `/api/ssw/tdc/Demand/${pid}/Publish`)
|
|
const pub = { id: pid, memberName: '验证需求方' }
|
|
console.log(' 新建并发布需求', pid)
|
|
|
|
console.log('=== 2) 响应需求 ===')
|
|
const resp = await call('POST', `/api/ssw/tdc/Demand/${pub.id}/Respond`, {
|
|
deliveryType: 'PRIVACY_COMPUTE', message: 'verify respond'
|
|
})
|
|
console.log(' respond ->', j(resp))
|
|
const orderId = resp.data
|
|
check('响应返回 orderId', !!orderId, 'orderId=' + orderId)
|
|
|
|
console.log('=== 3) 校验订单 ===')
|
|
const order = await call('GET', `/api/ssw/tdc/Order/${orderId}`)
|
|
console.log(' order status=', order.data?.status, 'buyer=', order.data?.buyerName, 'seller=', order.data?.sellerName, 'deliveryType=', order.data?.deliveryType)
|
|
check('订单 status=PENDING', order.data?.status === 'PENDING')
|
|
check('买方=需求提出方', order.data?.buyerName === pub.memberName, order.data?.buyerName)
|
|
check('卖方=当前登录用户', !!order.data?.sellerId, order.data?.sellerId)
|
|
check('deliveryType=PRIVACY_COMPUTE', order.data?.deliveryType === 'PRIVACY_COMPUTE')
|
|
|
|
console.log('=== 4) 订单生命周期 -> 自动建交付任务 ===')
|
|
await call('PUT', `/api/ssw/tdc/Order/${orderId}/Approve`)
|
|
await call('PUT', `/api/ssw/tdc/Order/${orderId}/ConfirmPayment`)
|
|
await call('PUT', `/api/ssw/tdc/Order/${orderId}/Sign`)
|
|
await call('PUT', `/api/ssw/tdc/Order/${orderId}/Sign`)
|
|
// 签约后回查订单(避免 Sign 响应解析差异,直接校验最终态)
|
|
const s2 = await call('GET', `/api/ssw/tdc/Order/${orderId}`)
|
|
console.log(' 签约后 status=', s2.data?.status, 'deliveryTaskId=', s2.data?.deliveryTaskId)
|
|
check('签约后 SIGNED+TO_DELIVER', s2.data?.status === 'TO_DELIVER', s2.data?.status)
|
|
check('已自动建交付任务', !!s2.data?.deliveryTaskId)
|
|
if (s2.data?.deliveryTaskId) {
|
|
const dt = await call('GET', `/api/ssw/tdc/DeliveryTask/${s2.data.deliveryTaskId}`)
|
|
console.log(' 交付任务 status=', dt.data?.status, 'runStatus=', dt.data?.runStatus, 'deliveryType=', dt.data?.deliveryType)
|
|
check('交付任务 PENDING_DELIVER', dt.data?.status === 'PENDING_DELIVER', 'status=' + dt.data?.status)
|
|
check('交付任务 deliveryType=PRIVACY_COMPUTE', dt.data?.deliveryType === 'PRIVACY_COMPUTE')
|
|
}
|
|
|
|
console.log('=== 5) 资源自助申请授权 ===')
|
|
const reses = await call('GET', '/api/ssw/tdc/Resource/Enabled')
|
|
const rlist = reses.data || []
|
|
const mounted = rlist.find((r) => r.mountStatus === 'MOUNTED') || rlist[0]
|
|
if (!mounted) {
|
|
console.log(' ⚠️ 无已上架(MOUNTED)资源,跳过资源申请验证')
|
|
} else {
|
|
console.log(' 资源:', mounted.id, mounted.name, mounted.mountStatus)
|
|
const ap = await call('POST', '/api/ssw/tdc/ResourceGrant/Apply', { resourceId: mounted.id, scope: 'READ' })
|
|
console.log(' apply ->', j(ap))
|
|
const gid = ap.data
|
|
check('申请返回 grantId', !!gid)
|
|
const av = await call('POST', `/api/ssw/tdc/ResourceGrant/${gid}/Approve`)
|
|
console.log(' approve ->', j(av))
|
|
const g = await call('GET', `/api/ssw/tdc/ResourceGrant/${gid}`)
|
|
console.log(' grant status=', g.data?.status)
|
|
check('授权审批后 ACTIVE', g.data?.status === 'ACTIVE')
|
|
}
|
|
|
|
console.log(`\n=== 结果: PASS ${pass} / FAIL ${fail} ===`)
|
|
process.exit(fail ? 1 : 0)
|