优化

scripts/admin-test-env-modules/ocean-bookings.mjs

@@ -1,7 +1,7 @@
 const MODULE = 'ocean-bookings'
 const OPTIONS = { scenario: 'ocean-booking-lifecycle', deploymentBlocker: true }
 const BASE = '/api/platform/v1/ocean-bookings'
-import { resolveOceanBookingMaster, oceanBookingDraft } from './ocean-booking-fixture.mjs'
+import { oceanBookingDraft, oceanBookingDraftWithoutCustomer, resolveOceanBookingMaster } from './ocean-booking-fixture.mjs'
 
 function id(value) { return value == null ? '' : String(value) }
 function codeOf(r) { return r?.body?.code == null ? 'missing' : String(r.body.code) }
@@ -19,6 +19,50 @@ function data(r) { return String(r?.body?.code) === '200' ? r.body.data : null }
 async function createBooking(context, suffix, key, master) { return request(context, 'POST', BASE, { expectedVersion: 0, data: oceanBookingDraft(context, suffix, master) }, { 'Idempotency-Key': key }) }
 function step(context, name, r, pass, evidence, options = OPTIONS) { context.addStep(MODULE, name, r, pass, evidence, { ...options, deploymentBlocker: options.deploymentBlocker && !pass }) }
 
+async function createConfirmedUnassignedBooking(context, suffix, master) {
+  const draft = oceanBookingDraftWithoutCustomer(context, `${suffix}U`, master)
+  const key = `${context.marker}-ocean-unassigned-create`.slice(0, 128)
+  const createdResponse = await request(context, 'POST', BASE, { expectedVersion: 0, data: draft }, { 'Idempotency-Key': key })
+  const created = data(createdResponse)
+  const bookingId = id(created?.oceanBooking?.id)
+  context.apiSuccess(MODULE, '创建未指定客户订舱', createdResponse,
+    `marker=${context.marker}, customerFields=${'customerId' in draft || 'customerName' in draft ? 'present' : 'omitted'}`, OPTIONS)
+  context.assert(MODULE, '未指定客户订舱不伪造客户快照', createdResponse,
+    Boolean(bookingId) && created?.oceanBooking?.customerId == null && created?.oceanBooking?.customerName == null,
+    `bookingId=${bookingId || 'missing'}, customerId=${id(created?.oceanBooking?.customerId) || 'null'}, customerName=${created?.oceanBooking?.customerName || 'null'}`, OPTIONS)
+  if (!bookingId) return null
+
+  const path = `${BASE}/${bookingId}`
+  const submitResponse = await request(context, 'POST', `${path}/submit`, {
+    expectedVersion: Number(created.oceanBooking.version), reason: context.marker,
+  }, { 'Idempotency-Key': `${context.marker}-ocean-unassigned-submit`.slice(0, 128) })
+  const submitted = context.apiSuccess(MODULE, '提交未指定客户订舱', submitResponse, '', OPTIONS)
+  const confirmResponse = await request(context, 'POST', `${path}/confirm`, {
+    expectedVersion: Number(submitted?.oceanBooking?.version), reason: context.marker,
+  }, { 'Idempotency-Key': `${context.marker}-ocean-unassigned-confirm`.slice(0, 128) })
+  context.apiSuccess(MODULE, '确认未指定客户订舱并生成柜次', confirmResponse, '', OPTIONS)
+
+  const detailResponse = await request(context, 'GET', path)
+  const detail = context.apiSuccess(MODULE, '回查未指定客户订舱持久化结果', detailResponse, '', OPTIONS)
+  const containerBookingId = id(detail?.containerAllocations?.[0]?.containerBookingId)
+  const bookingNo = id(detail?.oceanBooking?.bookingNo || created?.oceanBooking?.bookingNo)
+  context.assert(MODULE, '未指定客户订舱保持空客户并在 CONFIRMED 生成稳定柜次', detailResponse,
+    detail?.oceanBooking?.status === 'CONFIRMED' && detail?.oceanBooking?.customerId == null
+      && detail?.oceanBooking?.customerName == null && Boolean(containerBookingId) && Boolean(bookingNo),
+    `status=${detail?.oceanBooking?.status || 'missing'}, customerId=${id(detail?.oceanBooking?.customerId) || 'null'}, bookingNo=${bookingNo || 'missing'}, containerBookingId=${containerBookingId || 'missing'}`, OPTIONS)
+
+  const listResponse = await request(context, 'GET', `${BASE}?page=1&size=20&keyword=${encodeURIComponent(bookingNo)}`)
+  const page = context.apiSuccess(MODULE, '按真实订舱号查询未指定客户订舱', listResponse, `bookingNo=${bookingNo}`, OPTIONS)
+  context.assert(MODULE, '未指定客户订舱可按真实订舱号从正式列表查询', listResponse,
+    page?.records?.some?.((item) => id(item.id) === bookingId && item.customerId == null && item.customerName == null),
+    `bookingId=${bookingId}, bookingNo=${bookingNo}, records=${page?.records?.length ?? 'n/a'}`, OPTIONS)
+  const resource = { id: bookingId, marker: context.marker, customerId: null, customerName: null,
+    bookingNo, channelCode: draft.channelCode, warehouseId: draft.warehouseId, containerBookingId,
+    finalStatus: detail?.oceanBooking?.status || null }
+  context.createdResources.oceanBookingUnassignedCustomer = resource
+  return resource
+}
+
 async function releaseLoadingBooking(context, containerFlow, suffix) {
   const flowOceanBookingId = id(containerFlow?.oceanBookingId)
   if (!flowOceanBookingId || !id(containerFlow?.containerBookingId) || !id(containerFlow?.loadingPlanId)) return null
@@ -68,21 +112,26 @@ export async function run(context) {
   }
   const master = await resolveOceanBookingMaster(context, MODULE)
   if (!master) return
-  const list = await request(context, 'GET', `${BASE}?page=1&size=5&keyword=${encodeURIComponent(context.marker)}`)
+  const list = await request(context, 'GET', `${BASE}?page=1&size=5`)
   if (missing(list) || list.http === 0) {
     step(context, '海运订舱服务契约已部署', list, false, `入口 ${BASE} 不可用：HTTP=${list.http}, code=${codeOf(list)}`)
     return
   }
-  const page = context.apiSuccess(MODULE, '订舱列表分页与 keyword 查询', list, '', OPTIONS)
+  const page = context.apiSuccess(MODULE, '订舱列表分页查询', list, '', OPTIONS)
   context.assert(MODULE, '订舱列表分页结构正确', list, Array.isArray(page?.records) && Number.isFinite(Number(page?.total)), `records=${page?.records?.length ?? 'n/a'}`, OPTIONS)
   const statuses = ['DRAFT', 'SUBMITTED', 'CONFIRMED', 'RELEASED', 'FAILED', 'CANCELLED']
   for (const status of statuses) { const r = await request(context, 'GET', `${BASE}?page=1&size=5&status=${status}`); const d = data(r); step(context, `订舱 ${status} 状态筛选`, r, r.http === 200 && codeOf(r) === '200' && Array.isArray(d?.records) && d.records.every((x) => x.status === status), `HTTP=${r.http}, code=${codeOf(r)}, records=${d?.records?.length ?? 'n/a'}`) }
 
+  await createConfirmedUnassignedBooking(context, suffix, master)
+
   const key = `${context.marker}-ocean-create`
   const createResponse = await createBooking(context, suffix, key, master)
   const detail = data(createResponse); const bookingId = id(detail?.oceanBooking?.id)
   context.apiSuccess(MODULE, '创建隔离海运订舱', createResponse, `key=${key}`, OPTIONS)
   context.assert(MODULE, '订舱 DTO 字段、DRAFT 和9类关联字段完整', createResponse, Boolean(bookingId) && detail?.oceanBooking?.status === 'DRAFT' && detail?.parties?.length === 3 && detail?.containerRequirements?.length === 1, `bookingId=${bookingId || 'missing'}, parties=${detail?.parties?.length ?? 'n/a'}, requirements=${detail?.containerRequirements?.length ?? 'n/a'}`, OPTIONS)
+  context.assert(MODULE, '指定客户订舱持久化本轮客户范围快照', createResponse,
+    id(detail?.oceanBooking?.customerId) === id(master.customerId) && detail?.oceanBooking?.customerName === master.customerName,
+    `expectedCustomerId=${id(master.customerId)}, actualCustomerId=${id(detail?.oceanBooking?.customerId) || 'missing'}`, OPTIONS)
   if (!bookingId) return
   context.createdResources.oceanBooking = { id: bookingId, customerId: master.customerId, marker: context.marker,
     containerBookingId: null, loadingPlanId: null, finalStatus: 'DRAFT' }