fix: complete October 22 workflow feedback and request failure recovery

src/modules/first-leg/store/firstLegDraftCommands.test.mjs

@@ -128,41 +128,25 @@ test('cancelled detail summary has no pending overseas synchronization entries',
   assert.deepEqual(summary, [])
 })
 
-test('edit freezes detail version rather than cached list version and replays same key/body after uncertain result', async t => {
-  const h = harness(t)
-  const original = await h.store.loadDraftDetail('one')
-  const session = h.store.beginDraftEdit(original)
-  h.store.orders = [{ ...original, version: 0 }]
-  h.behavior.failWrite = true
-  await assert.rejects(h.store.saveDraft(h.draft, '测试企业', 'one', session), /响应丢失/)
-  const first = h.calls.find(call => call.method === 'PUT')
-  assert.equal(first.data.expectedVersion, 9)
-  assert.equal(first.data.draft.customerRemark, '原草稿')
-  assert.ok(first.headers['Idempotency-Key'])
-  assert.deepEqual(h.calls.map(call => call.method), ['GET', 'PUT'], 'no pre-save version refresh')
-  h.behavior.failWrite = false; h.behavior.version = 10
-  const result = await h.store.saveDraft(h.draft, '测试企业', 'one', session)
+test('edit preserves the detail version but generates a fresh command after failure', async t => {
+  const h = harness(t), session = h.store.beginDraftEdit(await h.store.loadDraftDetail('one'))
+  h.store.orders = [{ id: 'one', version: 0 }]; h.behavior.failWrite = true
+  await assert.rejects(h.store.saveDraft(h.draft, '客户', 'one', session), /响应丢失/)
+  h.behavior.failWrite = false; h.draft.customerRemark = '已修改'
+  await h.store.saveDraft(h.draft, '客户', 'one', session)
   const writes = h.calls.filter(call => call.method === 'PUT')
-  assert.deepEqual(writes[1], first)
-  assert.deepEqual(h.calls.map(call => call.method), ['GET', 'PUT', 'GET', 'PUT', 'GET'])
-  assert.equal(result.version, 10)
+  assert.equal(writes[0].data.expectedVersion, 9); assert.equal(writes[1].data.draft.customerRemark, '已修改')
+  assert.notEqual(writes[0].headers['Idempotency-Key'], writes[1].headers['Idempotency-Key'])
 })
-
-test('changed retry payload or missing edit session fails closed without issuing a new write', async t => {
-  const h = harness(t)
-  await assert.rejects(h.store.saveDraft(h.draft, '客户', 'one'), /重新打开/)
-  assert.equal(h.calls.length, 0)
-  const session = h.store.beginDraftEdit(await h.store.loadDraftDetail('one'))
-  h.behavior.failWrite = true
+test('missing edit session is invalid while changed inputs after failure are accepted', async t => {
+  const h = harness(t); await assert.rejects(h.store.saveDraft(h.draft, '客户', 'one'), /重新打开/)
+  const session = h.store.beginDraftEdit(await h.store.loadDraftDetail('one')); h.behavior.failWrite = true
   await assert.rejects(h.store.saveDraft(h.draft, '客户', 'one', session))
-  h.draft.customerRemark = '不同内容'
-  await assert.rejects(h.store.saveDraft(h.draft, '客户', 'one', session), /重试原内容/)
-  assert.equal(h.calls.filter(call => call.method === 'PUT').length, 1)
-  assert.equal(session.expectedVersion, 9)
-  assert.ok(Object.isFrozen(session))
+  h.draft.customerRemark = '不同内容'; h.behavior.failWrite = false
+  await h.store.saveDraft(h.draft, '客户', 'one', session)
+  assert.equal(h.calls.filter(call => call.method === 'PUT').length, 2)
 })
-
-test('read failure after successful edit preserves the same command for retry', async t => {
+test('read failure after edit does not retain a frozen request', async t => {
   const h = harness(t)
   const session = h.store.beginDraftEdit(await h.store.loadDraftDetail('one'))
   h.behavior.failRead = true
@@ -170,28 +154,17 @@ test('read failure after successful edit preserves the same command for retry',
   h.behavior.failRead = false
   await h.store.saveDraft(h.draft, '客户', 'one', session)
   const writes = h.calls.filter(call => call.method === 'PUT')
-  assert.deepEqual(writes[0], writes[1])
+  assert.notEqual(writes[0].headers['Idempotency-Key'], writes[1].headers['Idempotency-Key'])
 })
 
-test('cancel forwards version and reason without rejecting submitted orders locally; retry keeps key and body', async t => {
-  const h = harness(t)
-  h.behavior.status = 'SUBMITTED'
-  h.store.orders = [{ id: 'one', status: 'PENDING_REVIEW', version: 0 }]
-  h.behavior.failWrite = true
+test('cancel submits the current version and reason after a previous failure', async t => {
+  const h = harness(t); h.behavior.status = 'SUBMITTED'; h.behavior.failWrite = true
   await assert.rejects(h.store.cancelOrder('one', 12, '客户要求取消'), /响应丢失/)
-  const first = h.calls[0]
-  assert.equal(first.method, 'POST')
-  assert.equal(first.url, '/merchant/v1/orders/first-leg/one/cancel')
-  assert.deepEqual(first.data, { expectedVersion: 12, reason: '客户要求取消' })
-  await assert.rejects(h.store.cancelOrder('one', 13, '其他原因'), /原版本和原因/)
-  assert.equal(h.calls.length, 1)
-  h.behavior.failWrite = false
-  await h.store.cancelOrder('one', 12, '客户要求取消')
-  assert.deepEqual(h.calls[2], first)
-  assert.equal(h.calls[1].method, 'GET')
-  assert.equal(h.store.orders.length, 0)
+  h.behavior.failWrite = false; await h.store.cancelOrder('one', 13, '其他原因')
+  const writes = h.calls.filter(call => call.method === 'POST')
+  assert.equal(writes.length, 2); assert.deepEqual(writes[1].data, { expectedVersion: 13, reason: '其他原因' })
+  assert.notEqual(writes[0].headers['Idempotency-Key'], writes[1].headers['Idempotency-Key'])
 })
-
 test('cancel requires a detail version and a nonempty reason', async t => {
   const h = harness(t)
   await assert.rejects(h.store.cancelOrder('one', undefined, '理由'))
@@ -252,24 +225,13 @@ test('cancel UI uses mandatory-reason centered prompt and refreshes after succes
   assert.deepEqual(h.calls[1], ['cancel', 'one', 12, '客户申请取消'])
 })
 
-test('cancel UI keeps an uncertain command for explicit retry, but conflict requires a fresh decision', async () => {
-  const h = cancellationViewHarness()
-  const order = { id: 'one', status: 'DRAFT' }
-  h.behavior.error = new Error('网络无响应')
-  await h.handler(order)
-  assert.equal(h.pendingCancellation.value.expectedVersion, 12)
-  h.behavior.error = null
-  await h.handler(order)
-  assert.equal(h.prompts.length, 1)
-  assert.equal(h.calls.filter(call => call[0] === 'prepare').length, 1)
-  assert.equal(h.calls.filter(call => call[0] === 'confirm').length, 1)
-  assert.deepEqual(h.calls.filter(call => call[0] === 'cancel')[0], h.calls.filter(call => call[0] === 'cancel')[1])
-  h.behavior.error = new h.ApiError()
-  await h.handler(order)
-  assert.equal(h.pendingCancellation.value, undefined)
-  assert.match(h.messages.at(-1), /刷新订单后重新确认/)
+test('cancel UI releases failure and asks for a current cancellation decision on the next click', async () => {
+  const h = cancellationViewHarness(), order = { id: 'one', status: 'DRAFT' }
+  h.behavior.error = new Error('网络无响应'); await h.handler(order)
+  h.behavior.error = null; await h.handler(order)
+  assert.equal(h.prompts.length, 2); assert.equal(h.calls.filter(call => call[0] === 'prepare').length, 2)
+  assert.equal(h.calls.filter(call => call[0] === 'cancel').length, 2)
 })
-
 test('cancel UI blocks unavailable permission and irreversible visible stages before reads or writes', async () => {
   const h = cancellationViewHarness()
   h.canCancelOrder.value = false
@@ -286,23 +248,14 @@ test('both editor entry points capture detail sessions and both save paths pass
   assert.equal((view.match(/store\.saveDraft(?:ForSubmission)?\(cloneDraft\(form\), tenantStore\.company\.companyName, editingId\.value, editingSession\.value\)/g) ?? []).length, 2)
 })
 
-test('submit reads raw detail version rather than list zero and replays original key and version after timeout', async t => {
-  const h = harness(t)
-  h.store.orders = [{ id: 'one', status: 'DRAFT', version: 0 }]
-  h.behavior.failSubmit = true
+test('submit uses the current raw version and a fresh key after timeout', async t => {
+  const h = harness(t); h.store.orders = [{id:'one',status:'DRAFT',version:0}]; h.behavior.failSubmit = true
   await assert.rejects(h.store.submitSaved('one', 'ACTIVE'), /响应丢失/)
-  const first = h.calls[1]
-  assert.equal(first.url, '/merchant/v1/orders/first-leg/one/submit')
-  assert.deepEqual(first.data, { expectedVersion: 9 })
-  assert.ok(first.headers['Idempotency-Key'])
-  h.behavior.version = 10; h.behavior.status = 'SUBMITTED'; h.behavior.failSubmit = false
-  await h.store.submitSaved('one', 'ACTIVE')
-  assert.deepEqual(h.calls[3], first)
-  assert.deepEqual(h.calls.map(call => call.method), ['GET', 'POST', 'GET', 'POST', 'GET'])
-  assert.equal(h.store.hasPendingSubmission('one'), false)
+  h.behavior.version = 10; h.behavior.failSubmit = false; await h.store.submitSaved('one', 'ACTIVE')
+  const writes = h.calls.filter(call => call.url.endsWith('/submit'))
+  assert.deepEqual(writes.map(call => call.data.expectedVersion), [9,10]); assert.notEqual(writes[0].headers['Idempotency-Key'],writes[1].headers['Idempotency-Key'])
 })
-
-test('submit refuses missing version or non-draft first decision and preserves command after failed readback', async t => {
+test('submit validates current status and releases failure after readback', async t => {
   const h = harness(t)
   for (const version of [undefined, -1, 1.5]) {
     h.behavior.version = version
@@ -313,49 +266,25 @@ test('submit refuses missing version or non-draft first decision and preserves c
   assert.ok(h.calls.every(call => call.method === 'GET'))
   h.behavior.status = 'DRAFT'; h.behavior.failSubmitRead = true
   await assert.rejects(h.store.submitSaved('one'), /读取失败/)
-  assert.equal(h.store.hasPendingSubmission('one'), true)
   h.behavior.failRead = false; h.behavior.failSubmitRead = false
   await h.store.submitSaved('one')
   const posts = h.calls.filter(call => call.method === 'POST')
-  assert.deepEqual(posts[0], posts[1])
+  assert.notEqual(posts[0].headers['Idempotency-Key'], posts[1].headers['Idempotency-Key'])
   assert.deepEqual(posts[0].data, { expectedVersion: 0 }, 'raw detail zero is valid')
 })
 
-test('save then submit retries without another save and changed form requires an explicit new decision', async t => {
-  const h = harness(t)
-  const session = h.store.beginDraftEdit(await h.store.loadDraftDetail('one'))
-  await h.store.saveDraftForSubmission(h.draft, '客户', 'one', session)
-  h.behavior.failSubmit = true
-  await assert.rejects(h.store.submitSaved('one'))
-  const first = h.calls.find(call => call.url.endsWith('/submit'))
-  await h.store.saveDraftForSubmission(h.draft, '客户', 'one', session)
-  assert.equal(h.calls.filter(call => call.method === 'PUT').length, 1)
-  h.draft.customerRemark = '新决定'
-  await assert.rejects(h.store.saveDraftForSubmission(h.draft, '客户', 'one', session), /重新编辑/)
-  h.behavior.status = 'SUBMITTED'
-  await assert.rejects(h.store.beginNewSubmissionEdit('one'), /不能重新编辑/)
-  assert.equal(h.store.hasPendingSubmission('one'), true)
-  h.behavior.status = 'DRAFT'; h.behavior.version = 12
-  const newSession = await h.store.beginNewSubmissionEdit('one')
-  assert.equal(newSession.expectedVersion, 12)
-  await h.store.saveDraftForSubmission(h.draft, '客户', 'one', newSession)
-  h.behavior.version = 13; h.behavior.failSubmit = false
-  await h.store.submitSaved('one')
-  const posts = h.calls.filter(call => call.url.endsWith('/submit'))
-  assert.notEqual(posts[1].headers['Idempotency-Key'], first.headers['Idempotency-Key'])
-  assert.deepEqual(posts[1].data, { expectedVersion: 13 })
+test('failed submit leaves the draft editable for a fresh save and submission', async t => {
+  const h = harness(t), session = h.store.beginDraftEdit(await h.store.loadDraftDetail('one'))
+  await h.store.saveDraft(h.draft, '客户', 'one', session); h.behavior.failSubmit = true
+  await assert.rejects(h.store.submitSaved('one')); h.draft.customerRemark = '新内容'
+  await h.store.saveDraft(h.draft, '客户', 'one', session); h.behavior.failSubmit = false
+  await h.store.submitSaved('one'); assert.equal(h.calls.filter(call => call.method === 'PUT').length, 2)
 })
-
-test('failed initial submit read does not resave the prepared draft on retry', async t => {
-  const h = harness(t)
-  const session = h.store.beginDraftEdit(await h.store.loadDraftDetail('one'))
-  await h.store.saveDraftForSubmission(h.draft, '客户', 'one', session)
-  h.behavior.failRead = true
-  await assert.rejects(h.store.submitSaved('one'))
-  await h.store.saveDraftForSubmission(h.draft, '客户', 'one', session)
-  assert.equal(h.calls.filter(call => call.method === 'PUT').length, 1)
+test('failed initial submit read releases the submission guard for the next click', async t => {
+  const h = harness(t); h.behavior.failRead = true; await assert.rejects(h.store.submitSaved('one'))
+  h.behavior.failRead = false; await h.store.submitSaved('one')
+  assert.equal(h.calls.filter(call => call.url.endsWith('/submit')).length, 1)
 })
-
 async function submissionViewHarness(t) {
   const h = harness(t)
   const source = readFileSync(new URL('../views/FirstLegOrdersView.vue', import.meta.url), 'utf8').match(/<script setup lang="ts">([\s\S]*?)<\/script>/)[1]
@@ -377,56 +306,29 @@ async function submissionViewHarness(t) {
   return { ...h, ...handlers, globals, messages, confirmations }
 }
 
-test('real editor submit handler retries original submission without PUT and requires confirmation for changed form', async t => {
-  const h = await submissionViewHarness(t)
-  h.behavior.failSubmit = true
-  await h.submitOrder()
-  await h.submitOrder()
-  assert.equal(h.calls.filter(call => call.method === 'PUT').length, 1)
-  const posts = h.calls.filter(call => call.url.endsWith('/submit'))
-  assert.deepEqual(posts[0], posts[1])
-  h.draft.customerRemark = '修改后的决定'
-  h.behavior.cancelConfirm = true
-  await h.submitOrder()
-  assert.equal(h.confirmations.length, 1)
-  assert.equal(h.calls.filter(call => call.method === 'PUT').length, 1)
-  h.behavior.cancelConfirm = false; h.behavior.failSubmit = false; h.behavior.version = 12
-  await h.submitOrder()
-  assert.equal(h.confirmations.length, 2)
-  assert.equal(h.calls.filter(call => call.method === 'PUT').length, 2)
-  const last = h.calls.filter(call => call.url.endsWith('/submit')).at(-1)
-  assert.deepEqual(last.data, { expectedVersion: 12 })
-  assert.notEqual(last.headers['Idempotency-Key'], posts[0].headers['Idempotency-Key'])
-  assert.equal(h.globals.saving.value, false)
+test('real editor releases failure and saves current edited input on another click', async t => {
+  const h = await submissionViewHarness(t); h.behavior.failSubmit = true
+  await h.submitOrder(); assert.equal(h.globals.saving.value, false)
+  h.draft.customerRemark = '修改后的决定'; h.behavior.failSubmit = false; await h.submitOrder()
+  const writes = h.calls.filter(call => call.method === 'PUT'), posts = h.calls.filter(call => call.url.endsWith('/submit'))
+  assert.equal(writes.length, 2); assert.equal(writes[1].data.draft.customerRemark, '修改后的决定')
+  assert.notEqual(posts[0].headers['Idempotency-Key'], posts[1].headers['Idempotency-Key']); assert.equal(h.globals.saving.value, false)
 })
-
-test('real batch handler retains uncertain IDs across list refresh and retries original commands even if now submitted', async t => {
-  const h = await submissionViewHarness(t)
-  h.behavior.failSubmit = true
-  await h.submitSelectedDraftOrders()
-  assert.deepEqual(h.globals.pendingBatchSubmissionIds.value, ['one'])
-  assert.deepEqual(h.globals.selectedDraftOrders.value, [])
-  h.behavior.failSubmit = false; h.behavior.status = 'SUBMITTED'; h.behavior.version = 10
-  await h.submitSelectedDraftOrders()
+test('real batch handler uses only current selection after a failed batch', async t => {
+  const h = await submissionViewHarness(t); h.behavior.failSubmit = true
+  await h.submitSelectedDraftOrders(); assert.equal(h.globals.batchSubmitting.value, false)
+  h.behavior.failSubmit = false; await h.submitSelectedDraftOrders()
+  assert.equal(h.calls.filter(call => call.url.endsWith('/submit')).length, 1)
+  h.globals.selectedDraftOrders.value = [{id:'one',version:9}]; await h.submitSelectedDraftOrders()
   const posts = h.calls.filter(call => call.url.endsWith('/submit'))
-  assert.equal(posts.length, 2)
-  assert.deepEqual(posts[1], posts[0])
-  assert.deepEqual(posts[0].data, { expectedVersion: 9 })
-  assert.deepEqual(h.globals.pendingBatchSubmissionIds.value, [])
-  assert.equal(h.globals.batchSubmitting.value, false)
+  assert.equal(posts.length, 2); assert.notEqual(posts[0].headers['Idempotency-Key'], posts[1].headers['Idempotency-Key'])
 })
-
-test('real new-order handler creates once and retries the saved order submission with the original version', async t => {
-  const h = await submissionViewHarness(t)
-  h.globals.editingId.value = undefined; h.globals.editingSession.value = undefined
-  h.behavior.version = 0; h.behavior.failSubmit = true
-  await h.submitOrder()
-  assert.equal(h.globals.editingId.value, 'one')
-  h.behavior.version = 1; h.behavior.status = 'SUBMITTED'; h.behavior.failSubmit = false
+test('real new-order handler retains the created order and saves current edits after submit failure', async t => {
+  const h = await submissionViewHarness(t); h.globals.editingId.value = undefined; h.globals.editingSession.value = undefined
+  h.behavior.version = 0; h.behavior.failSubmit = true; await h.submitOrder()
+  assert.equal(h.globals.editingId.value, 'one'); h.behavior.failSubmit = false; h.draft.customerRemark = '修改'
   await h.submitOrder()
   assert.equal(h.calls.filter(call => call.method === 'POST' && call.url === '/merchant/v1/orders/first-leg').length, 1)
-  assert.equal(h.calls.filter(call => call.method === 'PUT').length, 0)
-  const posts = h.calls.filter(call => call.url.endsWith('/submit'))
-  assert.deepEqual(posts[0], posts[1])
-  assert.deepEqual(posts[0].data, { expectedVersion: 0 })
-})
+  assert.equal(h.calls.filter(call => call.method === 'PUT').length, 1)
+  assert.equal(h.calls.filter(call => call.url.endsWith('/submit')).length, 2)
+})