Jakob WennbergandClaude Opus 4.7
a586cc8a58
* feat(transactions): show all library templates in picker; fix PSD2 seed-row collision - Booking template picker: surface every active library template, not only the convertible 2-account shapes. Multi-leg/complex templates route to the manual journal editor pre-filled via applyTemplate instead of being hidden. Drop direction filtering for user templates (inferred direction is unreliable); the curated static catalog still respects it. Add an "Aktivera och bokfor" recovery toast for TX_CATEGORIZE_INVALID_ACCOUNT mirroring the existing ACCOUNTS_NOT_IN_CHART flow. CreateTemplateForm reflows to one card per line so trash buttons stop colliding on narrow screens. - cash_accounts.upsertFromPsd2: the seed_default_cash_account migration plants a manual (bank_connection_id IS NULL) row on the same ledger_account, so the first PSD2 sync's upsert on (company_id, bank_connection_id, external_uid) cannot match it (NULL != NULL) and falls through to INSERT, tripping the (company_id, ledger_account) UNIQUE constraint. Look up and promote the seed row in place first. - Tests: pin the TX_CATEGORIZE_INVALID_ACCOUNT error shape the recovery toast parses; cover applyTemplate on shapes the converter rejects (split-expense and all-'business'-typed). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(transactions): PR review — currency metadata, MRU ordering, observable promote, BAS validation - TransactionBookingDialog.buildInitialLinesFromTemplate: attach buildCurrencyMetadata to settlement lines for foreign-currency transactions so the journal entry retains the original currency, amount, and exchange_rate. Without this, non-SEK transactions routed through a non-convertible template were recorded in SEK only with no foreign-currency annotation. (Greptile #2) - TemplatePicker.handleSelectLibraryRaw: only bump the MRU after confirming the click will actually do something (i.e. converted OR a callback is wired). Future consumers that omit onPickLibraryTemplate would otherwise corrupt MRU ordering for templates the user never successfully applied. (Greptile #1) - cash_accounts.upsertFromPsd2 promote-seed: add .select('id') so a zero-row UPDATE is observable. If the seed row vanishes between the SELECT and UPDATE (concurrent ops), fall through to the normal upsert instead of silently returning success without persisting anything. (Greptile #3, compliance A.8.9) - transactions/page.tsx TX_CATEGORIZE_INVALID_ACCOUNT toast: validate accountNumber against /^\d{4}$/ before embedding in any fetch URL/body. Defense-in-depth against a malformed server error envelope. (compliance V8.2.1) - categorize route test: switch the not-in-chart fixture from '4535' (Inköp av varor från annat EU-land — reverse-charge) to '5420' (Programvaror) so the example doesn't imply a domestic override against an EU-reverse-charge account would be valid without its paired moms legs. (Swedish compliance review #3) Other review items deliberately not addressed in this PR: - Validate-on-save that every VAT-rated template has a 'vat' line — overrides existing CreateTemplateForm UX, separate PR. - vat_rate enum guard in applyTemplate — defensive; the editor dropdown only surfaces legal rates and is the only write path in production today. - Imbalance UI warning — already handled: JournalEntryForm computes isBalanced and gates submission; DB trigger check_journal_entry_balance enforces BFL 5 kap server-side. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
248 lines
11 KiB
TypeScript
248 lines
11 KiB
TypeScript
import { describe, it, expect } from 'vitest'
|
|
import { applyTemplate, convertLibraryToBookingTemplate, getTemplateScope, LIBRARY_TEMPLATE_PREFIX, TEMPLATE_CATEGORY_LABELS } from '../template-library'
|
|
import type { BookingTemplateLibrary, BookingTemplateLibraryLine } from '@/types'
|
|
|
|
function makeLibraryTemplate(lines: BookingTemplateLibraryLine[], overrides: Partial<BookingTemplateLibrary> = {}): BookingTemplateLibrary {
|
|
return {
|
|
id: 'tpl-1',
|
|
company_id: 'co-1',
|
|
team_id: null,
|
|
created_by: 'user-1',
|
|
name: 'Test template',
|
|
description: '',
|
|
category: 'other',
|
|
entity_type: 'all',
|
|
lines,
|
|
is_system: false,
|
|
is_active: true,
|
|
created_at: '2026-01-01T00:00:00Z',
|
|
updated_at: '2026-01-01T00:00:00Z',
|
|
...overrides,
|
|
}
|
|
}
|
|
|
|
describe('applyTemplate', () => {
|
|
it('creates simple two-line debit/credit entries', () => {
|
|
const lines: BookingTemplateLibraryLine[] = [
|
|
{ account: '1630', label: 'Skattekonto', side: 'debit', type: 'business', ratio: 1.0 },
|
|
{ account: '1930', label: 'Företagskonto', side: 'credit', type: 'settlement', ratio: 1.0 },
|
|
]
|
|
const result = applyTemplate(lines, 10000)
|
|
expect(result).toHaveLength(2)
|
|
expect(result[0]).toEqual({
|
|
account_number: '1630',
|
|
debit_amount: '10000.00',
|
|
credit_amount: '',
|
|
line_description: 'Skattekonto',
|
|
})
|
|
expect(result[1]).toEqual({
|
|
account_number: '1930',
|
|
debit_amount: '',
|
|
credit_amount: '10000.00',
|
|
line_description: 'Företagskonto',
|
|
})
|
|
})
|
|
|
|
it('calculates VAT correctly for reverse charge (EU purchase)', () => {
|
|
const lines: BookingTemplateLibraryLine[] = [
|
|
{ account: '4010', label: 'Varuinköp', side: 'debit', type: 'business', ratio: 1.0 },
|
|
{ account: '2614', label: 'Utgående moms', side: 'credit', type: 'vat', vat_rate: 0.25 },
|
|
{ account: '2645', label: 'Ingående moms', side: 'debit', type: 'vat', vat_rate: 0.25 },
|
|
{ account: '1930', label: 'Företagskonto', side: 'credit', type: 'settlement', ratio: 1.0 },
|
|
]
|
|
// Total payment is 10000 SEK (no VAT on the payment itself for reverse charge)
|
|
const result = applyTemplate(lines, 10000)
|
|
expect(result).toHaveLength(4)
|
|
// Business line = 10000 * 1.0
|
|
expect(result[0].debit_amount).toBe('10000.00')
|
|
// VAT = 10000 * 0.25 / (1 + 0.25) = 2000
|
|
expect(result[1].credit_amount).toBe('2000.00')
|
|
expect(result[2].debit_amount).toBe('2000.00')
|
|
// Settlement = 10000
|
|
expect(result[3].credit_amount).toBe('10000.00')
|
|
})
|
|
|
|
it('handles representation with 25% input VAT', () => {
|
|
const lines: BookingTemplateLibraryLine[] = [
|
|
{ account: '6072', label: 'Representation', side: 'debit', type: 'business', ratio: 1.0 },
|
|
{ account: '2641', label: 'Ingående moms', side: 'debit', type: 'vat', vat_rate: 0.25 },
|
|
{ account: '1930', label: 'Företagskonto', side: 'credit', type: 'settlement', ratio: 1.0 },
|
|
]
|
|
// Total paid = 1250 (1000 + 250 VAT)
|
|
const result = applyTemplate(lines, 1250)
|
|
expect(result).toHaveLength(3)
|
|
// Business = 1250 (the representation cost at full ratio)
|
|
expect(result[0].debit_amount).toBe('1250.00')
|
|
// VAT = 1250 * 0.25 / 1.25 = 250
|
|
expect(result[1].debit_amount).toBe('250.00')
|
|
// Settlement = 1250
|
|
expect(result[2].credit_amount).toBe('1250.00')
|
|
})
|
|
|
|
it('rounds monetary values to 2 decimal places', () => {
|
|
const lines: BookingTemplateLibraryLine[] = [
|
|
{ account: '4010', label: 'Varuinköp', side: 'debit', type: 'business', ratio: 1.0 },
|
|
{ account: '2641', label: 'Ingående moms', side: 'debit', type: 'vat', vat_rate: 0.25 },
|
|
{ account: '1930', label: 'Bank', side: 'credit', type: 'settlement', ratio: 1.0 },
|
|
]
|
|
// 333.33 should produce clean rounding
|
|
const result = applyTemplate(lines, 333.33)
|
|
expect(result[0].debit_amount).toBe('333.33')
|
|
// 333.33 * 0.25 / 1.25 = 66.666 → 66.67
|
|
expect(result[1].debit_amount).toBe('66.67')
|
|
expect(result[2].credit_amount).toBe('333.33')
|
|
})
|
|
})
|
|
|
|
describe('getTemplateScope', () => {
|
|
it('identifies system templates', () => {
|
|
expect(getTemplateScope({ is_system: true, team_id: null, company_id: null })).toBe('system')
|
|
})
|
|
|
|
it('identifies team templates', () => {
|
|
expect(getTemplateScope({ is_system: false, team_id: 'team-1', company_id: null })).toBe('team')
|
|
})
|
|
|
|
it('identifies company templates', () => {
|
|
expect(getTemplateScope({ is_system: false, team_id: null, company_id: 'comp-1' })).toBe('company')
|
|
})
|
|
})
|
|
|
|
describe('TEMPLATE_CATEGORY_LABELS', () => {
|
|
it('has labels for all categories', () => {
|
|
expect(Object.keys(TEMPLATE_CATEGORY_LABELS)).toHaveLength(9)
|
|
expect(TEMPLATE_CATEGORY_LABELS.eu_trade).toBe('EU-handel')
|
|
expect(TEMPLATE_CATEGORY_LABELS.tax_account).toBe('Skattekonto')
|
|
})
|
|
})
|
|
|
|
describe('convertLibraryToBookingTemplate', () => {
|
|
it('converts a simple 2-line business + settlement template', () => {
|
|
const tpl = makeLibraryTemplate([
|
|
{ account: '6072', label: 'Representation', side: 'debit', type: 'business', ratio: 1 },
|
|
{ account: '1930', label: 'Företagskonto', side: 'credit', type: 'settlement', ratio: 1 },
|
|
])
|
|
const result = convertLibraryToBookingTemplate(tpl)
|
|
expect(result).not.toBeNull()
|
|
expect(result!.id).toBe(`${LIBRARY_TEMPLATE_PREFIX}tpl-1`)
|
|
expect(result!.direction).toBe('expense')
|
|
expect(result!.debit_account).toBe('6072')
|
|
expect(result!.credit_account).toBe('1930')
|
|
expect(result!.vat_treatment).toBeNull()
|
|
})
|
|
|
|
it('identifies direction "income" when business line is on credit', () => {
|
|
const tpl = makeLibraryTemplate([
|
|
{ account: '3001', label: 'Försäljning', side: 'credit', type: 'business', ratio: 1 },
|
|
{ account: '1930', label: 'Företagskonto', side: 'debit', type: 'settlement', ratio: 1 },
|
|
])
|
|
const result = convertLibraryToBookingTemplate(tpl)
|
|
expect(result).not.toBeNull()
|
|
expect(result!.direction).toBe('income')
|
|
expect(result!.debit_account).toBe('1930')
|
|
expect(result!.credit_account).toBe('3001')
|
|
})
|
|
|
|
it.each([
|
|
[0.25, 'standard_25'],
|
|
[0.12, 'reduced_12'],
|
|
[0.06, 'reduced_6'],
|
|
] as const)('extracts VAT treatment for rate %f', (rate, treatment) => {
|
|
const tpl = makeLibraryTemplate([
|
|
{ account: '4010', label: 'Varor', side: 'debit', type: 'business', ratio: 1 },
|
|
{ account: '2641', label: 'Ingående moms', side: 'debit', type: 'vat', vat_rate: rate },
|
|
{ account: '1930', label: 'Bank', side: 'credit', type: 'settlement', ratio: 1 },
|
|
])
|
|
const result = convertLibraryToBookingTemplate(tpl)
|
|
expect(result).not.toBeNull()
|
|
expect(result!.vat_treatment).toBe(treatment)
|
|
expect(result!.vat_rate).toBe(rate)
|
|
})
|
|
|
|
it('detects reverse charge via 2614 fictitious output VAT', () => {
|
|
const tpl = makeLibraryTemplate([
|
|
{ account: '4056', label: 'EU-varor', side: 'debit', type: 'business', ratio: 1 },
|
|
{ account: '2614', label: 'Utg. moms omv.', side: 'credit', type: 'vat', vat_rate: 0.25 },
|
|
{ account: '2645', label: 'Ing. moms omv.', side: 'debit', type: 'vat', vat_rate: 0.25 },
|
|
{ account: '1930', label: 'Bank', side: 'credit', type: 'settlement', ratio: 1 },
|
|
])
|
|
const result = convertLibraryToBookingTemplate(tpl)
|
|
expect(result).not.toBeNull()
|
|
expect(result!.vat_treatment).toBe('reverse_charge')
|
|
})
|
|
|
|
it('returns null when there are 2 business lines', () => {
|
|
const tpl = makeLibraryTemplate([
|
|
{ account: '6072', label: 'A', side: 'debit', type: 'business', ratio: 0.5 },
|
|
{ account: '6073', label: 'B', side: 'debit', type: 'business', ratio: 0.5 },
|
|
{ account: '1930', label: 'Bank', side: 'credit', type: 'settlement', ratio: 1 },
|
|
])
|
|
expect(convertLibraryToBookingTemplate(tpl)).toBeNull()
|
|
})
|
|
|
|
it('returns null when there is no settlement line', () => {
|
|
const tpl = makeLibraryTemplate([
|
|
{ account: '6072', label: 'A', side: 'debit', type: 'business', ratio: 1 },
|
|
{ account: '2641', label: 'Moms', side: 'debit', type: 'vat', vat_rate: 0.25 },
|
|
])
|
|
expect(convertLibraryToBookingTemplate(tpl)).toBeNull()
|
|
})
|
|
|
|
it('returns null when business and settlement are on the same side', () => {
|
|
const tpl = makeLibraryTemplate([
|
|
{ account: '6072', label: 'A', side: 'debit', type: 'business', ratio: 1 },
|
|
{ account: '1930', label: 'Bank', side: 'debit', type: 'settlement', ratio: 1 },
|
|
])
|
|
expect(convertLibraryToBookingTemplate(tpl)).toBeNull()
|
|
})
|
|
|
|
it('returns null when lines is not an array', () => {
|
|
const tpl = makeLibraryTemplate([], { lines: null as unknown as BookingTemplateLibraryLine[] })
|
|
expect(convertLibraryToBookingTemplate(tpl)).toBeNull()
|
|
})
|
|
|
|
// Real-world shape from before the editor defaulted new lines to 'vat': users
|
|
// would tap "add line" twice and end up with three lines all typed 'business'
|
|
// (the dropdown default at the time). The converter rightly rejects this;
|
|
// the transaction picker now still surfaces these templates and routes the
|
|
// click to the manual booking editor instead of hiding them.
|
|
it('returns null when every line is typed "business" (pre-#589 default)', () => {
|
|
const tpl = makeLibraryTemplate([
|
|
{ account: '5420', label: 'Programvara', side: 'debit', type: 'business', ratio: 1 },
|
|
{ account: '2640', label: 'Ingående moms', side: 'debit', type: 'business', ratio: 0.25 },
|
|
{ account: '1930', label: 'Företagskonto', side: 'credit', type: 'business', ratio: 1 },
|
|
])
|
|
expect(convertLibraryToBookingTemplate(tpl)).toBeNull()
|
|
})
|
|
})
|
|
|
|
describe('applyTemplate on shapes the converter rejects', () => {
|
|
// The transaction picker's fallback for unconvertible templates is to open
|
|
// the manual booking dialog with initialLines = applyTemplate(raw.lines, |amount|).
|
|
// These tests pin that path: even when the shape is too rich for the simple
|
|
// debit/credit summary, applyTemplate still produces a usable FormLine[].
|
|
it('still produces lines for a split-expense template (two business legs)', () => {
|
|
const lines: BookingTemplateLibraryLine[] = [
|
|
{ account: '5420', label: 'Programvara', side: 'debit', type: 'business', ratio: 0.7 },
|
|
{ account: '6991', label: 'Övrigt', side: 'debit', type: 'business', ratio: 0.3 },
|
|
{ account: '1930', label: 'Företagskonto', side: 'credit', type: 'settlement', ratio: 1 },
|
|
]
|
|
const result = applyTemplate(lines, 1000)
|
|
expect(result).toHaveLength(3)
|
|
expect(result[0].debit_amount).toBe('700.00')
|
|
expect(result[1].debit_amount).toBe('300.00')
|
|
expect(result[2].credit_amount).toBe('1000.00')
|
|
})
|
|
|
|
it('still produces lines when every leg is typed "business"', () => {
|
|
const lines: BookingTemplateLibraryLine[] = [
|
|
{ account: '5420', label: 'Programvara', side: 'debit', type: 'business', ratio: 1 },
|
|
{ account: '1930', label: 'Företagskonto', side: 'credit', type: 'business', ratio: 1 },
|
|
]
|
|
const result = applyTemplate(lines, 250)
|
|
expect(result).toHaveLength(2)
|
|
expect(result[0].debit_amount).toBe('250.00')
|
|
expect(result[1].credit_amount).toBe('250.00')
|
|
})
|
|
})
|