影响:6 张「上游无独立控制器」的子表挂进父实体的响应;
245 条测试全绿(+6),冒烟断言数仍 76,边界/实体自检全绿。
Resource/Dataset 的普通详情**不带**子表(上游只在 /Detail 聚合体上挂)。
改动:
- src/tdc/entity/mod.rs:新增 ChildMount(Aggregate/Detail/List 三面)与
ChildTable(key/table/fk_column/parent_column/order_column/alive/mounts),
TableSpec.child_tables 由 (key, table) 二元组升级成 ChildTable 切片;
validate() 增加子表标识符白名单自检 + 「聚合体开关 ⇔ 有 Aggregate 面子表」一致性自检
- src/tdc/entity/{resource,dataset}.rs:字段说明 + 脱敏规则挂 Aggregate 面
- src/tdc/entity/data_interface.rs:参数 + 字段映射挂 Detail 面(上游覆写基类详情)
- src/tdc/entity/delivery_task.rs:参与方挂 Detail+List 面(按 f_tds_task_id),
待发队列挂 Detail 面(按 local_task_id)
- src/tdc/service/crud.rs:子表挂载引擎(父行取值 / 单父取子行 / 批量取子行 /
单行回填 / 列表回填),引擎仍零 match api_name(只认列名)
- tests/child_aggregate.rs(新):4 条集成用例(接口详情带子表 / 资源子表只在聚合体 /
交付任务详情与列表带参与方 / 无平台任务号 ⇒ 参与方空集合)
- docs/contract.md(新增 §子表聚合)/ docs/decisions.md(D19)/
docs/known-limitations.md(L3)/ CLAUDE.md / .workbuddy/memory/2026-10-26.md 同步
设计:挂载面逐父子不同(上游口径不是「子表都挂详情」)—— Resource/Dataset 只在
/Detail、DataInterface 只在普通详情、DeliveryTask 详情+列表;父行取值列不一定是
f_id(参与方按平台任务号挂 ⇒ 无平台任务号即空集合);存活谓词逐表不同(四张
资源/接口子表没有 f_delete_mark ⇒ 物理删除语义,不加谓词)。
outbox 挂详情是本仓扩展(上游不挂);tdc_demo_car_insurance 无父外键 ⇒ 挂不了,
记为已知限制 L3,不硬挂。
Co-Authored-By: Claude Code <[email protected]>
255 lines
10 KiB
Rust
255 lines
10 KiB
Rust
//! 子表聚合(B3)—— **父子表一致**:建子行 ⇒ 父详情/父列表可见。
|
||
//!
|
||
//! 🔴 上游口径逐父子不同(照抄上游 `withChildren` / `attachParticipants`):
|
||
//! - `Resource` / `Dataset`:字段说明 + 脱敏规则**只挂** `GET /{id}/Detail` 聚合体;
|
||
//! - `DataInterface`:参数 + 字段映射**挂在普通详情** `GET /{id}`(上游覆写了基类详情);
|
||
//! - `DeliveryTask`:参与方挂**详情 + 列表**(上游 `decorate`),待发队列挂详情。
|
||
//!
|
||
//! ⚠️ 本测试二进制内共用一个 PGlite 实例(pglite-rs 每进程只允许一个)。
|
||
|
||
use std::collections::HashMap;
|
||
use std::sync::Arc;
|
||
|
||
use pglite::PGlite;
|
||
use serde_json::Value;
|
||
use tdc_connector::platform::auth::Principal;
|
||
use tdc_connector::platform::config::Config;
|
||
use tdc_connector::platform::session::SessionStore;
|
||
use tdc_connector::platform::state::AppState;
|
||
use tdc_connector::tdc::config::TdcConfig;
|
||
use tdc_connector::tdc::entity;
|
||
use tdc_connector::tdc::service::crud;
|
||
use tdc_connector::tdc::state::{BootstrapIdentity, TdcState};
|
||
use tokio::sync::OnceCell;
|
||
|
||
static DB: OnceCell<Arc<PGlite>> = OnceCell::const_new();
|
||
|
||
async fn shared_db() -> Arc<PGlite> {
|
||
DB.get_or_init(|| async {
|
||
let db = Arc::new(PGlite::open_temp().await.expect("打开临时 PGlite 失败"));
|
||
tdc_connector::platform::db::ensure_schema(db.as_ref())
|
||
.await
|
||
.expect("建表失败");
|
||
db
|
||
})
|
||
.await
|
||
.clone()
|
||
}
|
||
|
||
async fn test_state() -> TdcState {
|
||
let db = shared_db().await;
|
||
let config = Config::from_env(std::env::current_dir().unwrap());
|
||
TdcState::new(
|
||
AppState::new(config, db, Arc::new(SessionStore::new())),
|
||
TdcConfig::default(),
|
||
BootstrapIdentity {
|
||
identity_id: "TEST-OP".to_string(),
|
||
identity_code: "TEST-CONNECTOR".to_string(),
|
||
issued_secret: None,
|
||
},
|
||
)
|
||
}
|
||
|
||
fn principal() -> Principal {
|
||
Principal::Session {
|
||
identity_id: "TEST-OP".to_string(),
|
||
identity_code: "TEST-CONNECTOR".to_string(),
|
||
}
|
||
}
|
||
|
||
async fn body_of(resp: axum::response::Response) -> Value {
|
||
let bytes = axum::body::to_bytes(resp.into_body(), usize::MAX)
|
||
.await
|
||
.expect("读取响应体失败");
|
||
serde_json::from_slice(&bytes).expect("响应体不是 JSON")
|
||
}
|
||
|
||
/// 直接插一行(子表没有 CRUD 端点 ⇒ 只能走 SQL)。
|
||
async fn exec(state: &TdcState, sql: &str) {
|
||
let _g = state.db_lock.lock().await;
|
||
state
|
||
.db
|
||
.query(sql, &[])
|
||
.await
|
||
.unwrap_or_else(|e| panic!("插入失败: {}(SQL: {})", e, sql));
|
||
}
|
||
|
||
/// 🔴 **DataInterface 的子表挂在普通详情上**(上游 `DataInterfaceController#detail` 覆写)。
|
||
#[tokio::test]
|
||
async fn data_interface_detail_carries_params_and_fields() {
|
||
let state = test_state().await;
|
||
let spec = entity::find("DataInterface").unwrap();
|
||
|
||
exec(
|
||
&state,
|
||
"INSERT INTO tdc_data_interface (f_id, f_interface_code, f_name, f_type) \
|
||
VALUES (CAST('DI-1' AS character varying), CAST('API-CHILD-1' AS character varying), \
|
||
CAST('带子表的接口' AS character varying), CAST('API' AS character varying))",
|
||
)
|
||
.await;
|
||
exec(
|
||
&state,
|
||
"INSERT INTO tdc_data_interface_param \
|
||
(f_id, f_interface_id, f_param_name, f_data_type, f_default_value, f_sort_code) \
|
||
VALUES (CAST('DIP-1' AS character varying), CAST('DI-1' AS character varying), \
|
||
CAST('pageNo' AS character varying), CAST('int' AS character varying), \
|
||
CAST('1' AS character varying), 1)",
|
||
)
|
||
.await;
|
||
exec(
|
||
&state,
|
||
"INSERT INTO tdc_data_interface_field \
|
||
(f_id, f_interface_id, f_field_name, f_mapped_field, f_sort_code) \
|
||
VALUES (CAST('DIF-1' AS character varying), CAST('DI-1' AS character varying), \
|
||
CAST('id_card' AS character varying), CAST('idCard' AS character varying), 1)",
|
||
)
|
||
.await;
|
||
|
||
let resp = crud::detail(&state, spec, "DI-1", Some(&principal())).await;
|
||
let body = body_of(resp).await;
|
||
assert_eq!(body["code"], 200, "详情应成功:{}", body);
|
||
|
||
let data = &body["data"];
|
||
let params = data["params"].as_array().expect("应有 params 数组");
|
||
assert_eq!(params.len(), 1, "参数子表条数:{}", body);
|
||
assert_eq!(params[0]["paramName"], "pageNo");
|
||
assert_eq!(params[0]["dataType"], "int");
|
||
assert_eq!(params[0]["defaultValue"], "1");
|
||
|
||
let fields = data["fields"].as_array().expect("应有 fields 数组");
|
||
assert_eq!(fields.len(), 1, "字段子表条数:{}", body);
|
||
assert_eq!(fields[0]["fieldName"], "id_card");
|
||
assert_eq!(fields[0]["mappedField"], "idCard");
|
||
}
|
||
|
||
/// 🔴 **Resource 的子表只在聚合体上,普通详情不带**(上游口径:`withChildren` 只在 `detailOf`)。
|
||
#[tokio::test]
|
||
async fn resource_children_live_only_on_the_aggregate_route() {
|
||
let state = test_state().await;
|
||
let spec = entity::find("Resource").unwrap();
|
||
|
||
exec(
|
||
&state,
|
||
"INSERT INTO tdc_resource (f_id, f_name, f_resource_code) \
|
||
VALUES (CAST('R-CHILD-1' AS character varying), CAST('聚合口径资源' AS character varying), \
|
||
CAST('RC-CHILD-1' AS character varying))",
|
||
)
|
||
.await;
|
||
exec(
|
||
&state,
|
||
"INSERT INTO tdc_resource_field \
|
||
(f_id, f_resource_id, f_field_name, f_field_type, f_sort_code) \
|
||
VALUES (CAST('RF-CHILD-1' AS character varying), CAST('R-CHILD-1' AS character varying), \
|
||
CAST('phone' AS character varying), CAST('varchar' AS character varying), 1)",
|
||
)
|
||
.await;
|
||
|
||
// 普通详情 ⇒ **不带**子表(上游口径)
|
||
let resp = crud::detail(&state, spec, "R-CHILD-1", Some(&principal())).await;
|
||
let body = body_of(resp).await;
|
||
assert_eq!(body["code"], 200, "详情应成功:{}", body);
|
||
assert!(
|
||
body["data"].get("fieldRules").is_none(),
|
||
"普通详情不该带子表(上游只在 /Detail 聚合体上挂):{}",
|
||
body
|
||
);
|
||
|
||
// 聚合体 ⇒ 带子表
|
||
let resp = crud::detail_aggregate(&state, spec, "R-CHILD-1", Some(&principal())).await;
|
||
let body = body_of(resp).await;
|
||
assert_eq!(body["code"], 200, "聚合详情应成功:{}", body);
|
||
let fields = body["data"]["fieldRules"].as_array().expect("应有 fieldRules 数组");
|
||
assert_eq!(fields.len(), 1, "字段子表条数:{}", body);
|
||
assert_eq!(fields[0]["fieldName"], "phone");
|
||
}
|
||
|
||
/// 🔴 **DeliveryTask 的参与方挂详情 + 列表**(上游 `decorate`),待发队列挂详情。
|
||
#[tokio::test]
|
||
async fn delivery_task_detail_and_list_carry_participants() {
|
||
let state = test_state().await;
|
||
let spec = entity::find("DeliveryTask").unwrap();
|
||
|
||
exec(
|
||
&state,
|
||
"INSERT INTO tdc_delivery_task (f_id, f_task_no, f_contract_id, f_tds_task_id) \
|
||
VALUES (CAST('DT-1' AS character varying), CAST('TASK-CHILD-1' AS character varying), \
|
||
CAST('C-1' AS character varying), CAST('TDS-TASK-1' AS character varying))",
|
||
)
|
||
.await;
|
||
exec(
|
||
&state,
|
||
"INSERT INTO tdc_delivery_task_participant \
|
||
(f_id, f_tds_task_id, f_connector_id, f_role, f_org_name, f_ready_status) \
|
||
VALUES (CAST('DTP-1' AS character varying), CAST('TDS-TASK-1' AS character varying), \
|
||
CAST('CONN-A' AS character varying), CAST('PROVIDER' AS character varying), \
|
||
CAST('提供方机构' AS character varying), CAST('READY' AS character varying))",
|
||
)
|
||
.await;
|
||
exec(
|
||
&state,
|
||
"INSERT INTO tdc_delivery_outbox (id, local_task_id, tds_task_id, event_type, seq) \
|
||
VALUES (CAST('OB-1' AS character varying), CAST('DT-1' AS character varying), \
|
||
CAST('TDS-TASK-1' AS character varying), CAST('TASK_STATE' AS character varying), 1)",
|
||
)
|
||
.await;
|
||
|
||
// 详情 ⇒ 参与方 + 待发队列
|
||
let resp = crud::detail(&state, spec, "DT-1", Some(&principal())).await;
|
||
let body = body_of(resp).await;
|
||
assert_eq!(body["code"], 200, "详情应成功:{}", body);
|
||
let participants = body["data"]["participants"]
|
||
.as_array()
|
||
.expect("应有 participants 数组");
|
||
assert_eq!(participants.len(), 1, "参与方条数:{}", body);
|
||
assert_eq!(participants[0]["connectorId"], "CONN-A");
|
||
assert_eq!(participants[0]["role"], "PROVIDER");
|
||
assert_eq!(participants[0]["orgName"], "提供方机构");
|
||
assert_eq!(participants[0]["readyStatus"], "READY");
|
||
|
||
let outbox = body["data"]["outbox"].as_array().expect("应有 outbox 数组");
|
||
assert_eq!(outbox.len(), 1, "待发队列条数:{}", body);
|
||
assert_eq!(outbox[0]["eventType"], "TASK_STATE");
|
||
assert_eq!(outbox[0]["localTaskId"], "DT-1");
|
||
|
||
// 列表 ⇒ 参与方(批量挂,避免 N+1)
|
||
let params = HashMap::new();
|
||
let resp = crud::list(&state, spec, ¶ms, Some(&principal())).await;
|
||
let body = body_of(resp).await;
|
||
assert_eq!(body["code"], 200, "列表应成功:{}", body);
|
||
let list = body["data"]["list"].as_array().expect("list 应是数组");
|
||
let row = list
|
||
.iter()
|
||
.find(|r| r["id"] == "DT-1")
|
||
.expect("列表里应有 DT-1");
|
||
let participants = row["participants"].as_array().expect("列表行应有 participants");
|
||
assert_eq!(participants.len(), 1, "列表参与方条数:{}", body);
|
||
assert_eq!(participants[0]["connectorId"], "CONN-A");
|
||
}
|
||
|
||
/// 🔴 上游口径:任务**没有平台任务号**时,参与方是**空集合**(`attachParticipants` 挂空)。
|
||
#[tokio::test]
|
||
async fn a_task_without_a_platform_task_id_has_no_participants() {
|
||
let state = test_state().await;
|
||
let spec = entity::find("DeliveryTask").unwrap();
|
||
|
||
exec(
|
||
&state,
|
||
"INSERT INTO tdc_delivery_task (f_id, f_task_no, f_contract_id) \
|
||
VALUES (CAST('DT-NO-TDS' AS character varying), CAST('TASK-NO-TDS' AS character varying), \
|
||
CAST('C-1' AS character varying))",
|
||
)
|
||
.await;
|
||
|
||
let resp = crud::detail(&state, spec, "DT-NO-TDS", Some(&principal())).await;
|
||
let body = body_of(resp).await;
|
||
assert_eq!(body["code"], 200, "详情应成功:{}", body);
|
||
let participants = body["data"]["participants"]
|
||
.as_array()
|
||
.expect("participants 键应存在(空集合)");
|
||
assert!(
|
||
participants.is_empty(),
|
||
"没有平台任务号 ⇒ 参与方应为空集合:{}",
|
||
body
|
||
);
|
||
}
|