Whole-krona Bankgiro/Swish payments of öre-bearing invoices were stranded as partially_paid forever (e.g. 11 231 paid on an 11 231,25 invoice left 0,25 kr open). Book the sub-krona residual to BAS 3740 (Öres- och kronutjämning) and settle the invoice in full, on both the supplier- and customer-invoice match flows. New shared pure helpers buildSupplierPaymentClearingLines + planSupplierPayment mirror the customer-side primitives; routing preview and commit through the same builder also fixes two pre-existing preview↔commit drifts (payment account + line descriptions). Öre absorption is accrual-only — cash entries book the full invoice, so absorbing there would hide a 1930 discrepancy. Also improves supplier-invoice ↔ bank matching: - Pass-3 date window now spans [invoice_date-5, due_date+5] instead of due_date ±5, so early payments auto-match; an ambiguity guard demotes non-unique amount matches to suggestions. - New retroactive matcher (on supplier_invoice.registered/.approved) surfaces the settling bank payment when the invoice is registered after the payment was imported. Matches are written as suggestions for one-click confirm-to-book, never silently auto-booked. Tests: new unit tests for both pure helpers; extended matching, handler, customer öre, and route suites. Full suite green (407 files / 5364 tests). Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
339 lines
11 KiB
TypeScript
339 lines
11 KiB
TypeScript
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
|
import { eventBus } from '@/lib/events/bus'
|
|
import {
|
|
createQueuedMockSupabase,
|
|
makeSupplierInvoice,
|
|
} from '@/tests/helpers'
|
|
|
|
vi.mock('@/lib/supabase/server', () => ({
|
|
createClient: vi.fn(),
|
|
}))
|
|
|
|
vi.mock('@/lib/bookkeeping/supplier-invoice-entries', () => ({
|
|
createSupplierInvoiceRegistrationEntry: vi.fn(),
|
|
}))
|
|
|
|
vi.mock('@/lib/invoices/match-log', () => ({
|
|
logMatchEvent: vi.fn(),
|
|
}))
|
|
|
|
import { createClient } from '@/lib/supabase/server'
|
|
import { createSupplierInvoiceRegistrationEntry } from '@/lib/bookkeeping/supplier-invoice-entries'
|
|
import { logMatchEvent } from '@/lib/invoices/match-log'
|
|
import { makeTransaction } from '@/tests/helpers'
|
|
import { registerSupplierInvoiceHandler } from '../supplier-invoice-handler'
|
|
|
|
const mockCreateClient = vi.mocked(createClient)
|
|
const mockCreateEntry = vi.mocked(createSupplierInvoiceRegistrationEntry)
|
|
const mockLogMatch = vi.mocked(logMatchEvent)
|
|
|
|
/**
|
|
* Minimal Supabase mock for the retro-match handler that RECORDS the
|
|
* transactions `.update()` payloads (the queued proxy mock can't), so we can
|
|
* assert it writes a suggestion column rather than an auto-link.
|
|
*/
|
|
function makeRetroMock(opts: {
|
|
invoice: unknown
|
|
linkedCount: number
|
|
candidates: unknown[]
|
|
}) {
|
|
const updates: Record<string, unknown>[] = []
|
|
const chain = (result: unknown): unknown =>
|
|
new Proxy(
|
|
{},
|
|
{
|
|
get(_t, prop) {
|
|
if (prop === 'then') return (resolve: (v: unknown) => void) => resolve(result)
|
|
return () => chain(result)
|
|
},
|
|
},
|
|
)
|
|
const supabase = {
|
|
from: vi.fn((table: string) => {
|
|
if (table === 'supplier_invoices') return chain({ data: opts.invoice, error: null })
|
|
if (table === 'transactions') {
|
|
return {
|
|
select: (_cols: string, selOpts?: { count?: string }) =>
|
|
selOpts?.count
|
|
? chain({ count: opts.linkedCount, data: null, error: null })
|
|
: chain({ data: opts.candidates, error: null }),
|
|
update: (payload: Record<string, unknown>) => {
|
|
updates.push(payload)
|
|
return chain({ data: null, error: null })
|
|
},
|
|
}
|
|
}
|
|
return chain({ data: null, error: null })
|
|
}),
|
|
}
|
|
return { supabase, updates }
|
|
}
|
|
|
|
function emitRegistered(invoiceId: string) {
|
|
return eventBus.emit({
|
|
type: 'supplier_invoice.registered',
|
|
payload: {
|
|
supplierInvoice: { id: invoiceId } as never,
|
|
userId: 'user-1',
|
|
companyId: 'company-1',
|
|
},
|
|
})
|
|
}
|
|
|
|
describe('Supplier Invoice Core Handler', () => {
|
|
let unsubscribe: () => void
|
|
|
|
beforeEach(() => {
|
|
vi.clearAllMocks()
|
|
eventBus.clear()
|
|
unsubscribe = registerSupplierInvoiceHandler()
|
|
})
|
|
|
|
afterEach(() => {
|
|
unsubscribe()
|
|
})
|
|
|
|
it('creates registration journal entry for accrual method', async () => {
|
|
const { supabase, enqueueMany } = createQueuedMockSupabase()
|
|
enqueueMany([
|
|
// 1. supplier_invoices (re-fetch guard)
|
|
{ data: { registration_journal_entry_id: null }, error: null },
|
|
// 2. company_settings
|
|
{ data: { accounting_method: 'accrual' }, error: null },
|
|
// 3. supplier_invoice_items
|
|
{ data: [{ id: 'item-1', account_number: '6200', line_total: 1000, sort_order: 0 }], error: null },
|
|
// 4. supplier (type)
|
|
{ data: { supplier_type: 'swedish_business' }, error: null },
|
|
// 5. Update invoice with journal entry id
|
|
{ data: null, error: null },
|
|
])
|
|
mockCreateClient.mockResolvedValue(supabase as never)
|
|
mockCreateEntry.mockResolvedValue({ id: 'je-1' } as never)
|
|
|
|
const invoice = makeSupplierInvoice({ id: 'si-1', supplier_id: 'sup-1' })
|
|
|
|
await eventBus.emit({
|
|
type: 'supplier_invoice.confirmed',
|
|
payload: {
|
|
inboxItem: { id: 'inbox-1' } as never,
|
|
supplierInvoice: invoice,
|
|
userId: 'user-1',
|
|
companyId: 'company-1',
|
|
},
|
|
})
|
|
|
|
expect(mockCreateEntry).toHaveBeenCalledWith(
|
|
expect.anything(),
|
|
'company-1',
|
|
'user-1',
|
|
invoice,
|
|
expect.any(Array),
|
|
'swedish_business'
|
|
)
|
|
})
|
|
|
|
it('skips journal entry for cash method', async () => {
|
|
const { supabase, enqueueMany } = createQueuedMockSupabase()
|
|
enqueueMany([
|
|
// supplier_invoices (re-fetch guard)
|
|
{ data: { registration_journal_entry_id: null }, error: null },
|
|
// company_settings with cash method
|
|
{ data: { accounting_method: 'cash' }, error: null },
|
|
])
|
|
mockCreateClient.mockResolvedValue(supabase as never)
|
|
|
|
const invoice = makeSupplierInvoice({ id: 'si-2' })
|
|
|
|
await eventBus.emit({
|
|
type: 'supplier_invoice.confirmed',
|
|
payload: {
|
|
inboxItem: { id: 'inbox-2' } as never,
|
|
supplierInvoice: invoice,
|
|
userId: 'user-1',
|
|
companyId: 'company-1',
|
|
},
|
|
})
|
|
|
|
expect(mockCreateEntry).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('handles journal entry creation failure gracefully', async () => {
|
|
const { supabase, enqueueMany } = createQueuedMockSupabase()
|
|
enqueueMany([
|
|
{ data: { registration_journal_entry_id: null }, error: null },
|
|
{ data: { accounting_method: 'accrual' }, error: null },
|
|
{ data: [{ id: 'item-1', account_number: '6200', line_total: 500, sort_order: 0 }], error: null },
|
|
{ data: { supplier_type: 'swedish_business' }, error: null },
|
|
])
|
|
mockCreateClient.mockResolvedValue(supabase as never)
|
|
mockCreateEntry.mockRejectedValue(new Error('No fiscal period'))
|
|
|
|
const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
|
|
|
|
const invoice = makeSupplierInvoice({ id: 'si-3' })
|
|
|
|
// Should not throw
|
|
await eventBus.emit({
|
|
type: 'supplier_invoice.confirmed',
|
|
payload: {
|
|
inboxItem: { id: 'inbox-3' } as never,
|
|
supplierInvoice: invoice,
|
|
userId: 'user-1',
|
|
companyId: 'company-1',
|
|
},
|
|
})
|
|
|
|
// Logger emits a structured error line; assert the handler logged the
|
|
// failure with the right module prefix and an Error somewhere in the args.
|
|
const calls = consoleSpy.mock.calls
|
|
expect(calls.length).toBeGreaterThan(0)
|
|
expect(calls.some((c) => String(c[0]).includes('[supplier-invoice-handler]'))).toBe(true)
|
|
expect(
|
|
calls.some((c) =>
|
|
c.some(
|
|
(arg) =>
|
|
arg instanceof Error ||
|
|
(typeof arg === 'object' &&
|
|
arg !== null &&
|
|
(arg as { message?: unknown }).message === 'No fiscal period'),
|
|
),
|
|
),
|
|
).toBe(true)
|
|
|
|
consoleSpy.mockRestore()
|
|
})
|
|
|
|
it('skips creation when payload.supplierInvoice.registration_journal_entry_id is already set', async () => {
|
|
const { supabase } = createQueuedMockSupabase()
|
|
mockCreateClient.mockResolvedValue(supabase as never)
|
|
|
|
const invoice = makeSupplierInvoice({
|
|
id: 'si-4',
|
|
registration_journal_entry_id: 'je-existing',
|
|
})
|
|
|
|
await eventBus.emit({
|
|
type: 'supplier_invoice.confirmed',
|
|
payload: {
|
|
inboxItem: { id: 'inbox-4' } as never,
|
|
supplierInvoice: invoice,
|
|
userId: 'user-1',
|
|
companyId: 'company-1',
|
|
},
|
|
})
|
|
|
|
expect(mockCreateEntry).not.toHaveBeenCalled()
|
|
// No DB calls should have been made either (payload guard is pre-DB)
|
|
expect(mockCreateClient).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('skips creation when db row already has registration_journal_entry_id (stale payload)', async () => {
|
|
const { supabase, enqueueMany } = createQueuedMockSupabase()
|
|
enqueueMany([
|
|
// supplier_invoices re-fetch returns an already-linked entry
|
|
{ data: { registration_journal_entry_id: 'je-db' }, error: null },
|
|
])
|
|
mockCreateClient.mockResolvedValue(supabase as never)
|
|
|
|
const invoice = makeSupplierInvoice({ id: 'si-5', registration_journal_entry_id: null })
|
|
|
|
await eventBus.emit({
|
|
type: 'supplier_invoice.confirmed',
|
|
payload: {
|
|
inboxItem: { id: 'inbox-5' } as never,
|
|
supplierInvoice: invoice,
|
|
userId: 'user-1',
|
|
companyId: 'company-1',
|
|
},
|
|
})
|
|
|
|
expect(mockCreateEntry).not.toHaveBeenCalled()
|
|
})
|
|
|
|
describe('retroactive match on supplier_invoice.registered', () => {
|
|
const baseInvoice = () =>
|
|
makeSupplierInvoice({
|
|
id: 'si-retro',
|
|
status: 'registered',
|
|
remaining_amount: 29890,
|
|
total: 29890,
|
|
invoice_date: '2026-06-05',
|
|
due_date: '2026-07-05',
|
|
transaction_id: null,
|
|
payment_reference: null,
|
|
})
|
|
|
|
const matchingTx = () =>
|
|
makeTransaction({
|
|
id: 'tx-retro',
|
|
amount: -29890, // exact, in-window → Pass 3 amount_date (0.85)
|
|
date: '2026-06-08',
|
|
description: 'Bg-bet via internet',
|
|
reference: null,
|
|
supplier_invoice_id: null,
|
|
journal_entry_id: null,
|
|
})
|
|
|
|
it('writes a SUGGESTION (never an auto-link) for an exact in-window payment', async () => {
|
|
const { supabase, updates } = makeRetroMock({
|
|
invoice: baseInvoice(),
|
|
linkedCount: 0,
|
|
candidates: [matchingTx()],
|
|
})
|
|
mockCreateClient.mockResolvedValue(supabase as never)
|
|
|
|
await emitRegistered('si-retro')
|
|
|
|
// The whole point of "pre-fill, confirm to book": suggestion column only.
|
|
expect(updates).toEqual([{ potential_supplier_invoice_id: 'si-retro' }])
|
|
expect(mockLogMatch).toHaveBeenCalledWith(
|
|
expect.anything(),
|
|
'user-1',
|
|
'tx-retro',
|
|
'auto_suggested',
|
|
expect.objectContaining({
|
|
supplierInvoiceId: 'si-retro',
|
|
matchMethod: 'amount_date',
|
|
matchConfidence: 0.85,
|
|
}),
|
|
)
|
|
})
|
|
|
|
it('no-ops when the invoice is already tied to a transaction', async () => {
|
|
const { supabase, updates } = makeRetroMock({
|
|
invoice: { ...baseInvoice(), transaction_id: 'tx-existing' },
|
|
linkedCount: 0,
|
|
candidates: [matchingTx()],
|
|
})
|
|
mockCreateClient.mockResolvedValue(supabase as never)
|
|
await emitRegistered('si-retro')
|
|
expect(updates).toHaveLength(0)
|
|
expect(mockLogMatch).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('no-ops (idempotent) when a transaction is already linked to the invoice', async () => {
|
|
const { supabase, updates } = makeRetroMock({
|
|
invoice: baseInvoice(),
|
|
linkedCount: 1,
|
|
candidates: [matchingTx()],
|
|
})
|
|
mockCreateClient.mockResolvedValue(supabase as never)
|
|
await emitRegistered('si-retro')
|
|
expect(updates).toHaveLength(0)
|
|
expect(mockLogMatch).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('no-ops when no candidate transaction matches', async () => {
|
|
const { supabase, updates } = makeRetroMock({
|
|
invoice: baseInvoice(),
|
|
linkedCount: 0,
|
|
candidates: [],
|
|
})
|
|
mockCreateClient.mockResolvedValue(supabase as never)
|
|
await emitRegistered('si-retro')
|
|
expect(updates).toHaveLength(0)
|
|
expect(mockLogMatch).not.toHaveBeenCalled()
|
|
})
|
|
})
|
|
})
|