* fix(transactions): retire stale invoice match pointers when an invoice settles potential_invoice_id / potential_supplier_invoice_id are write-once import suggestions: nothing revisited them once written. With recurring same-amount invoices, an earlier suggestion pointed transaction A at invoice X, X was then paid off by transaction B, and A kept pointing at a fully paid invoice. The match dialog computed its amount diff against that invoice's 0 kr remaining_amount and reported a bogus partial payment, and the dead pointer also blocked a fresh suggestion: both re-suggestion scans require the column to be NULL. Add one shared helper, clearSettledInvoiceSuggestions(), that nulls a settled invoice's own suggestion column on every other transaction of the same company, scoped by company_id and by that invoice id only, never widening to the confirmed invoice_id / supplier_invoice_id links. It is best effort by construction: every caller has already booked a payment verifikat, so a failed cleanup logs and returns instead of failing the settle. Wired into every path where an invoice reaches paid through a payment: the dashboard and v1 match-invoice / match-supplier-invoice routes, the dashboard and v1 mark-paid routes, settleInvoicePayment, the batch allocation route (per fully settled allocation), linkInvoiceToVoucher and linkSupplierInvoiceToVoucher, linkTransactionToJournalEntry, and the MCP staged-operation executors for mark_invoice_paid and match_transaction_invoice. Partial payments are deliberately left alone: a partially paid invoice is still matchable. The v1 supplier match route also clears its own row's hint, which it was missing next to its dashboard twin. Read-time revalidation stays as the backstop for the paths not wired up here. countSuggestedMatches now delegates to listSuggestedMatches, which already revalidates candidates, so the worklist badge can no longer claim a number the list refuses to render. A data-only backfill migration retires the pointers already stranded in the database. It touches no journal entry, verifikat or period-locked data, is idempotent, and its status lists mirror lib/invoices/matchable-statuses.ts. Fixes #1259 Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * fix(transactions): wire the MCP batch allocation into the settled-pointer cleanup Review follow-up on the #1259 fix. commitMatchBatchAllocate calls the same match_batch_allocate RPC as the dashboard route, and gnubok_match_batch_allocate is a live staged MCP tool, so an agent settling a samlingsbetalning reproduced the issue exactly: the RPC nulls potential_invoice_id / potential_supplier_invoice_id only on the source transaction, leaving every other transaction of the company pointing at an invoice the batch just closed. The per-allocation loop moves into clearSettledBatchAllocationSuggestions() so the HTTP route and the MCP executor run the same code and cannot drift again, with a commit-path test pinning that only the fully settled allocation is retired. The enlarged badge scan is made safe. countSuggestedMatches now feeds up to 200 ids into listSuggestedMatches, past the 150 per .in() that countInboxDocuments already chunks for, so the candidate lookups are chunked at IN_CLAUSE_CHUNK too and their ids deduped. Both lookups now check .error: previously a 414, a 500 or an RLS change produced empty maps, an empty list and a zero badge with nothing logged. Every failure branch here logs companyId, matching the logAndZero convention. Also: restore the anchorSupplierInvoiceDocument doc comment above its own call in the dashboard supplier-invoice mark-paid route (the #1259 block had been inserted between them), and assert the transaction update payload in the v1 match-supplier-invoice test, which now covers the potential_supplier_invoice_id null that the route was missing next to its dashboard twin. Fixes #1259 Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
385 lines
13 KiB
TypeScript
385 lines
13 KiB
TypeScript
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
|
import { createQueuedMockSupabase, makeInvoice } from '@/tests/helpers'
|
|
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
import type { Invoice } from '@/types'
|
|
|
|
vi.mock('@/lib/bookkeeping/invoice-entries', () => ({
|
|
createInvoicePaymentJournalEntry: vi.fn(),
|
|
createInvoiceCashEntry: vi.fn(),
|
|
}))
|
|
vi.mock('@/lib/bookkeeping/engine', () => ({
|
|
createJournalEntry: vi.fn(),
|
|
findFiscalPeriod: vi.fn(),
|
|
}))
|
|
vi.mock('@/lib/bookkeeping/cancel-orphaned-entry', () => ({
|
|
cancelOrphanedPaymentEntry: vi.fn(),
|
|
}))
|
|
// Mocked so it consumes no slot in the queued Supabase mock: the helper's own
|
|
// query shape is pinned by ./clear-settled-invoice-suggestions.test.ts.
|
|
vi.mock('@/lib/invoices/clear-settled-invoice-suggestions', () => ({
|
|
clearSettledInvoiceSuggestions: vi.fn(),
|
|
}))
|
|
|
|
import {
|
|
createInvoicePaymentJournalEntry,
|
|
createInvoiceCashEntry,
|
|
} from '@/lib/bookkeeping/invoice-entries'
|
|
import { createJournalEntry, findFiscalPeriod } from '@/lib/bookkeeping/engine'
|
|
import { cancelOrphanedPaymentEntry } from '@/lib/bookkeeping/cancel-orphaned-entry'
|
|
import { clearSettledInvoiceSuggestions } from '@/lib/invoices/clear-settled-invoice-suggestions'
|
|
import { settleInvoicePayment } from '@/lib/invoices/settle-invoice-payment'
|
|
import { eventBus } from '@/lib/events'
|
|
|
|
function payableInvoice(overrides: Partial<Invoice> = {}) {
|
|
return {
|
|
...makeInvoice({ id: 'inv-1', status: 'sent', total: 1250, currency: 'SEK' }),
|
|
remaining_amount: 1250,
|
|
paid_amount: 0,
|
|
customer: { name: 'Kund AB' },
|
|
...overrides,
|
|
} as Invoice & { customer?: { name?: string | null } | null }
|
|
}
|
|
|
|
const BASE_PARAMS = {
|
|
paymentAmountInInvoiceCurrency: 1250,
|
|
paymentDate: '2026-07-12',
|
|
accountingMethod: 'accrual',
|
|
entityType: 'aktiebolag' as const,
|
|
}
|
|
|
|
describe('settleInvoicePayment', () => {
|
|
beforeEach(() => {
|
|
vi.clearAllMocks()
|
|
eventBus.clear()
|
|
vi.mocked(createInvoicePaymentJournalEntry).mockResolvedValue({ id: 'je-1' } as never)
|
|
vi.mocked(createInvoiceCashEntry).mockResolvedValue({ id: 'je-2' } as never)
|
|
})
|
|
|
|
it('rejects credit notes before creating a journal entry or updating state', async () => {
|
|
const { supabase } = createQueuedMockSupabase()
|
|
const result = await settleInvoicePayment(
|
|
supabase as unknown as SupabaseClient,
|
|
'company-1',
|
|
'user-1',
|
|
{
|
|
...BASE_PARAMS,
|
|
invoice: payableInvoice({ credited_invoice_id: 'original-invoice-1' }),
|
|
},
|
|
)
|
|
|
|
expect(result).toEqual({
|
|
ok: false,
|
|
code: 'INVOICE_PAID_NOT_PAYABLE',
|
|
details: { reason: 'credit_note' },
|
|
})
|
|
expect(vi.mocked(createInvoicePaymentJournalEntry)).not.toHaveBeenCalled()
|
|
expect(vi.mocked(createInvoiceCashEntry)).not.toHaveBeenCalled()
|
|
expect(vi.mocked(createJournalEntry)).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('books via the payment entry and forwards the settlement account', async () => {
|
|
const { supabase, enqueue } = createQueuedMockSupabase()
|
|
enqueue({ data: [{ id: 'inv-1' }] }) // CAS update matched
|
|
|
|
const invoice = payableInvoice({ journal_entry_id: 'je-orig' } as Partial<Invoice>)
|
|
const result = await settleInvoicePayment(
|
|
supabase as unknown as SupabaseClient,
|
|
'company-1',
|
|
'user-1',
|
|
{ ...BASE_PARAMS, invoice, settlementAccountNumber: '1686' },
|
|
)
|
|
|
|
expect(result).toMatchObject({ ok: true, newStatus: 'paid', journalEntryId: 'je-1' })
|
|
expect(vi.mocked(createInvoicePaymentJournalEntry)).toHaveBeenCalledWith(
|
|
expect.anything(),
|
|
'company-1',
|
|
'user-1',
|
|
invoice,
|
|
'2026-07-12',
|
|
undefined,
|
|
'Kund AB',
|
|
undefined,
|
|
'1686',
|
|
)
|
|
})
|
|
|
|
it('uses the cash entry for unbooked kontantmetoden invoices', async () => {
|
|
const { supabase, enqueue } = createQueuedMockSupabase()
|
|
enqueue({ data: [{ id: 'inv-1' }] })
|
|
|
|
const invoice = payableInvoice({ journal_entry_id: null } as Partial<Invoice>)
|
|
const result = await settleInvoicePayment(
|
|
supabase as unknown as SupabaseClient,
|
|
'company-1',
|
|
'user-1',
|
|
{ ...BASE_PARAMS, invoice, accountingMethod: 'cash', settlementAccountNumber: '1686' },
|
|
)
|
|
|
|
expect(result.ok).toBe(true)
|
|
expect(vi.mocked(createInvoiceCashEntry)).toHaveBeenCalledWith(
|
|
expect.anything(),
|
|
'company-1',
|
|
'user-1',
|
|
invoice,
|
|
'2026-07-12',
|
|
'aktiebolag',
|
|
'Kund AB',
|
|
'1686',
|
|
)
|
|
expect(vi.mocked(createInvoicePaymentJournalEntry)).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('absorbs a sub-krona öresavrundning overshoot on SEK custom lines', async () => {
|
|
vi.mocked(findFiscalPeriod).mockResolvedValue('fp-1')
|
|
vi.mocked(createJournalEntry).mockResolvedValue({ id: 'je-ore' } as never)
|
|
const { supabase, enqueue } = createQueuedMockSupabase()
|
|
enqueue({ data: [{ id: 'inv-1' }] }) // CAS update matched
|
|
|
|
// Invoice total 1234.75, PDF "Att betala" 1235.00: the customer pays the
|
|
// rounded amount and the 3740 line carries the residual.
|
|
const invoice = payableInvoice({
|
|
total: 1234.75,
|
|
remaining_amount: 1234.75,
|
|
journal_entry_id: 'je-orig',
|
|
} as Partial<Invoice>)
|
|
const result = await settleInvoicePayment(
|
|
supabase as unknown as SupabaseClient,
|
|
'company-1',
|
|
'user-1',
|
|
{
|
|
...BASE_PARAMS,
|
|
invoice,
|
|
paymentAmountInInvoiceCurrency: 1235,
|
|
customLines: [
|
|
{ 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 },
|
|
],
|
|
},
|
|
)
|
|
|
|
expect(result).toMatchObject({
|
|
ok: true,
|
|
newStatus: 'paid',
|
|
newPaidAmount: 1234.75,
|
|
newRemaining: 0,
|
|
journalEntryId: 'je-ore',
|
|
})
|
|
})
|
|
|
|
it('keeps a sub-krona short partial WITHOUT a 3740 line partially paid', async () => {
|
|
vi.mocked(findFiscalPeriod).mockResolvedValue('fp-1')
|
|
vi.mocked(createJournalEntry).mockResolvedValue({ id: 'je-partial' } as never)
|
|
const { supabase, enqueue } = createQueuedMockSupabase()
|
|
enqueue({ data: [{ id: 'inv-1' }] }) // CAS update matched
|
|
|
|
// Deliberate partial: both legs lowered, no 3740. Absorbing here would
|
|
// flip the invoice to paid while 1510 keeps the 0.75 residual.
|
|
const invoice = payableInvoice({
|
|
total: 1234.75,
|
|
remaining_amount: 1234.75,
|
|
journal_entry_id: 'je-orig',
|
|
} as Partial<Invoice>)
|
|
const result = await settleInvoicePayment(
|
|
supabase as unknown as SupabaseClient,
|
|
'company-1',
|
|
'user-1',
|
|
{
|
|
...BASE_PARAMS,
|
|
invoice,
|
|
paymentAmountInInvoiceCurrency: 1234,
|
|
customLines: [
|
|
{ account_number: '1930', debit_amount: 1234, credit_amount: 0 },
|
|
{ account_number: '1510', debit_amount: 0, credit_amount: 1234 },
|
|
],
|
|
},
|
|
)
|
|
|
|
expect(result).toMatchObject({
|
|
ok: true,
|
|
newStatus: 'partially_paid',
|
|
newPaidAmount: 1234,
|
|
newRemaining: 0.75,
|
|
})
|
|
})
|
|
|
|
it('rejects a sub-krona custom-line overshoot WITHOUT a 3740 line', async () => {
|
|
const { supabase } = createQueuedMockSupabase()
|
|
const invoice = payableInvoice({
|
|
total: 1234.75,
|
|
remaining_amount: 1234.75,
|
|
} as Partial<Invoice>)
|
|
const result = await settleInvoicePayment(
|
|
supabase as unknown as SupabaseClient,
|
|
'company-1',
|
|
'user-1',
|
|
{
|
|
...BASE_PARAMS,
|
|
invoice,
|
|
paymentAmountInInvoiceCurrency: 1235.25,
|
|
customLines: [
|
|
{ account_number: '1930', debit_amount: 1235.25, credit_amount: 0 },
|
|
{ account_number: '1510', debit_amount: 0, credit_amount: 1235.25 },
|
|
],
|
|
},
|
|
)
|
|
expect(result).toMatchObject({ ok: false, code: 'MATCH_AMOUNT_EXCEEDS_REMAINING' })
|
|
expect(vi.mocked(createJournalEntry)).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('rejects a custom-line overshoot beyond the öre band', async () => {
|
|
const { supabase } = createQueuedMockSupabase()
|
|
const invoice = payableInvoice({
|
|
total: 1234.75,
|
|
remaining_amount: 1234.75,
|
|
} as Partial<Invoice>)
|
|
const result = await settleInvoicePayment(
|
|
supabase as unknown as SupabaseClient,
|
|
'company-1',
|
|
'user-1',
|
|
{
|
|
...BASE_PARAMS,
|
|
invoice,
|
|
paymentAmountInInvoiceCurrency: 1236,
|
|
customLines: [
|
|
{ account_number: '1930', debit_amount: 1236, credit_amount: 0 },
|
|
{ account_number: '1510', debit_amount: 0, credit_amount: 1236 },
|
|
],
|
|
},
|
|
)
|
|
expect(result).toMatchObject({ ok: false, code: 'MATCH_AMOUNT_EXCEEDS_REMAINING' })
|
|
expect(vi.mocked(createJournalEntry)).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('does not absorb öre overshoot for non-SEK invoices', async () => {
|
|
const { supabase } = createQueuedMockSupabase()
|
|
const invoice = payableInvoice({
|
|
total: 100,
|
|
remaining_amount: 100,
|
|
currency: 'EUR',
|
|
} as Partial<Invoice>)
|
|
const result = await settleInvoicePayment(
|
|
supabase as unknown as SupabaseClient,
|
|
'company-1',
|
|
'user-1',
|
|
{
|
|
...BASE_PARAMS,
|
|
invoice,
|
|
paymentAmountInInvoiceCurrency: 100.25,
|
|
customLines: [
|
|
{ account_number: '1930', debit_amount: 100.25, credit_amount: 0 },
|
|
{ account_number: '1510', debit_amount: 0, credit_amount: 100.25 },
|
|
],
|
|
},
|
|
)
|
|
expect(result).toMatchObject({ ok: false, code: 'MATCH_AMOUNT_EXCEEDS_REMAINING' })
|
|
})
|
|
|
|
it('rejects overpayment before creating any journal entry', async () => {
|
|
const { supabase } = createQueuedMockSupabase()
|
|
const result = await settleInvoicePayment(
|
|
supabase as unknown as SupabaseClient,
|
|
'company-1',
|
|
'user-1',
|
|
{ ...BASE_PARAMS, invoice: payableInvoice(), paymentAmountInInvoiceCurrency: 9999 },
|
|
)
|
|
expect(result).toMatchObject({ ok: false, code: 'MATCH_AMOUNT_EXCEEDS_REMAINING' })
|
|
expect(vi.mocked(createInvoicePaymentJournalEntry)).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('fails closed when no journal entry is produced', async () => {
|
|
vi.mocked(createInvoicePaymentJournalEntry).mockResolvedValue(null)
|
|
const { supabase } = createQueuedMockSupabase()
|
|
const result = await settleInvoicePayment(
|
|
supabase as unknown as SupabaseClient,
|
|
'company-1',
|
|
'user-1',
|
|
{ ...BASE_PARAMS, invoice: payableInvoice() },
|
|
)
|
|
expect(result).toMatchObject({ ok: false, code: 'INVOICE_PAID_BOOK_FAILED' })
|
|
})
|
|
|
|
it('cancels the orphaned voucher when the CAS update loses the race', async () => {
|
|
const { supabase, enqueue } = createQueuedMockSupabase()
|
|
enqueue({ data: [] }) // CAS update matched nothing (concurrent settle)
|
|
|
|
const result = await settleInvoicePayment(
|
|
supabase as unknown as SupabaseClient,
|
|
'company-1',
|
|
'user-1',
|
|
{ ...BASE_PARAMS, invoice: payableInvoice() },
|
|
)
|
|
|
|
expect(result).toMatchObject({ ok: false, code: 'INVOICE_PAID_RACE' })
|
|
expect(vi.mocked(cancelOrphanedPaymentEntry)).toHaveBeenCalledWith(
|
|
expect.anything(),
|
|
'company-1',
|
|
'user-1',
|
|
'je-1',
|
|
expect.any(String),
|
|
)
|
|
})
|
|
|
|
// Issue #1259: a fully settled invoice must not keep sibling transactions
|
|
// pointing at it as a match suggestion.
|
|
it('retires the settled invoice suggestions when the invoice reaches paid', async () => {
|
|
const { supabase, enqueue } = createQueuedMockSupabase()
|
|
enqueue({ data: [{ id: 'inv-1' }] })
|
|
|
|
const result = await settleInvoicePayment(
|
|
supabase as unknown as SupabaseClient,
|
|
'company-1',
|
|
'user-1',
|
|
{ ...BASE_PARAMS, invoice: payableInvoice() },
|
|
)
|
|
|
|
expect(result).toMatchObject({ ok: true, newStatus: 'paid' })
|
|
expect(vi.mocked(clearSettledInvoiceSuggestions)).toHaveBeenCalledTimes(1)
|
|
expect(vi.mocked(clearSettledInvoiceSuggestions)).toHaveBeenCalledWith(
|
|
supabase,
|
|
'company-1',
|
|
'invoice',
|
|
'inv-1',
|
|
)
|
|
})
|
|
|
|
it('leaves the suggestions alone on a partial payment: the invoice is still matchable', async () => {
|
|
const { supabase, enqueue } = createQueuedMockSupabase()
|
|
enqueue({ data: [{ id: 'inv-1' }] })
|
|
|
|
const result = await settleInvoicePayment(
|
|
supabase as unknown as SupabaseClient,
|
|
'company-1',
|
|
'user-1',
|
|
{
|
|
...BASE_PARAMS,
|
|
paymentAmountInInvoiceCurrency: 500,
|
|
invoice: payableInvoice(),
|
|
},
|
|
)
|
|
|
|
expect(result).toMatchObject({ ok: true, newStatus: 'partially_paid' })
|
|
expect(vi.mocked(clearSettledInvoiceSuggestions)).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('emits invoice.paid with the settled state', async () => {
|
|
const handler = vi.fn()
|
|
eventBus.on('invoice.paid', handler)
|
|
const { supabase, enqueue } = createQueuedMockSupabase()
|
|
enqueue({ data: [{ id: 'inv-1' }] })
|
|
|
|
await settleInvoicePayment(supabase as unknown as SupabaseClient, 'company-1', 'user-1', {
|
|
...BASE_PARAMS,
|
|
invoice: payableInvoice(),
|
|
})
|
|
|
|
expect(handler).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
companyId: 'company-1',
|
|
paymentAmount: 1250,
|
|
invoice: expect.objectContaining({ id: 'inv-1', status: 'paid' }),
|
|
}),
|
|
)
|
|
})
|
|
})
|