Fix/skv connection flow (#1015)
* feat(salary): one-click AGI submission with filing state machine and success feedback The AGI panel required users to know that "Ladda ner AGI-fil" was the generate step, then click submit, signing link, and kvittens manually. A nollkorning filing stalled on "AGI-XML saknas" pointing at a UI path that does not exist. - New primary button "Lamna in till Skatteverket" chains the existing endpoints client-side: generate XML if missing, POST underlag, poll kontrollresultat, create signing link, open Mina Sidor in a tab opened synchronously at click (popup-blocker safe). Inline stepper shows each step; the four old buttons become collapsed advanced/recovery actions, auto-expanded in stale-draft and rejected states. XML download stays visible and free for manual filing. - deriveAgiFilingState() + useAgiSubmission() lift the per-period submission record to the run page: the progress rail and salary hero now render the real state machine (generated, underlag inskickat, vantar pa BankID-signatur, inlamnad med kvittensnummer) instead of telling users to "lamna in" an already-submitted declaration. - Success card with kvittensnummer and signature metadata once signed, plus a toast when a poll flips the state while the page is open. - AGI kvittens cron every 15 min instead of every 2 h so filings signed on another device get stamped and emailed promptly. - Advanced submit also auto-generates, and the stale "Lon -> AGI -> Generera" error text now points at the real buttons. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(enable-banking): instant OAuth callback feedback and dead-attempt cleanup The bank redirect landed on a blank page for the several seconds the callback spent exchanging the PSD2 session and mirroring accounts, and every failed connect attempt left a status='error' row that rendered forever as an "Atgard kravs" card next to a successful retry, showing duplicate connections to the same bank. - Stream a branded "Slutfor bankanslutningen" progress page from the callback: the shell flushes before the session exchange starts and a script/meta redirect follows when the work completes, with a 30s slow-work escape hatch. Fast outcomes (denial, bad params, unknown state) keep their plain redirects. - Delete never-activated connection rows (no session_id, no accounts_data) on denial or exchange failure, and sweep leftovers for the same bank on the next connect. Established connections keep their "Atgard krävs" card via the accounts_data guard; FKs are ON DELETE SET NULL so deletion has no dependents. - Show "Banken ar ansluten: hamtar dina konton" while the settings panel loads after the callback instead of an anonymous spinner. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(invoices): reject re-send of issued invoices and gate bookkeeping on the sent flip A direct POST to /api/invoices/[id]/send against an already-issued invoice re-emailed the customer and posted a second revenue verifikat (createInvoiceJournalEntry has no dedup), overwriting journal_entry_id and orphaning the first entry. Only the UI hid the button; the v1 route and the MCP commit executor already rejected non-drafts. - Non-draft invoices now return 409 INVOICE_ALREADY_SENT. - The draft to sent status flip is an optimistic lock (status guard plus row-count check); journal entry, accrual schedules, PDF archival and the invoice.sent event only run for the request that won the flip. - On a flip failure the journal entry is deferred: the row stays draft and a retry re-runs the pipeline, ending with exactly one verifikat. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(invoices): payment links, failure visibility and sandbox guard for recurring auto-send - sendInvoiceFromSchedule now auto-creates an online payment link via applyPaymentLinkToInvoice before rendering and passes the payment link QR to the PDF: parity with the dashboard and v1 send routes, which recurring invoices silently lacked. - The recurring cron persists last_run_warning both when a claimed run throws (hourly retries stay visible on the schedule) and when a stale schedule is rolled forward, so a deterministic failure can no longer skip a month silently. - Auto-send is blocked for sandbox companies at the email chokepoint (freeze-and-retain: the invoice is still generated as a draft), covering both the cron and the run-now route with one guard. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(salary): close the Fortnox payroll API gaps (phases 1-4) Payroll now runs end-to-end through the open API, including onboarding a client from another payroll system, with every write staged for approval. - v1: per-employee payslips (list/detail/PDF), payslip line writes, run roster attach/remove, absence ranges (per-day storage), jamkning fields, cutover opening balances (single + atomic bulk PUT), vacation balance + vacation-year-close. PUT added to the wrapper's idempotency/ test-key set (test keys could otherwise write through PUT). - MCP: 10 new tools (get_employee/get_payslip/list_absence/ get_vacation_balance reads + staged update_payslip_line, register_absence, create_employee, update_employee, set_employee_opening_balances, close_vacation_year), executors, risk tiers, op-type CHECK expansions. create_employee encrypts personnummer at staging: pending_operations never holds plaintext. - Scope-map audit retrofit: 11 formerly unmapped tools now scoped; BREAKING for keys that relied on the 4 default-allow writes. - Cutover: employee_opening_balances (derived lock trigger, self-unlocks on run correction), engine YTD/karens/liability integration, Ingaende saldon section in the employee editor. - Arbetsschema-lite: employees.hours_per_week/workdays_per_week drive the hourly/daily divisors; legacy 173/21 preserved exactly at defaults so existing pay math is byte-identical. - Vacation ledger + semesterberedning/arsavslut: recomputed per-year day balances (synced on book/correct, non-fatal), year-close with the min-20 floor, 5-year sparade-dagar expiry to forced payout, and a 2920/2940 drift adjustment via the bookkeeping engine; Semester dashboard card with preview-then-confirm dialog. - Fix: Zod 4 defaults leak through .partial(), which made every sparse employee PATCH fail validation and reset defaulted columns. Migrations 20260713100000/101000/110000/121000/122000 (applied to staging with version rows; prod via merge). vacation_ledger renamed from 20260713120000 to avoid colliding with vat_declaration_totals_rpc. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * perf: cut dashboard page-load latency (region, round trips, caching, VAT RPC) The dominant cost was infrastructure: Vercel functions ran in iad1 (Washington D.C.) while Supabase (DB + auth) lives in eu-north-1 (Stockholm), so every request paid 4-5 transatlantic round trips of auth + company resolution before doing any real work (measured 530-1900ms for single-query GETs in prod logs). Pin functions to arn1 and cut the redundant work on top: - vercel.json: functions to arn1, same city as the database - getActiveCompanyId: preference + first-membership queries run in parallel; the fallback result doubles as validation in the common single-company case (one round trip instead of two sequential) - withRouteContext: Server-Timing header and authMs/companyMs/handlerMs in the op-completed log, so latency is attributable per phase - dashboard layout: nav badge counts off the critical path; DashboardNav loads them client-side via the new use-worklist-badges SWR hook with debounced realtime revalidation - swr (new dependency, approved): global provider; useCompanySettings shares one cache entry across consumers and renders from cache on back-navigation instead of re-showing skeletons - /pending: realtime refetch debounced; bulk operations previously fired 4 requests per row-change event - VAT declaration: new get_vat_declaration_totals RPC returns per-account totals, settlement-shape detection (#984) and source_type counts in ONE round trip instead of paging every entry+line through PostgREST. Account lists stay TS-side parameters so ACCOUNT_RUTA remains the single source of truth. Shape-exclusion coverage moved to tests/pg/vat-declaration-totals-rpc.pg.test.ts; DDL already applied to staging. - bundle: CommandPalette lazy-mounts on first Ctrl/Cmd+K, AgentChat dynamic-imports the markdown parser, @vercel/speed-insights (new dependency, approved) added for real-user timings The /salary fetch-waterfall fix from the same effort already landed inside 2084a756. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(invoices): settle öre-rounded payments from the mark-paid flow An invoice with öresavrundning shows a rounded "Att betala" on the PDF; the customer pays that amount (up to 50 öre off the stored öre total) and the invoice-page mark-paid flow rejected it with MATCH_AMOUNT_EXCEEDS_REMAINING: a dead end, while the bank-transaction match flow already absorbed the residual to 3740. - PaymentBookingDialog now proposes the rounded bank leg plus the 3740 residual line (credit when rounded up, debit when rounded down), resolved via getDisplayTotal from the per-invoice override and company_settings.ore_rounding. - settleInvoicePayment and the v1 mark-paid route absorb the sub-krona residual, gated by planInvoicePaymentForLines: absorption applies ONLY when the caller lines carry the exact residual on 3740; otherwise the strict plan applies (sub-krona partials stay partial, no-3740 overshoots keep the 400), so the GL can never diverge from the AR sub-ledger. - planInvoicePayment absorb-band boundary tightened to >= 1 kr: an exactly-1-kr overshoot used to slip past both the guard and the absorb branch and silently over-record paid_amount (pre-existing on the bank-match path). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(security): resolve all 7 PR compliance findings - ASVS V3.3: per-request CSP nonce on the enable-banking finalize page (mirrors the mcp-oauth consent page); inline scripts are nonce-bound - ASVS V16: decouple callback finalize work from the response stream (eager promise + next/server after()) so a client disconnect cannot drop session persistence or the consent_granted audit emit - ISO 27001 A.8.15: failed audit-event emits log through the structured logger with a stable message for log-based alerting - ASVS V2.3: recurring-invoice cron and run-now routes resolve isSandboxCompany themselves and pass an explicit suppressAutoSend flag (defence in depth around the email chokepoint, freeze-and-retain kept) - ISO 27001 A.8.11: stagePendingOperation rejects plaintext personnummer-bearing keys in params/preview_data (key-based guard; EF org numbers make value-matching unsafe) - ASVS V4.5: employee PATCH body is truly sparse; cleared number fields are omitted instead of resetting DB values to hardcoded fallbacks - ASVS V8.2.1: route-level tests pin the v1 cross-company deny (404 by convention, not 403) on the payslip PDF endpoint Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat: implement vacation-year basis change validation and error handling - Added tests to block vacation-year basis changes when open balances exist. - Implemented error handling for open-balances guard query failures in the settings route. - Enhanced absence route to reject reversed date ranges with a validation error. - Updated absence handling to use atomic upserts instead of delete+insert for better performance and reliability. - Refactored salary calculation logic to correctly handle age-based avgifter rates according to Skatteverket's rules. - Improved error messaging for vacation year closure adjustments. - Adjusted employee opening balances handling to preserve audit information during upserts. * feat(settings): add validation to block vacation-year basis change with open balances feat(absence): reject reversed date ranges in absence queries fix(absence): update absence handling to use atomic upserts instead of delete+insert fix(employee): improve validation for jamkning dates in employee updates fix(opening-balances): ensure created_by field is preserved during upserts test(absence): enhance tests for absence range and date validations test(calculation): add tests for age-based avgifter rates and edge cases test(semesterberedning): validate vacation year closure adjustments and error handling test(employee-opening-balances): update tests to reflect changes in salary_run_employees schema * fix(migrations): implement NOT VALID constraints for pending_operations and add validation migration --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Mattsson
co-authored by
Claude Fable 5
Claude Fable 5
parent
e7e3c35f9e
commit
b6332e9ff4
@@ -475,6 +475,51 @@ describe('POST /api/invoices/[id]/mark-paid', () => {
|
||||
expect(body.paid_at).toBeNull()
|
||||
})
|
||||
|
||||
it('accepts an öresavrundning overshoot: rounded "Att betala" settles the invoice in full', async () => {
|
||||
// Invoice stored with öre (1234.75), PDF shows the rounded 1235.00 and the
|
||||
// customer pays that: the 3740 line carries the 0.25 residual. No customer
|
||||
// → duplicate guard skips.
|
||||
const invoice = makeInvoice({
|
||||
id: 'inv-1',
|
||||
status: 'sent',
|
||||
total: 1234.75,
|
||||
remaining_amount: 1234.75,
|
||||
})
|
||||
|
||||
enqueue({ data: invoice, error: null })
|
||||
enqueue({ data: { accounting_method: 'accrual', entity_type: 'enskild_firma' }, error: null })
|
||||
enqueue({ data: [{ id: 'inv-1' }], error: null }) // CAS update matched
|
||||
|
||||
mockFindFiscalPeriod.mockResolvedValue('fp-1')
|
||||
mockCreateJournalEntry.mockResolvedValue({ id: 'je-ore' })
|
||||
|
||||
const oreLines = [
|
||||
{ account_number: '1930', debit_amount: 1235, credit_amount: 0 },
|
||||
{ account_number: '1510', debit_amount: 0, credit_amount: 1234.75 },
|
||||
{ account_number: '3740', debit_amount: 0, credit_amount: 0.25 },
|
||||
]
|
||||
|
||||
const request = createMockRequest('/api/invoices/inv-1/mark-paid', {
|
||||
method: 'POST',
|
||||
body: { lines: oreLines },
|
||||
})
|
||||
const response = await POST(request, createMockRouteParams({ id: 'inv-1' }))
|
||||
const { status, body } = await parseJsonResponse<{
|
||||
success: boolean
|
||||
status: string
|
||||
paid_amount: number
|
||||
remaining_amount: number
|
||||
journal_entry_id: string
|
||||
}>(response)
|
||||
|
||||
expect(status).toBe(200)
|
||||
expect(body.success).toBe(true)
|
||||
expect(body.status).toBe('paid')
|
||||
expect(body.paid_amount).toBe(1234.75)
|
||||
expect(body.remaining_amount).toBe(0)
|
||||
expect(body.journal_entry_id).toBe('je-ore')
|
||||
})
|
||||
|
||||
it('returns 400 MATCH_AMOUNT_EXCEEDS_REMAINING when custom lines overpay the invoice', async () => {
|
||||
// No customer → duplicate guard skips; the overpayment guard must reject
|
||||
// BEFORE any journal entry is created (planInvoicePayment runs first).
|
||||
|
||||
@@ -164,6 +164,84 @@ describe('POST /api/invoices/[id]/send', () => {
|
||||
expect((body.error as unknown as { code: string }).code).toBe('INVOICE_SEND_CANCELLED')
|
||||
})
|
||||
|
||||
it.each(['sent', 'paid', 'overdue', 'partially_paid', 'credited'] as const)(
|
||||
'returns 409 and posts no journal entry when invoice status is %s',
|
||||
async (issuedStatus) => {
|
||||
const issuedInvoice = makeInvoice({
|
||||
id: 'inv-1',
|
||||
status: issuedStatus,
|
||||
customer,
|
||||
items: [],
|
||||
})
|
||||
enqueue({ data: issuedInvoice, error: null })
|
||||
|
||||
const request = createMockRequest('/api/invoices/inv-1/send', { method: 'POST' })
|
||||
const response = await POST(request, createMockRouteParams({ id: 'inv-1' }))
|
||||
const { status, body } = await parseJsonResponse<{ error: string }>(response)
|
||||
|
||||
expect(status).toBe(409)
|
||||
expect((body.error as unknown as { code: string }).code).toBe('INVOICE_ALREADY_SENT')
|
||||
expect(mockSendEmail).not.toHaveBeenCalled()
|
||||
expect(mockCreateInvoiceJournalEntry).not.toHaveBeenCalled()
|
||||
},
|
||||
)
|
||||
|
||||
it('skips journal entry, archive and event when a concurrent request won the status flip', async () => {
|
||||
enqueue({ data: invoice, error: null })
|
||||
enqueue({ data: company, error: null })
|
||||
|
||||
mockSendEmail.mockResolvedValue({ success: true, messageId: 'msg-race' })
|
||||
|
||||
// Optimistic-locked flip matches 0 rows: another request already sent it.
|
||||
enqueue({ data: [], error: null })
|
||||
|
||||
const emitSpy = vi.spyOn(eventBus, 'emit')
|
||||
|
||||
const request = createMockRequest('/api/invoices/inv-1/send', { method: 'POST' })
|
||||
const response = await POST(request, createMockRouteParams({ id: 'inv-1' }))
|
||||
const { status, body } = await parseJsonResponse<{
|
||||
success: boolean
|
||||
partial?: boolean
|
||||
partial_failures?: Array<{ step: string }>
|
||||
}>(response)
|
||||
|
||||
// The email did go out, so the response is still a (partial) success.
|
||||
expect(status).toBe(200)
|
||||
expect(body.success).toBe(true)
|
||||
expect(body.partial).toBe(true)
|
||||
expect(body.partial_failures?.some((f) => f.step === 'status_update')).toBe(true)
|
||||
// The winning request owns the bookkeeping: no second verifikat here.
|
||||
expect(mockCreateInvoiceJournalEntry).not.toHaveBeenCalled()
|
||||
expect(emitSpy).not.toHaveBeenCalledWith(
|
||||
expect.objectContaining({ type: 'invoice.sent' })
|
||||
)
|
||||
})
|
||||
|
||||
it('defers the journal entry when the status flip errors (row stays draft, retry re-books once)', async () => {
|
||||
enqueue({ data: invoice, error: null })
|
||||
enqueue({ data: company, error: null })
|
||||
|
||||
mockSendEmail.mockResolvedValue({ success: true, messageId: 'msg-fliperr' })
|
||||
|
||||
// Status flip hits a DB error: the invoice remains 'draft'.
|
||||
enqueue({ data: null, error: { message: 'connection reset' } })
|
||||
|
||||
const request = createMockRequest('/api/invoices/inv-1/send', { method: 'POST' })
|
||||
const response = await POST(request, createMockRouteParams({ id: 'inv-1' }))
|
||||
const { status, body } = await parseJsonResponse<{
|
||||
success: boolean
|
||||
partial?: boolean
|
||||
partial_failures?: Array<{ step: string; reason: string }>
|
||||
}>(response)
|
||||
|
||||
expect(status).toBe(200)
|
||||
expect(body.partial).toBe(true)
|
||||
expect(body.partial_failures?.some((f) => f.step === 'status_update')).toBe(true)
|
||||
// No entry now: the retry (invoice still draft) runs the full pipeline
|
||||
// and posts exactly one, instead of this request + the retry posting two.
|
||||
expect(mockCreateInvoiceJournalEntry).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('returns 400 when customer has no email', async () => {
|
||||
const noEmailInvoice = makeInvoice({
|
||||
id: 'inv-1',
|
||||
@@ -201,8 +279,8 @@ describe('POST /api/invoices/[id]/send', () => {
|
||||
mockSendEmail.mockResolvedValue({ success: true, messageId: 'msg-1' })
|
||||
mockCreateInvoiceJournalEntry.mockResolvedValue({ id: 'je-1' })
|
||||
|
||||
// Update invoice status to 'sent'
|
||||
enqueue({ data: null, error: null })
|
||||
// Update invoice status to 'sent' (optimistic lock: returns the matched row)
|
||||
enqueue({ data: [{ id: 'inv-1' }], error: null })
|
||||
// Update invoice with journal_entry_id
|
||||
enqueue({ data: null, error: null })
|
||||
|
||||
@@ -244,7 +322,7 @@ describe('POST /api/invoices/[id]/send', () => {
|
||||
mockSendEmail.mockResolvedValue({ success: true, messageId: 'msg-2' })
|
||||
|
||||
// Update invoice status
|
||||
enqueue({ data: null, error: null })
|
||||
enqueue({ data: [{ id: 'inv-1' }], error: null })
|
||||
|
||||
const request = createMockRequest('/api/invoices/inv-1/send', { method: 'POST' })
|
||||
const response = await POST(request, createMockRouteParams({ id: 'inv-1' }))
|
||||
@@ -263,7 +341,7 @@ describe('POST /api/invoices/[id]/send', () => {
|
||||
mockCreateInvoiceJournalEntry.mockRejectedValue(new Error('Period locked'))
|
||||
|
||||
// Update invoice status
|
||||
enqueue({ data: null, error: null })
|
||||
enqueue({ data: [{ id: 'inv-1' }], error: null })
|
||||
|
||||
const request = createMockRequest('/api/invoices/inv-1/send', { method: 'POST' })
|
||||
const response = await POST(request, createMockRouteParams({ id: 'inv-1' }))
|
||||
@@ -293,7 +371,7 @@ describe('POST /api/invoices/[id]/send', () => {
|
||||
mockCreateInvoiceJournalEntry.mockResolvedValue({ id: 'je-1' })
|
||||
|
||||
// Update status to 'sent'
|
||||
enqueue({ data: null, error: null })
|
||||
enqueue({ data: [{ id: 'inv-1' }], error: null })
|
||||
// Update with journal_entry_id
|
||||
enqueue({ data: null, error: null })
|
||||
|
||||
@@ -325,7 +403,7 @@ describe('POST /api/invoices/[id]/send', () => {
|
||||
mockSendEmail.mockResolvedValue({ success: true, messageId: 'msg-100' })
|
||||
mockCreateInvoiceJournalEntry.mockResolvedValue({ id: 'je-2' })
|
||||
|
||||
enqueue({ data: null, error: null })
|
||||
enqueue({ data: [{ id: 'inv-1' }], error: null })
|
||||
enqueue({ data: null, error: null })
|
||||
|
||||
const request = createMockRequest('/api/invoices/inv-1/send', { method: 'POST' })
|
||||
@@ -388,7 +466,7 @@ describe('POST /api/invoices/[id]/send', () => {
|
||||
mockSendEmail.mockResolvedValue({ success: true, messageId: 'msg-banner' })
|
||||
mockCreateInvoiceJournalEntry.mockResolvedValue({ id: 'je-1' })
|
||||
|
||||
enqueue({ data: null, error: null })
|
||||
enqueue({ data: [{ id: 'inv-1' }], error: null })
|
||||
enqueue({ data: null, error: null })
|
||||
|
||||
const request = createMockRequest('/api/invoices/inv-1/send', { method: 'POST' })
|
||||
|
||||
@@ -60,13 +60,26 @@ export const POST = withRouteContext(
|
||||
}
|
||||
|
||||
// A cancelled invoice keeps its F-series number for compliance with ML 17
|
||||
// kap 24§ but is not a valid faktura: sending it would silently
|
||||
// re-activate it (the .update({ status: 'sent' }) below has no status
|
||||
// guard) and could deliver a "MAKULERAD" PDF as if it were live.
|
||||
// kap 24§ but is not a valid faktura: sending it would deliver a
|
||||
// "MAKULERAD" PDF as if it were live. Checked before the generic draft
|
||||
// guard below for the more specific error message.
|
||||
if (invoice.status === 'cancelled') {
|
||||
return errorResponseFromCode('INVOICE_SEND_CANCELLED', opLog, { requestId })
|
||||
}
|
||||
|
||||
// Only drafts may enter the send pipeline. The UI already hides Send for
|
||||
// non-drafts, but a direct POST against an issued invoice would re-email
|
||||
// the customer and post a SECOND revenue verifikat
|
||||
// (createInvoiceJournalEntry has no dedup), overwriting journal_entry_id
|
||||
// and orphaning the first entry. Mirrors the v1 route and the MCP commit
|
||||
// executor, which both reject non-drafts.
|
||||
if (invoice.status !== 'draft') {
|
||||
return errorResponseFromCode('INVOICE_ALREADY_SENT', opLog, {
|
||||
requestId,
|
||||
details: { currentStatus: invoice.status },
|
||||
})
|
||||
}
|
||||
|
||||
const customer = invoice.customer as Customer
|
||||
if (!customer.email) {
|
||||
return errorResponseFromCode('INVOICE_SEND_NO_CUSTOMER_EMAIL', opLog, {
|
||||
@@ -223,16 +236,36 @@ export const POST = withRouteContext(
|
||||
partialFailures.push({ step: 'payment_link', reason: paymentLinkFailure })
|
||||
}
|
||||
|
||||
// Optimistic-locked flip (draft → sent). Two concurrent sends can both
|
||||
// pass the draft guard above and both email the customer, but only the
|
||||
// request that wins this compare-and-set runs the bookkeeping steps
|
||||
// below: the loser would otherwise post a duplicate revenue verifikat
|
||||
// and archive the PDF twice. PostgREST returns no error for a 0-row
|
||||
// update, so the row count via .select('id') is the actual lock signal.
|
||||
// A genuine update error also skips the follow-ups: the row is still
|
||||
// 'draft', so a later retry re-runs the whole pipeline and ends with
|
||||
// exactly one journal entry (at the cost of a duplicate email).
|
||||
let statusFlipped = false
|
||||
{
|
||||
const { error: updateError } = await supabase
|
||||
const { data: flipRows, error: updateError } = await supabase
|
||||
.from('invoices')
|
||||
.update({ status: 'sent' })
|
||||
.eq('id', id)
|
||||
.eq('company_id', companyId)
|
||||
.eq('status', 'draft')
|
||||
.select('id')
|
||||
|
||||
if (updateError) {
|
||||
opLog.warn('failed to update invoice status to sent', updateError)
|
||||
partialFailures.push({ step: 'status_update', reason: updateError.message })
|
||||
} else if (!flipRows || flipRows.length === 0) {
|
||||
opLog.warn('invoice already flipped to sent by a concurrent request; skipping bookkeeping follow-ups')
|
||||
partialFailures.push({
|
||||
step: 'status_update',
|
||||
reason: 'Fakturan skickades samtidigt av en annan begäran; bokföringen hanterades där.',
|
||||
})
|
||||
} else {
|
||||
statusFlipped = true
|
||||
}
|
||||
}
|
||||
|
||||
@@ -240,7 +273,7 @@ export const POST = withRouteContext(
|
||||
const accountingMethod = (company as Record<string, unknown>).accounting_method as string | undefined
|
||||
let createdJournalEntryId: string | undefined
|
||||
|
||||
if (isRealInvoice && (!accountingMethod || accountingMethod === 'accrual')) {
|
||||
if (statusFlipped && isRealInvoice && (!accountingMethod || accountingMethod === 'accrual')) {
|
||||
try {
|
||||
const journalEntry = await createInvoiceJournalEntry(
|
||||
supabase,
|
||||
@@ -284,7 +317,7 @@ export const POST = withRouteContext(
|
||||
}
|
||||
}
|
||||
|
||||
if (isRealInvoice) {
|
||||
if (statusFlipped && isRealInvoice) {
|
||||
try {
|
||||
const pdfArrayBuffer = new Uint8Array(pdfBuffer).buffer as ArrayBuffer
|
||||
await uploadDocument(supabase, user.id, companyId!, {
|
||||
@@ -304,10 +337,15 @@ export const POST = withRouteContext(
|
||||
}
|
||||
}
|
||||
|
||||
await eventBus.emit({
|
||||
type: 'invoice.sent',
|
||||
payload: { invoice: invoice as Invoice, companyId: companyId!, userId: user.id },
|
||||
})
|
||||
// Gated like the steps above: on a lost race the winning request emits
|
||||
// it; on a flip error the row is still 'draft', so emitting would
|
||||
// contradict DB state and the retry emits it instead.
|
||||
if (statusFlipped) {
|
||||
await eventBus.emit({
|
||||
type: 'invoice.sent',
|
||||
payload: { invoice: invoice as Invoice, companyId: companyId!, userId: user.id },
|
||||
})
|
||||
}
|
||||
|
||||
if (partialFailures.length > 0) {
|
||||
opLog.warn('invoice sent with partial follow-up failures', {
|
||||
|
||||
@@ -3,6 +3,7 @@ import { ensureInitialized } from '@/lib/init'
|
||||
import { withRouteContext } from '@/lib/api/with-route-context'
|
||||
import { errorResponse } from '@/lib/errors/get-structured-error'
|
||||
import { executeRecurringSchedule } from '@/lib/invoices/recurring-schedule-service'
|
||||
import { isSandboxCompany } from '@/lib/sandbox/guard'
|
||||
import type { RecurringInvoiceSchedule, RecurringInvoiceScheduleItem } from '@/types'
|
||||
|
||||
ensureInitialized()
|
||||
@@ -46,8 +47,16 @@ export const POST = withRouteContext(
|
||||
items: RecurringInvoiceScheduleItem[]
|
||||
}
|
||||
|
||||
// Defence in depth (ASVS V2.3): mirror the cron route. The sandbox rule
|
||||
// is enforced inside the service's email chokepoint too; resolving it at
|
||||
// the route level as well means the invariant survives refactors of the
|
||||
// service internals. Invoice creation is unaffected (freeze-and-retain).
|
||||
const suppressAutoSend = typed.auto_send
|
||||
? await isSandboxCompany(supabase, companyId)
|
||||
: false
|
||||
|
||||
try {
|
||||
const result = await executeRecurringSchedule(supabase, typed, new Date())
|
||||
const result = await executeRecurringSchedule(supabase, typed, new Date(), { suppressAutoSend })
|
||||
|
||||
// Record the run for the list view (generated count, last invoice,
|
||||
// warning) but leave next_run_date untouched: the monthly cadence runs
|
||||
|
||||
@@ -3,6 +3,27 @@ import { createQueuedMockSupabase, createMockRequest, parseJsonResponse } from '
|
||||
|
||||
const { supabase: mockSupabase, enqueue, reset } = createQueuedMockSupabase()
|
||||
|
||||
// The queued mock's proxy chain discards call arguments, but these tests need
|
||||
// to assert exactly what the cron writes back to the schedule row (claim
|
||||
// release + failure warning, stale roll-forward warning). Wrap .from() so
|
||||
// every .update() payload is recorded before delegating to the queue chain.
|
||||
const updatePayloads: Array<{ table: string; payload: Record<string, unknown> }> = []
|
||||
const baseFrom = mockSupabase.from.getMockImplementation()!
|
||||
mockSupabase.from.mockImplementation((table: string) => {
|
||||
const chain = baseFrom(table) as Record<string, (...args: unknown[]) => unknown>
|
||||
return new Proxy(chain, {
|
||||
get(target, prop, receiver) {
|
||||
if (prop === 'update') {
|
||||
return (payload: Record<string, unknown>) => {
|
||||
updatePayloads.push({ table, payload })
|
||||
return target.update(payload)
|
||||
}
|
||||
}
|
||||
return Reflect.get(target, prop, receiver)
|
||||
},
|
||||
})
|
||||
})
|
||||
|
||||
vi.mock('@/lib/supabase/server', () => ({
|
||||
createServiceClient: () => mockSupabase,
|
||||
}))
|
||||
@@ -23,6 +44,12 @@ vi.mock('@/lib/invoices/recurring-schedule-service', async (importActual) => {
|
||||
}
|
||||
})
|
||||
|
||||
// Route-level sandbox resolution (defence in depth, ASVS V2.3).
|
||||
const isSandboxCompany = vi.fn()
|
||||
vi.mock('@/lib/sandbox/guard', () => ({
|
||||
isSandboxCompany: (...args: unknown[]) => isSandboxCompany(...args),
|
||||
}))
|
||||
|
||||
import { GET } from '../route'
|
||||
|
||||
type ResultRow = {
|
||||
@@ -53,6 +80,7 @@ describe('GET /api/invoices/recurring/cron', () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
reset()
|
||||
updatePayloads.length = 0
|
||||
vi.useFakeTimers()
|
||||
})
|
||||
afterEach(() => {
|
||||
@@ -77,6 +105,31 @@ describe('GET /api/invoices/recurring/cron', () => {
|
||||
expect(executeRecurringSchedule).toHaveBeenCalledTimes(1)
|
||||
expect(body.succeeded).toBe(1)
|
||||
expect(body.results[0].invoiceId).toBe('inv-1')
|
||||
// No auto_send on the schedule -> no sandbox lookup, no suppression.
|
||||
expect(isSandboxCompany).not.toHaveBeenCalled()
|
||||
expect(executeRecurringSchedule.mock.calls[0][3]).toEqual({ suppressAutoSend: false })
|
||||
})
|
||||
|
||||
it('resolves the sandbox flag at the route level and suppresses auto-send for sandbox companies', async () => {
|
||||
vi.setSystemTime(new Date('2026-07-06T08:30:00Z'))
|
||||
enqueue({ data: [makeSchedule({ send_hour: 8, auto_send: true })], error: null })
|
||||
// Atomic claim wins.
|
||||
enqueue({ data: [{ id: 's-1' }], error: null })
|
||||
isSandboxCompany.mockResolvedValue(true)
|
||||
executeRecurringSchedule.mockResolvedValue({
|
||||
invoiceId: 'inv-1',
|
||||
invoiceNumber: 'F-1',
|
||||
autoSent: false,
|
||||
warning: 'Auto-utskick misslyckades: fakturan finns som utkast och kan skickas manuellt.',
|
||||
})
|
||||
|
||||
const { status } = await parseJsonResponse<CronBody>(await GET(req()))
|
||||
expect(status).toBe(200)
|
||||
// Defence in depth: the route resolved the sandbox state itself and told
|
||||
// the service explicitly, instead of relying only on the chokepoint
|
||||
// inside sendInvoiceFromSchedule.
|
||||
expect(isSandboxCompany).toHaveBeenCalledWith(expect.anything(), 'c-1')
|
||||
expect(executeRecurringSchedule.mock.calls[0][3]).toEqual({ suppressAutoSend: true })
|
||||
})
|
||||
|
||||
it('skips when a concurrent cron run already claimed the schedule', async () => {
|
||||
@@ -110,6 +163,46 @@ describe('GET /api/invoices/recurring/cron', () => {
|
||||
expect(body.results[0].skipReason).toBe('stale_rolled_forward')
|
||||
})
|
||||
|
||||
it('releases the claim AND persists a failure warning when execution throws', async () => {
|
||||
vi.setSystemTime(new Date('2026-07-06T08:30:00Z'))
|
||||
enqueue({ data: [makeSchedule({ send_hour: 8 })], error: null })
|
||||
// Atomic claim wins.
|
||||
enqueue({ data: [{ id: 's-1' }], error: null })
|
||||
executeRecurringSchedule.mockRejectedValue(new Error('VAT rate 25% not allowed'))
|
||||
// Claim release + warning write.
|
||||
enqueue({ data: null, error: null })
|
||||
|
||||
const { body } = await parseJsonResponse<CronBody & { failed: number }>(await GET(req()))
|
||||
expect(body.failed).toBe(1)
|
||||
|
||||
// The release update must restore the pre-claim last_run_at (null here)
|
||||
// so a later cron retries today, and carry a user-visible warning so a
|
||||
// deterministic failure never skips the month silently.
|
||||
const release = updatePayloads.find(
|
||||
(u) => u.table === 'recurring_invoice_schedules' && 'last_run_warning' in u.payload,
|
||||
)
|
||||
expect(release).toBeDefined()
|
||||
expect(release!.payload.last_run_at).toBeNull()
|
||||
expect(release!.payload.last_run_warning).toContain('2026-07-06 misslyckades')
|
||||
expect(release!.payload.last_run_warning).toContain('VAT rate 25% not allowed')
|
||||
})
|
||||
|
||||
it('writes a skip warning when rolling a stale schedule forward', async () => {
|
||||
vi.setSystemTime(new Date('2026-07-06T08:30:00Z'))
|
||||
enqueue({ data: [makeSchedule({ next_run_date: '2026-07-05', day_of_month: 5 })], error: null })
|
||||
// Roll-forward update.
|
||||
enqueue({ data: null, error: null })
|
||||
|
||||
const { body } = await parseJsonResponse<CronBody>(await GET(req()))
|
||||
expect(body.results[0].skipReason).toBe('stale_rolled_forward')
|
||||
|
||||
const roll = updatePayloads.find((u) => u.table === 'recurring_invoice_schedules')
|
||||
expect(roll).toBeDefined()
|
||||
expect(roll!.payload.next_run_date).toBe('2026-08-05')
|
||||
expect(roll!.payload.last_run_warning).toContain('Ingen faktura skapades den 2026-07-05')
|
||||
expect(roll!.payload.last_run_warning).toContain('2026-08-05')
|
||||
})
|
||||
|
||||
it('skips a schedule that already ran earlier today', async () => {
|
||||
vi.setSystemTime(new Date('2026-07-06T08:30:00Z'))
|
||||
enqueue({
|
||||
|
||||
@@ -8,6 +8,7 @@ import {
|
||||
computeInitialRunDate,
|
||||
getStockholmDateHour,
|
||||
} from '@/lib/invoices/recurring-schedule-service'
|
||||
import { isSandboxCompany } from '@/lib/sandbox/guard'
|
||||
import type {
|
||||
RecurringInvoiceSchedule,
|
||||
RecurringInvoiceScheduleItem,
|
||||
@@ -89,9 +90,16 @@ export const GET = withCronContext('cron.recurring_invoices', async (_request, c
|
||||
// its next date rather than firing a stale one immediately.
|
||||
if (schedule.next_run_date < todayStockholm) {
|
||||
const rolledNext = computeInitialRunDate(stockholmToday, schedule.day_of_month)
|
||||
// Surface the skip on the schedule: a day of failed runs (or a cron
|
||||
// outage) would otherwise roll the month forward with no user-visible
|
||||
// trace. The next successful run overwrites this, and a conscious
|
||||
// reactivation clears it (PATCH route).
|
||||
const { error: rollError } = await supabase
|
||||
.from('recurring_invoice_schedules')
|
||||
.update({ next_run_date: rolledNext })
|
||||
.update({
|
||||
next_run_date: rolledNext,
|
||||
last_run_warning: `Ingen faktura skapades den ${schedule.next_run_date}. Nästa körning: ${rolledNext}. Använd "Skapa faktura nu" om månadens faktura fortfarande behövs.`,
|
||||
})
|
||||
.eq('id', schedule.id)
|
||||
.eq('company_id', schedule.company_id)
|
||||
if (rollError) {
|
||||
@@ -169,14 +177,31 @@ export const GET = withCronContext('cron.recurring_invoices', async (_request, c
|
||||
|
||||
// 5. Spawn the invoice. If it throws after we claimed, release the claim
|
||||
// (restore the prior last_run_at) so a later cron retries today rather
|
||||
// than treating the row as already run.
|
||||
// than treating the row as already run, and persist the failure as a
|
||||
// user-visible warning: a deterministic error (bad VAT rate, missing
|
||||
// items) fails every hourly retry and would otherwise skip the month
|
||||
// silently via the stale roll-forward above. A later successful run
|
||||
// overwrites the warning.
|
||||
// Defence in depth (ASVS V2.3): the email chokepoint inside the schedule
|
||||
// service enforces the sandbox rule on its own; the route additionally
|
||||
// resolves it here and passes an explicit suppress flag, so the invariant
|
||||
// does not hinge on a single check buried in a library function. The
|
||||
// invoice is still generated as a draft (freeze-and-retain).
|
||||
const suppressAutoSend = schedule.auto_send
|
||||
? await isSandboxCompany(supabase, schedule.company_id)
|
||||
: false
|
||||
|
||||
let result: Awaited<ReturnType<typeof executeRecurringSchedule>>
|
||||
try {
|
||||
result = await executeRecurringSchedule(supabase, schedule, now)
|
||||
result = await executeRecurringSchedule(supabase, schedule, now, { suppressAutoSend })
|
||||
} catch (err) {
|
||||
const reason = (err instanceof Error ? err.message : String(err)).slice(0, 300)
|
||||
await supabase
|
||||
.from('recurring_invoice_schedules')
|
||||
.update({ last_run_at: schedule.last_run_at })
|
||||
.update({
|
||||
last_run_at: schedule.last_run_at,
|
||||
last_run_warning: `Körningen ${todayStockholm} misslyckades: ${reason}. Nytt försök görs automatiskt varje timme idag.`,
|
||||
})
|
||||
.eq('id', schedule.id)
|
||||
.eq('company_id', schedule.company_id)
|
||||
.eq('last_run_at', claimTs)
|
||||
|
||||
Reference in New Issue
Block a user