feat(invoices): draft invoice delete on v1 and MCP with staged approval (#2036)
* feat(invoices): draft invoice delete on v1 and MCP with staged approval
Draft customer-invoice deletion was web-only. This makes the same
semantics available on the v1 API-key surface and as an MCP write tool:
unnumbered drafts are hard deleted (no F-series number was consumed, so
no gap arises), numbered drafts are makulerade (status 'cancelled',
number retained so the F-series stays gap-free per ML 17 kap 24 and
BFNAR 2013:2). Non-drafts are refused; posted invoices can only be
reversed via a credit note.
- extract the web DELETE logic into lib/invoices/delete-draft-invoice.ts
with an explicit userId param (service-role clients null auth.uid());
the cookie route behavior is unchanged
- add DELETE /api/v1/companies/{companyId}/invoices/{id}: 409
INVOICE_DELETE_NOT_DRAFT for non-drafts (status override; the cookie
route keeps its 400), 404 generic NOT_FOUND, dry-run preview of the
outcome, mandatory Idempotency-Key; scope invoices:write
- fix the stale v1 PATCH pitfall that claimed a DELETE handler existed
- new MCP tool gnubok_delete_draft_invoice: staged operation requiring
approval, risk 'high' (both outcomes irreversible, never
auto-committed), catalogVisibility 'search' (tools/list budget at zero
headroom)
- delete_draft_invoice commit executor delegating to the shared service,
plus pending_operations CHECK constraint migration pair
(20260830100000/100001), risk tier, scope map, Granskning vocabulary
and sv/en labels
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NtvffGr6uVk2J2Skuz6L98
* fix(migrations): renumber delete_draft_invoice pair after 20260830101500 on main
Merging origin/main brought 20260830101500_seed_agent_atom_bodies; the
constraint pair must sort after every version already on main so it
never applies out of order at merge time.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NtvffGr6uVk2J2Skuz6L98
* docs(api-skill): regenerate accounted-api skill for the new invoices.delete endpoint
apiskill:check failed on CI: registering DELETE /invoices/{id} makes the
generated skills/accounted-api docs stale. Output of npm run
apiskill:generate, no hand edits.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NtvffGr6uVk2J2Skuz6L98
* fix(invoices): pin staged delete outcome and align v1 risk metadata
Skeptic findings on PR #2036:
- Outcome pin: gnubok_delete_draft_invoice stages
expected_invoice_number alongside invoice_id; the executor passes it to
deleteDraftInvoice, which refuses with INVOICE_CANCEL_RACE when the
draft's number changed since staging. An unnumbered draft finalized
between staging and approval is now auto-rejected with a message naming
the new number, instead of silently switching from the approved hard
delete to a makulering. Ops staged without the pin keep legacy
semantics; single-phase callers (web, v1) are unaffected.
- v1 invoices.delete registerEndpoint risk raised medium -> high to match
the delete_draft_invoice pending-op tier (both outcomes irreversible);
generated accounted-api docs regenerated.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NtvffGr6uVk2J2Skuz6L98
* fix(migrations): renumber delete_draft_invoice pair after skattekonto collision
Merging origin/main brought PR #2039's 20260830130000/130001 pair, which
collides with this branch's versions AND re-creates the same
pending_operations CHECK wholesale. Renumber to 20260830150000/150001 and
rebuild the value list as a strict superset (skattekonto list plus
delete_draft_invoice) so applying last revokes nothing.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NtvffGr6uVk2J2Skuz6L98
---------
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Fable 5
parent
32cb8a22ce
commit
9f8fa1b692
@@ -0,0 +1,172 @@
|
||||
/**
|
||||
* Draft customer-invoice deletion, shared by the cookie-session route
|
||||
* (DELETE /api/invoices/[id]), the v1 API-key route
|
||||
* (DELETE /api/v1/companies/{companyId}/invoices/{id}) and the MCP
|
||||
* delete_draft_invoice executor.
|
||||
*
|
||||
* Behaviour depends on whether an F-series number was issued:
|
||||
*
|
||||
* - Unnumbered draft (saved via "Spara som utkast", never finalized): hard
|
||||
* deleted. No F-series number was consumed, so there is no gap to document
|
||||
* (ML 17 kap 24 paragraf). invoice_items cascade via the FK.
|
||||
* - Numbered draft (created directly, or finalized via "Granska och skapa"):
|
||||
* makulerad: the row and its number are retained and status flips to
|
||||
* 'cancelled', keeping the F-series gap-free per ML 17 kap 24 paragraf /
|
||||
* BFNAR 2013:2.
|
||||
*
|
||||
* Only drafts may be removed either way. Sent / paid invoices are immutable
|
||||
* per BFL and must be reversed via a credit note instead. Posted journal
|
||||
* entries and documents linked to them are never touched here: a draft has
|
||||
* neither.
|
||||
*
|
||||
* The actor is an EXPLICIT parameter: v1 and MCP callers run on the
|
||||
* service-role client, where auth.uid() is null, so the caller's user id can
|
||||
* never be inferred from the client.
|
||||
*/
|
||||
|
||||
import type { SupabaseClient } from '@supabase/supabase-js'
|
||||
import { eventBus } from '@/lib/events'
|
||||
import type { Logger } from '@/lib/logger'
|
||||
|
||||
export type DeleteDraftInvoiceResult =
|
||||
/** Unnumbered draft hard-deleted; invoice.draft_deleted event emitted. */
|
||||
| { ok: true; outcome: 'deleted' }
|
||||
/** Numbered draft makulerad (status -> 'cancelled'), number retained. */
|
||||
| { ok: true; outcome: 'cancelled'; invoiceNumber: string }
|
||||
| { ok: false; code: 'INVOICE_NOT_FOUND' }
|
||||
| { ok: false; code: 'INVOICE_DELETE_NOT_DRAFT'; currentStatus: string }
|
||||
/**
|
||||
* Status flipped between fetch and write (concurrent send/finalize), or the
|
||||
* caller pinned expectedInvoiceNumber and the number changed since then
|
||||
* (currentInvoiceNumber then carries what the draft holds now).
|
||||
*/
|
||||
| { ok: false; code: 'INVOICE_CANCEL_RACE'; currentInvoiceNumber?: string | null }
|
||||
| { ok: false; code: 'INVOICE_DELETE_FAILED'; cause: { message: string; code?: string } }
|
||||
|
||||
export interface DeleteDraftInvoiceParams {
|
||||
supabase: SupabaseClient
|
||||
companyId: string
|
||||
/**
|
||||
* Acting user's id, recorded on the invoice.draft_deleted audit event.
|
||||
* Passed explicitly: service-role clients null auth.uid().
|
||||
*/
|
||||
userId: string
|
||||
invoiceId: string
|
||||
/**
|
||||
* Outcome pin for two-phase callers (stage now, execute after approval):
|
||||
* the invoice_number observed at staging time (null for an unnumbered
|
||||
* draft). When provided and the draft's number has changed since (an
|
||||
* unnumbered draft was finalized), the call refuses with
|
||||
* INVOICE_CANCEL_RACE instead of silently switching from the approved hard
|
||||
* delete to a makulering. Omit (undefined) for single-phase callers (web,
|
||||
* v1): they act on the state they just read.
|
||||
*/
|
||||
expectedInvoiceNumber?: string | null
|
||||
log?: Logger
|
||||
}
|
||||
|
||||
export async function deleteDraftInvoice(
|
||||
params: DeleteDraftInvoiceParams,
|
||||
): Promise<DeleteDraftInvoiceResult> {
|
||||
const { supabase, companyId, userId, invoiceId, expectedInvoiceNumber, log } = params
|
||||
|
||||
const { data: invoice, error: fetchError } = await supabase
|
||||
.from('invoices')
|
||||
.select('id, status, invoice_number, user_id, credited_invoice_id, journal_entry_id')
|
||||
.eq('id', invoiceId)
|
||||
.eq('company_id', companyId)
|
||||
.single()
|
||||
|
||||
if (fetchError || !invoice) {
|
||||
return { ok: false, code: 'INVOICE_NOT_FOUND' }
|
||||
}
|
||||
|
||||
if (invoice.status !== 'draft') {
|
||||
return { ok: false, code: 'INVOICE_DELETE_NOT_DRAFT', currentStatus: invoice.status }
|
||||
}
|
||||
|
||||
// Outcome pin: a two-phase caller approved a SPECIFIC outcome (hard delete
|
||||
// for unnumbered, makulering of one number for numbered). If the number
|
||||
// changed between staging and now (unnumbered draft finalized), the
|
||||
// approved outcome no longer applies: refuse rather than switch paths.
|
||||
// The unnumbered -> numbered transition is the only reachable change
|
||||
// (numbers are never reassigned), and the write guards below still cover
|
||||
// a flip inside this call.
|
||||
const currentNumber = invoice.invoice_number ?? null
|
||||
if (expectedInvoiceNumber !== undefined && currentNumber !== expectedInvoiceNumber) {
|
||||
return { ok: false, code: 'INVOICE_CANCEL_RACE', currentInvoiceNumber: currentNumber }
|
||||
}
|
||||
|
||||
// Unnumbered drafts (saved via "Spara som utkast", never finalized) are not
|
||||
// yet issued invoices (no F-series number was consumed) so they can be hard
|
||||
// deleted with no gap in the sequence (ML 17 kap 24 paragraf). invoice_items
|
||||
// cascade via the FK (ON DELETE CASCADE); an un-finalized draft has no
|
||||
// journal entry or linked document. The status='draft' + invoice_number IS
|
||||
// NULL guard makes the delete a no-op if the row was finalized (numbered)
|
||||
// concurrently.
|
||||
if (!invoice.invoice_number) {
|
||||
const { data: removed, error: removeError } = await supabase
|
||||
.from('invoices')
|
||||
.delete()
|
||||
.eq('id', invoiceId)
|
||||
.eq('company_id', companyId)
|
||||
.eq('status', 'draft')
|
||||
.is('invoice_number', null)
|
||||
.select('id')
|
||||
|
||||
if (removeError) {
|
||||
log?.error('invoice draft delete failed', removeError)
|
||||
return {
|
||||
ok: false,
|
||||
code: 'INVOICE_DELETE_FAILED',
|
||||
cause: { message: removeError.message, code: removeError.code },
|
||||
}
|
||||
}
|
||||
|
||||
if (!removed || removed.length === 0) {
|
||||
// Finalized between fetch and delete: refuse rather than fall through to
|
||||
// makulering of a now-issued invoice.
|
||||
return { ok: false, code: 'INVOICE_CANCEL_RACE' }
|
||||
}
|
||||
|
||||
// The row is gone, so there's no journal trace of the removal. Emit an
|
||||
// audit event carrying the identifiers so the event log records who
|
||||
// deleted which draft and when: the makulering path leaves a
|
||||
// journal/status trail, a hard delete otherwise leaves none.
|
||||
await eventBus.emit({
|
||||
type: 'invoice.draft_deleted',
|
||||
payload: { invoiceId, companyId, userId },
|
||||
})
|
||||
|
||||
return { ok: true, outcome: 'deleted' }
|
||||
}
|
||||
|
||||
// Numbered draft: retain the row and its number, flip to 'cancelled'
|
||||
// (makulering) so the F-series stays gap-free.
|
||||
// .select() returns the affected rows so we can detect a TOCTOU race where
|
||||
// the status flipped between the fetch above and this update. With only the
|
||||
// .eq('status','draft') guard, a 0-row update returns success and the caller
|
||||
// would see "Makulerad" while the invoice is still in its previous state.
|
||||
const { data: updated, error: cancelError } = await supabase
|
||||
.from('invoices')
|
||||
.update({ status: 'cancelled', updated_at: new Date().toISOString() })
|
||||
.eq('id', invoiceId)
|
||||
.eq('company_id', companyId)
|
||||
.eq('status', 'draft')
|
||||
.select('id')
|
||||
|
||||
if (cancelError) {
|
||||
log?.error('invoice cancellation failed', cancelError)
|
||||
return {
|
||||
ok: false,
|
||||
code: 'INVOICE_DELETE_FAILED',
|
||||
cause: { message: cancelError.message, code: cancelError.code },
|
||||
}
|
||||
}
|
||||
|
||||
if (!updated || updated.length === 0) {
|
||||
return { ok: false, code: 'INVOICE_CANCEL_RACE' }
|
||||
}
|
||||
|
||||
return { ok: true, outcome: 'cancelled', invoiceNumber: invoice.invoice_number }
|
||||
}
|
||||
Reference in New Issue
Block a user