* fix(rot-rut): surface drop-out reasons in payout request dialog and keep selectors usable (#1884) Four silent drop paths made a paid RUT invoice invisible in the begaran dialog (neither eligible nor blocked), and the empty list hid the year picker so the dialog looked dead: 1. deduction lines without a header deduction_total: a second line-based candidate query now finds them and they block as DEDUCTION_TOTAL_MISSING (also at file generation: the 1513 receivable was never booked). 2. partially_paid with the customer share settled: remaining_amount = 0 (total - paid_amount - deduction_total, migration 20260817191708) now counts as paid in evaluateInvoiceForFile; a genuine partial blocks as NOT_PAID with the outstanding amount. 3. NO_DEDUCTION_OF_TYPE is no longer filtered out of blocked: the message points at the other type, and the dialog's empty state adds a switch-type hint. 4. invoices held by a generated/submitted begaran block as ALREADY_REQUESTED naming the request; decided requests stay omitted (finished business, visible in the history list). The dialog keeps the year picker rendered when the list is empty (current year as inert fallback) and opens the blocked list by default when nothing is eligible. Fixes #1884 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(rot-rut): skeptic hardening: decided requests vanish on both tabs, customer share derived from header fields (#1884) Two skeptic refutations against the frozen PR head: 1. Regression: the wrong-type branch ran before the active-request lookup, so invoices of the OTHER type whose begaran was already decided resurfaced forever as NO_DEDUCTION_OF_TYPE in the opposite tab's blocked list, and the empty-state hint pointed at a tab where they never appear. The decided-request skip now runs first, on every tab. 2. Correctness: the paid gate and the NOT_PAID message trusted remaining_amount, but payment-sync's storno path recomputes it WITHOUT subtracting deduction_total, so the stored column can carry Skatteverkets 1513 share and the dialog could assert a wrong customer-outstanding figure. The gate now derives the customer share as total - paid_amount - deduction_total (the buildInvoiceWriteData / migration 20260817191708 formula) from fields every settlement path maintains. Tests pin both: decided+wrong-type omitted from both lists, corrupted remaining still classified and reported from the derived share. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs(rot-rut): align CANDIDATE_STATUSES comment with the derived-share gate (#1884) The skeptic-hardening commit moved the paid gate off remaining_amount to the derived customer share (total - paid_amount - deduction_total); the comment still named remaining_amount as the signal. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(rot-rut): explicit decided-status set + correction-path wording (#1884) Swedish accounting review findings on the candidate list: 1. The decided-begaran skip inferred 'decided' by exclusion (anything not generated/submitted), so a future request status would make an invoice vanish from both lists, exactly the silent drop the module forbids. DECIDED_REQUEST_STATUSES now names paid/partially_paid; any other status held by a request lands in blocked as ALREADY_REQUESTED with a generic message. Test pins it. 2. The DEDUCTION_TOTAL_MISSING message said only 'ratta fakturan', which could read as an invitation to edit a booked invoice directly. The invoice edit route already refuses sent/paid/booked invoices, and the message now names the sanctioned path: drafts edit directly, sent or paid invoices are corrected via credit note + new invoice. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
322 lines
12 KiB
TypeScript
322 lines
12 KiB
TypeScript
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
import type { Invoice } from '@/types'
|
|
import { getSwedishLocalDate } from '@/lib/bookkeeping/engine'
|
|
import {
|
|
buildRotRutFile,
|
|
evaluateInvoiceForFile,
|
|
type BuildRotRutFileResult,
|
|
type RotRutBlocker,
|
|
type RotRutBlockerCode,
|
|
} from './rot-rut-file'
|
|
import type { DeductionType } from './rot-rut-rules'
|
|
|
|
/**
|
|
* Shared service behind the rot/rut payout-file API routes and the MCP tool
|
|
* (gnubok_generate_rot_rut_file): one implementation of "which invoices can
|
|
* go into a begäran" and "record the begäran", so the two surfaces can never
|
|
* drift apart.
|
|
*/
|
|
|
|
export interface RotRutCandidateSummary {
|
|
invoice_id: string
|
|
invoice_number: string | null
|
|
customer_name: string | null
|
|
personnummer_last4: string
|
|
betalnings_datum: string
|
|
pris_for_arbete: number
|
|
begart_belopp: number
|
|
}
|
|
|
|
export interface RotRutBlockedSummary {
|
|
invoice_id: string
|
|
invoice_number: string | null
|
|
customer_name: string | null
|
|
code: RotRutBlockerCode | 'ALREADY_REQUESTED'
|
|
message: string
|
|
}
|
|
|
|
type InvoiceWithCustomer = Invoice & { customer?: { name?: string | null } | null }
|
|
|
|
/** Invoice statuses a candidate may carry. partially_paid is included because
|
|
* invoices settled through older payment paths can hold a fully paid
|
|
* customer share while the status never flipped to paid:
|
|
* evaluateInvoiceForFile decides via the derived customer share
|
|
* (total - paid_amount - deduction_total). */
|
|
const CANDIDATE_STATUSES = ['paid', 'partially_paid']
|
|
|
|
/** Request statuses where Skatteverkets beslut has been recorded: the claim is
|
|
* finished business, visible in the request history, so the invoice is
|
|
* deliberately omitted from both lists (see DECISIONS.md, #1884). Enumerated
|
|
* explicitly so a request status outside the known lifecycle can never make
|
|
* an invoice vanish silently: anything not decided here, and not
|
|
* cancelled/rejected (filtered out in the query), surfaces as
|
|
* ALREADY_REQUESTED. */
|
|
const DECIDED_REQUEST_STATUSES = ['paid', 'partially_paid']
|
|
|
|
/**
|
|
* Deduction-carrying invoices evaluated against the file rules. Never drops
|
|
* an invoice silently: every fetched candidate lands in `eligible` or in
|
|
* `blocked` with the exact reason, including "the deduction is the other
|
|
* type" (NO_DEDUCTION_OF_TYPE, so the ROT view can point at the RUT list and
|
|
* vice versa) and "already part of an in-flight begäran" (ALREADY_REQUESTED,
|
|
* for generated/submitted requests). The single deliberate omission is an
|
|
* invoice whose begäran has been decided (request status paid or
|
|
* partially_paid): that claim is finished business, visible in the request
|
|
* history, not a drop-out anyone needs explained.
|
|
*/
|
|
export async function listRotRutCandidates(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
type: DeductionType,
|
|
// Europe/Stockholm, not UTC: this date gates FUTURE_PAYMENT_DATE and the
|
|
// 31 January begäran deadline, both defined by Swedish calendar days.
|
|
today = getSwedishLocalDate(),
|
|
): Promise<
|
|
| { ok: true; eligible: RotRutCandidateSummary[]; blocked: RotRutBlockedSummary[] }
|
|
| { ok: false; dbError: unknown }
|
|
> {
|
|
// Two fetches so no candidate shape is invisible:
|
|
// - by header: deduction_total > 0, the classic shape;
|
|
// - by lines: invoices whose items carry deduction_type but whose header
|
|
// total was never written (older imports). The header filter would miss
|
|
// those entirely, which is exactly the silent drop this list must not
|
|
// have; they surface as DEDUCTION_TOTAL_MISSING.
|
|
const { data: byHeader, error: headerError } = await supabase
|
|
.from('invoices')
|
|
.select('*, items:invoice_items(*), customer:customers(id, name)')
|
|
.eq('company_id', companyId)
|
|
.eq('document_type', 'invoice')
|
|
.in('status', CANDIDATE_STATUSES)
|
|
.gt('deduction_total', 0)
|
|
.order('paid_at', { ascending: true })
|
|
|
|
if (headerError) return { ok: false, dbError: headerError }
|
|
|
|
const { data: byLines, error: linesError } = await supabase
|
|
.from('invoices')
|
|
.select(
|
|
'*, items:invoice_items(*), customer:customers(id, name), deduction_lines:invoice_items!inner(deduction_type)',
|
|
)
|
|
.eq('company_id', companyId)
|
|
.eq('document_type', 'invoice')
|
|
.in('status', CANDIDATE_STATUSES)
|
|
.not('deduction_lines.deduction_type', 'is', null)
|
|
.order('paid_at', { ascending: true })
|
|
|
|
if (linesError) return { ok: false, dbError: linesError }
|
|
|
|
const invoiceById = new Map<string, InvoiceWithCustomer>()
|
|
for (const row of [
|
|
...(byHeader ?? []),
|
|
...(byLines ?? []),
|
|
] as unknown as InvoiceWithCustomer[]) {
|
|
if (!invoiceById.has(row.id)) invoiceById.set(row.id, row)
|
|
}
|
|
// Deterministic order across the merged sets: oldest payment first
|
|
// (matching the old single-query order), date-less rows last.
|
|
const invoices = [...invoiceById.values()].sort((a, b) => {
|
|
const aKey = a.paid_at ? String(a.paid_at) : '9999'
|
|
const bKey = b.paid_at ? String(b.paid_at) : '9999'
|
|
return aKey === bKey ? a.id.localeCompare(b.id) : aKey < bKey ? -1 : 1
|
|
})
|
|
|
|
const { data: activeItems, error: activeError } = await supabase
|
|
.from('rot_rut_payout_request_items')
|
|
.select('invoice_id, request:rot_rut_payout_requests!inner(id, name, status, company_id)')
|
|
.eq('request.company_id', companyId)
|
|
.not('request.status', 'in', '("cancelled","rejected")')
|
|
|
|
if (activeError) return { ok: false, dbError: activeError }
|
|
|
|
const activeRequestByInvoice = new Map<string, { name: string | null; status: string }>()
|
|
for (const row of (activeItems ?? []) as unknown as Array<{
|
|
invoice_id: string
|
|
request: { name?: string | null; status?: string } | null
|
|
}>) {
|
|
activeRequestByInvoice.set(row.invoice_id, {
|
|
name: row.request?.name ?? null,
|
|
status: row.request?.status ?? '',
|
|
})
|
|
}
|
|
|
|
const eligible: RotRutCandidateSummary[] = []
|
|
const blocked: RotRutBlockedSummary[] = []
|
|
|
|
for (const invoice of invoices) {
|
|
const activeRequest = activeRequestByInvoice.get(invoice.id)
|
|
// Decided begäran (request status paid/partially_paid, enumerated
|
|
// explicitly in DECIDED_REQUEST_STATUSES) first, before ANY
|
|
// classification: the claim is finished business on every tab, so the
|
|
// invoice must vanish from both lists. Checking wrong-type first would
|
|
// resurface every historically decided invoice forever in the OTHER
|
|
// type's blocked list.
|
|
if (activeRequest && DECIDED_REQUEST_STATUSES.includes(activeRequest.status)) continue
|
|
const holdingRequest = activeRequest ?? null
|
|
|
|
const result = evaluateInvoiceForFile(type, invoice, { today })
|
|
|
|
// Wrong-type next: even when the invoice sits in an in-flight begäran,
|
|
// the useful fact under THIS type is that it belongs to the other list
|
|
// (where it shows as ALREADY_REQUESTED).
|
|
if (!result.ok && result.blocker.code === 'NO_DEDUCTION_OF_TYPE') {
|
|
blocked.push({
|
|
invoice_id: invoice.id,
|
|
invoice_number: invoice.invoice_number ?? null,
|
|
customer_name: invoice.customer?.name ?? null,
|
|
code: result.blocker.code,
|
|
message: result.blocker.message,
|
|
})
|
|
continue
|
|
}
|
|
|
|
if (holdingRequest) {
|
|
// In-flight begäran (generated but maybe never uploaded, or awaiting
|
|
// beslut): the invoice is spoken for, say so instead of vanishing. A
|
|
// request status outside the known lifecycle gets the generic message:
|
|
// being held with a vague reason still beats disappearing.
|
|
const requestLabel = holdingRequest.name ? `begäran "${holdingRequest.name}"` : 'en begäran'
|
|
blocked.push({
|
|
invoice_id: invoice.id,
|
|
invoice_number: invoice.invoice_number ?? null,
|
|
customer_name: invoice.customer?.name ?? null,
|
|
code: 'ALREADY_REQUESTED',
|
|
message:
|
|
holdingRequest.status === 'generated'
|
|
? `Fakturan ingår redan i ${requestLabel} som är skapad men inte uppladdad. Ladda upp filen hos Skatteverket, eller avbryt begäran för att ta med fakturan i en ny fil.`
|
|
: holdingRequest.status === 'submitted'
|
|
? `Fakturan ingår redan i ${requestLabel} som väntar på Skatteverkets beslut.`
|
|
: `Fakturan ingår redan i ${requestLabel}.`,
|
|
})
|
|
continue
|
|
}
|
|
|
|
if (result.ok) {
|
|
eligible.push({
|
|
invoice_id: invoice.id,
|
|
invoice_number: invoice.invoice_number ?? null,
|
|
customer_name: invoice.customer?.name ?? null,
|
|
personnummer_last4: result.value.arende.personnummer_last4,
|
|
betalnings_datum: result.value.arende.betalnings_datum,
|
|
pris_for_arbete: result.value.arende.pris_for_arbete,
|
|
begart_belopp: result.value.arende.begart_belopp,
|
|
})
|
|
} else {
|
|
blocked.push({
|
|
invoice_id: invoice.id,
|
|
invoice_number: invoice.invoice_number ?? null,
|
|
customer_name: invoice.customer?.name ?? null,
|
|
code: result.blocker.code,
|
|
message: result.blocker.message,
|
|
})
|
|
}
|
|
}
|
|
|
|
return { ok: true, eligible, blocked }
|
|
}
|
|
|
|
export type CreateRotRutRequestResult =
|
|
| { ok: true; request: Record<string, unknown>; file: BuildRotRutFileResult }
|
|
| {
|
|
ok: false
|
|
code:
|
|
| 'ROT_RUT_REQUEST_NOT_FOUND'
|
|
| 'ROT_RUT_NO_ELIGIBLE_INVOICES'
|
|
| 'ROT_RUT_INVOICES_BLOCKED'
|
|
| 'ROT_RUT_INVOICE_CONFLICT'
|
|
| 'ROT_RUT_FILE_CREATE_FAILED'
|
|
blockers?: RotRutBlocker[]
|
|
missingInvoiceIds?: string[]
|
|
}
|
|
|
|
/**
|
|
* Generate the begäran file for the given invoices and record the request +
|
|
* items. All-or-nothing: any blocked invoice rejects the whole call with the
|
|
* per-invoice blockers. The DB trigger enforce_single_active_rot_rut_request
|
|
* stays the authoritative double-request guard (surfaced as INVOICE_CONFLICT).
|
|
*
|
|
* Document archiving is deliberately NOT done here: it needs the storage
|
|
* bucket and differs per surface (the API route archives, best-effort).
|
|
*/
|
|
export async function createRotRutPayoutRequest(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
userId: string,
|
|
params: {
|
|
type: DeductionType
|
|
invoiceIds: string[]
|
|
name?: string
|
|
today?: string
|
|
},
|
|
): Promise<CreateRotRutRequestResult> {
|
|
const today = params.today ?? getSwedishLocalDate()
|
|
const name = (params.name ?? `${params.type.toUpperCase()} ${today}`).slice(0, 16)
|
|
|
|
const { data: invoices, error: invoicesError } = await supabase
|
|
.from('invoices')
|
|
.select('*, items:invoice_items(*)')
|
|
.eq('company_id', companyId)
|
|
.eq('document_type', 'invoice')
|
|
.in('id', params.invoiceIds)
|
|
|
|
if (invoicesError) {
|
|
return { ok: false, code: 'ROT_RUT_FILE_CREATE_FAILED' }
|
|
}
|
|
const foundIds = new Set((invoices ?? []).map((i) => i.id))
|
|
const missing = params.invoiceIds.filter((id) => !foundIds.has(id))
|
|
if (missing.length > 0) {
|
|
return { ok: false, code: 'ROT_RUT_REQUEST_NOT_FOUND', missingInvoiceIds: missing }
|
|
}
|
|
|
|
const file = buildRotRutFile({
|
|
type: params.type,
|
|
name,
|
|
invoices: (invoices ?? []) as unknown as Invoice[],
|
|
today,
|
|
})
|
|
|
|
if (!file.xml) {
|
|
return { ok: false, code: 'ROT_RUT_NO_ELIGIBLE_INVOICES', blockers: file.blockers }
|
|
}
|
|
if (file.blockers.length > 0) {
|
|
return { ok: false, code: 'ROT_RUT_INVOICES_BLOCKED', blockers: file.blockers }
|
|
}
|
|
|
|
const { data: payoutRequest, error: insertError } = await supabase
|
|
.from('rot_rut_payout_requests')
|
|
.insert({
|
|
company_id: companyId,
|
|
user_id: userId,
|
|
deduction_type: params.type,
|
|
name,
|
|
status: 'generated',
|
|
requested_total: file.requested_total,
|
|
file_name: file.file_name,
|
|
})
|
|
.select()
|
|
.single()
|
|
|
|
if (insertError || !payoutRequest) {
|
|
return { ok: false, code: 'ROT_RUT_FILE_CREATE_FAILED' }
|
|
}
|
|
|
|
const itemRows = file.arenden.map((a) => ({
|
|
request_id: payoutRequest.id,
|
|
invoice_id: a.invoice_id,
|
|
requested_amount: a.begart_belopp,
|
|
}))
|
|
const { error: itemsError } = await supabase
|
|
.from('rot_rut_payout_request_items')
|
|
.insert(itemRows)
|
|
|
|
if (itemsError) {
|
|
// Roll back the header row: without items the request is meaningless.
|
|
await supabase.from('rot_rut_payout_requests').delete().eq('id', payoutRequest.id)
|
|
const conflict =
|
|
(itemsError as { code?: string }).code === '23505' ||
|
|
itemsError.message?.includes('active rot/rut payout request')
|
|
return { ok: false, code: conflict ? 'ROT_RUT_INVOICE_CONFLICT' : 'ROT_RUT_FILE_CREATE_FAILED' }
|
|
}
|
|
|
|
return { ok: true, request: payoutRequest, file }
|
|
}
|