26e29f47bc
* feat(company): ideell förening as a third legal form, behind a flag (#2072 step 1) Why the problem occurred: the legal form was modelled as a binary flag in ~300 files. `EntityType` was a two-member union, but nothing dispatched on it exhaustively: 28 sites defaulted `?? 'enskild_firma'` (invoice, categorize, match, stripe, invoice-inbox) or `?? 'aktiebolag'` (year-end, bokslut, MCP), and every form-dependent choice was an `=== 'aktiebolag' ? A : B` ternary. Widening the union compiled everywhere and changed nothing, so a förening would have booked as an enskild firma in the app and as an aktiebolag in bokslut and MCP, with no error anywhere. The lookup refused föreningar at the door (mapEntityType returned null), which is what the tester hit. What was removed or simplified: the silent defaults. One module, lib/company/entity-type.ts, now holds the list (ENTITY_TYPES), the parser (never defaults), the resolver (settings hint, then companies.entity_type, then throw) and `byEntityType`, whose Record arms make the compiler refuse the next widening until each site has an answer. The form-dependent facts (closing account, owner settlement account, calendar-year lock, default method, K1/K2 label, personnummer vs 16-prefix) live there once instead of in the ternaries. On the SQL side supported_entity_types() replaces four copies of the literal list in the create RPCs. Why this shape and not the proposed one: the tracker asked for the enum widening plus a chart; that alone was the dangerous version (compiles, books wrong). Bundling stiftelse was considered and dropped: identical plumbing but no chart block. Creation sits behind NEXT_PUBLIC_IDEELL_FORENING_ENABLED so the CHECK, RPCs and seed can ship now and the first partner is switched on without a migration; the flag goes when Phase 2 (packs, INK3, årsbokslut, Swish) lands on the tracker. Domain choices (DECISIONS.md 2026-09-08, verify with an accountant before Phase 2): result closes to 2069 with 2068 as prior-year carry; no owner accounts, member settlement on 2890; accrual default; brutet räkenskapsår allowed; K1 label for the 5 000 kr accrual threshold (BFNAR 2010:1); org number gets the 16 prefix. Migration 20260908110835 widens the three CHECK constraints, adds supported_entity_types(), re-creates the three create RPCs with the widened guard and adds the förening block to seed_chart_of_accounts. Applied to staging and covered by ideell-forening-entity-type.pg.test.ts. Part of #2072 Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PdGafpUA7jVV1oYjkwfQCh * fix(company): close the förening paths the skeptic refuted (#2072) Five refutations from the /skeptic pass on 7a05c54d2, each fixed at the shared definition rather than the reported site: 1. Privately paid supplier invoices and the utlägg dialog resolved the owner account in lib/expenses/payer.ts with its own AB/EF ternary, so a förening member's invoice was built on 2893 and then refused by the expense-claim service (which already said 2890), burning an ankomstnummer. The helper now uses ownerSettlementAccount. 2. Booking templates substitute their `_ab` accounts only for an aktiebolag; the `private_expense` template kept its base 2013 for a förening. Template accounts now resolve through templateAccountForForm: EF base, AB override, förening base with owner accounts translated to 2890 (booking-templates.ts and proposal-lines.ts share it). 3. A VAT-registered förening with helårsmoms got no momsdeklaration deadline: the annual VAT rule bailed on anything but AB/EF. A förening is a juridisk person and follows the räkenskapsår schedule (SFL 26 kap 33 §), so the rule now keys on fiscalYearLockedToCalendar instead of the two literals; same in the MCP VAT report. 4. 2069 would have accumulated across years: the year-open omföring was AB-only with 2099/2098 hard-coded. planResultAppropriation now takes the pair from resultClosingAccounts (AB 2099 -> 2098, förening 2069 -> 2068) and skips forms with no carry (EF). 5. With the flag off, a registry lookup that returned "Ideell förening" was prefilled into the onboarding journey, the form picker was skipped and the create step answered "Ogiltig företagsform" with no way back. The journey, the BankID picker, the onboarding page and the MCP lookup now use mapSetupEntityType, which maps only creatable forms, so a flagged-off form falls through to the picker as before. Also: form picker keeps its AB-first order; tests for each fix. Part of #2072 Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PdGafpUA7jVV1oYjkwfQCh * chore(migrations): move ideell förening migration after main's latest version (20260908143051) Two migrations landed on main after the branch forked; a lower version would be skipped by the merge-time apply. Staging history row renamed to match. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PdGafpUA7jVV1oYjkwfQCh * chore(skills): regenerate accounted-api reference for the widened entity_type enum Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PdGafpUA7jVV1oYjkwfQCh --------- Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
318 lines
9.9 KiB
TypeScript
318 lines
9.9 KiB
TypeScript
import { randomUUID } from 'node:crypto'
|
|
import { getPool } from './setup'
|
|
|
|
// Minimal fixture inserters for pg-real tests. All inserts go through the
|
|
// pool (superuser `postgres`), which bypasses RLS: that is intentional for
|
|
// seeding. RLS is exercised only where a test explicitly opens a user
|
|
// context via withUserContext().
|
|
|
|
export async function insertAuthUser(id: string = randomUUID()): Promise<string> {
|
|
// auth.users has many columns but most default. We only need `id` and a
|
|
// non-conflicting `email`. Everything else (role, aud, timestamps, etc.)
|
|
// has a default or is nullable in the supabase/postgres image.
|
|
await getPool().query(
|
|
`INSERT INTO auth.users (id, email, instance_id)
|
|
VALUES ($1, $2, '00000000-0000-0000-0000-000000000000'::uuid)`,
|
|
[id, `pg-real-${id}@test.invalid`],
|
|
)
|
|
return id
|
|
}
|
|
|
|
export async function insertCompany(params: {
|
|
createdBy: string
|
|
name?: string
|
|
entityType?: 'enskild_firma' | 'aktiebolag' | 'ideell_forening'
|
|
}): Promise<string> {
|
|
const id = randomUUID()
|
|
await getPool().query(
|
|
`INSERT INTO public.companies (id, name, entity_type, created_by)
|
|
VALUES ($1, $2, $3, $4)`,
|
|
[id, params.name ?? 'Test AB', params.entityType ?? 'aktiebolag', params.createdBy],
|
|
)
|
|
return id
|
|
}
|
|
|
|
export async function insertCompanyMember(params: {
|
|
companyId: string
|
|
userId: string
|
|
role?: 'owner' | 'admin' | 'member' | 'viewer'
|
|
}): Promise<void> {
|
|
await getPool().query(
|
|
`INSERT INTO public.company_members (company_id, user_id, role)
|
|
VALUES ($1, $2, $3)`,
|
|
[params.companyId, params.userId, params.role ?? 'owner'],
|
|
)
|
|
}
|
|
|
|
export async function insertFiscalPeriod(params: {
|
|
userId: string
|
|
companyId: string
|
|
isClosed?: boolean
|
|
periodStart?: string
|
|
periodEnd?: string
|
|
name?: string
|
|
}): Promise<string> {
|
|
const id = randomUUID()
|
|
await getPool().query(
|
|
`INSERT INTO public.fiscal_periods
|
|
(id, user_id, company_id, name, period_start, period_end, is_closed, closed_at)
|
|
VALUES ($1, $2, $3, $4, $5, $6, $7, $8)`,
|
|
[
|
|
id,
|
|
params.userId,
|
|
params.companyId,
|
|
params.name ?? '2026',
|
|
params.periodStart ?? '2026-01-01',
|
|
params.periodEnd ?? '2026-12-31',
|
|
params.isClosed ?? false,
|
|
params.isClosed ? new Date() : null,
|
|
],
|
|
)
|
|
return id
|
|
}
|
|
|
|
// One-call helper: creates user + company + owner membership + open fiscal
|
|
// period. Returns the IDs tests need.
|
|
export async function seedCompany(overrides: { isClosed?: boolean } = {}): Promise<{
|
|
userId: string
|
|
companyId: string
|
|
fiscalPeriodId: string
|
|
}> {
|
|
const userId = await insertAuthUser()
|
|
const companyId = await insertCompany({ createdBy: userId })
|
|
await insertCompanyMember({ companyId, userId, role: 'owner' })
|
|
const fiscalPeriodId = await insertFiscalPeriod({
|
|
userId,
|
|
companyId,
|
|
isClosed: overrides.isClosed,
|
|
})
|
|
return { userId, companyId, fiscalPeriodId }
|
|
}
|
|
|
|
// Insert a cash account (cash_accounts row). ledger_account is unique per
|
|
// company; is_primary defaults false to avoid the one-primary partial index.
|
|
export async function insertCashAccount(params: {
|
|
companyId: string
|
|
ledgerAccount: string
|
|
currency?: string
|
|
iban?: string | null
|
|
externalUid?: string | null
|
|
isPrimary?: boolean
|
|
enabled?: boolean
|
|
source?: 'enable_banking' | 'manual' | 'sie_import'
|
|
bankConnectionId?: string | null
|
|
}): Promise<string> {
|
|
const id = randomUUID()
|
|
await getPool().query(
|
|
`INSERT INTO public.cash_accounts
|
|
(id, company_id, ledger_account, currency, iban, external_uid,
|
|
is_primary, enabled, source, bank_connection_id)
|
|
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)`,
|
|
[
|
|
id,
|
|
params.companyId,
|
|
params.ledgerAccount,
|
|
params.currency ?? 'SEK',
|
|
params.iban ?? null,
|
|
params.externalUid ?? null,
|
|
params.isPrimary ?? false,
|
|
params.enabled ?? true,
|
|
params.source ?? 'manual',
|
|
params.bankConnectionId ?? null,
|
|
],
|
|
)
|
|
return id
|
|
}
|
|
|
|
// Insert a bank transaction row. cashAccountId/journalEntryId default null so
|
|
// tests can exercise the backfill and the NULL-fallback scoping.
|
|
export async function insertTransaction(params: {
|
|
companyId: string
|
|
userId: string
|
|
currency?: string
|
|
amount?: number
|
|
date?: string
|
|
description?: string
|
|
externalId?: string | null
|
|
journalEntryId?: string | null
|
|
cashAccountId?: string | null
|
|
isIgnored?: boolean
|
|
bankFileImportId?: string | null
|
|
}): Promise<string> {
|
|
const id = randomUUID()
|
|
await getPool().query(
|
|
`INSERT INTO public.transactions
|
|
(id, company_id, user_id, currency, amount, date, description,
|
|
external_id, journal_entry_id, cash_account_id, is_ignored,
|
|
bank_file_import_id, category)
|
|
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, 'uncategorized')`,
|
|
[
|
|
id,
|
|
params.companyId,
|
|
params.userId,
|
|
params.currency ?? 'SEK',
|
|
params.amount ?? -100,
|
|
params.date ?? '2026-06-01',
|
|
params.description ?? 'Test tx',
|
|
params.externalId ?? null,
|
|
params.journalEntryId ?? null,
|
|
params.cashAccountId ?? null,
|
|
params.isIgnored ?? false,
|
|
params.bankFileImportId ?? null,
|
|
],
|
|
)
|
|
return id
|
|
}
|
|
|
|
// Insert a draft journal entry and return its id. Uses a placeholder
|
|
// voucher_number=0 which commit_journal_entry() will overwrite on commit.
|
|
export async function insertDraftJournalEntry(params: {
|
|
userId: string
|
|
companyId: string
|
|
fiscalPeriodId: string
|
|
entryDate?: string
|
|
description?: string
|
|
voucherSeries?: string
|
|
status?: 'draft' | 'posted' | 'reversed' | 'cancelled'
|
|
voucherNumber?: number
|
|
sourceType?: string
|
|
sourceId?: string | null
|
|
createdAt?: string
|
|
// Inserting directly as 'posted' skips the set_committed_at() trigger (it
|
|
// fires on draft->posted UPDATE), so committed_at stays null unless set here.
|
|
committedAt?: string | null
|
|
}): Promise<string> {
|
|
if (params.status === 'posted') {
|
|
return insertPostedJournalEntry(params)
|
|
}
|
|
|
|
const id = randomUUID()
|
|
await getPool().query(
|
|
`INSERT INTO public.journal_entries
|
|
(id, user_id, company_id, fiscal_period_id, voucher_number, voucher_series,
|
|
entry_date, description, source_type, source_id, status, created_at, committed_at)
|
|
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, COALESCE($12::timestamptz, now()), $13::timestamptz)`,
|
|
[
|
|
id,
|
|
params.userId,
|
|
params.companyId,
|
|
params.fiscalPeriodId,
|
|
params.voucherNumber ?? 0,
|
|
params.voucherSeries ?? 'A',
|
|
params.entryDate ?? '2026-06-01',
|
|
params.description ?? 'Test entry',
|
|
params.sourceType ?? 'manual',
|
|
params.sourceId ?? null,
|
|
params.status ?? 'draft',
|
|
params.createdAt ?? null,
|
|
params.committedAt ?? null,
|
|
],
|
|
)
|
|
return id
|
|
}
|
|
|
|
export interface PostedJournalEntryLine {
|
|
accountNumber: string
|
|
debitAmount: number
|
|
creditAmount: number
|
|
currency?: string
|
|
lineDescription?: string | null
|
|
sortOrder?: number
|
|
dimensions?: Record<string, string>
|
|
}
|
|
|
|
// Insert a posted entry and all of its lines in one transaction. This is the
|
|
// only valid shape for pg fixtures that intentionally exercise a direct posted
|
|
// INSERT: check_balance_on_posted_insert is deferred until the lines exist, but
|
|
// still executes before COMMIT.
|
|
export async function insertPostedJournalEntry(params: {
|
|
userId: string
|
|
companyId: string
|
|
fiscalPeriodId: string
|
|
entryDate?: string
|
|
description?: string
|
|
voucherSeries?: string
|
|
voucherNumber?: number
|
|
sourceType?: string
|
|
sourceId?: string | null
|
|
createdAt?: string
|
|
committedAt?: string | null
|
|
lines?: PostedJournalEntryLine[]
|
|
}): Promise<string> {
|
|
const id = randomUUID()
|
|
const lines = params.lines ?? [
|
|
{ accountNumber: '1930', debitAmount: 1000, creditAmount: 0 },
|
|
{ accountNumber: '3001', debitAmount: 0, creditAmount: 1000 },
|
|
]
|
|
const client = await getPool().connect()
|
|
|
|
try {
|
|
await client.query('BEGIN')
|
|
await client.query(
|
|
`INSERT INTO public.journal_entries
|
|
(id, user_id, company_id, fiscal_period_id, voucher_number, voucher_series,
|
|
entry_date, description, source_type, source_id, status, created_at, committed_at)
|
|
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, 'posted',
|
|
COALESCE($11::timestamptz, now()), $12::timestamptz)`,
|
|
[
|
|
id,
|
|
params.userId,
|
|
params.companyId,
|
|
params.fiscalPeriodId,
|
|
params.voucherNumber ?? 0,
|
|
params.voucherSeries ?? 'A',
|
|
params.entryDate ?? '2026-06-01',
|
|
params.description ?? 'Test entry',
|
|
params.sourceType ?? 'manual',
|
|
params.sourceId ?? null,
|
|
params.createdAt ?? null,
|
|
params.committedAt ?? null,
|
|
],
|
|
)
|
|
|
|
for (const [index, line] of lines.entries()) {
|
|
await client.query(
|
|
`INSERT INTO public.journal_entry_lines
|
|
(journal_entry_id, account_number, debit_amount, credit_amount,
|
|
currency, line_description, sort_order, dimensions)
|
|
VALUES ($1, $2, $3, $4, $5, $6, $7, $8::jsonb)`,
|
|
[
|
|
id,
|
|
line.accountNumber,
|
|
line.debitAmount,
|
|
line.creditAmount,
|
|
line.currency ?? 'SEK',
|
|
line.lineDescription ?? null,
|
|
line.sortOrder ?? index,
|
|
JSON.stringify(line.dimensions ?? {}),
|
|
],
|
|
)
|
|
}
|
|
|
|
await client.query('SET CONSTRAINTS check_balance_on_posted_insert IMMEDIATE')
|
|
await client.query('COMMIT')
|
|
return id
|
|
} catch (error) {
|
|
await client.query('ROLLBACK').catch(() => {})
|
|
throw error
|
|
} finally {
|
|
client.release()
|
|
}
|
|
}
|
|
|
|
// Insert a balanced pair of journal entry lines (1 debit row + 1 credit row
|
|
// at the given amount). Needed before commit_journal_entry() because the
|
|
// balance constraint trigger fires on draft→posted.
|
|
export async function insertBalancedLines(
|
|
journalEntryId: string,
|
|
amount: number = 1000,
|
|
): Promise<void> {
|
|
await getPool().query(
|
|
`INSERT INTO public.journal_entry_lines
|
|
(journal_entry_id, account_number, debit_amount, credit_amount)
|
|
VALUES ($1, '1930', $2, 0),
|
|
($1, '3001', 0, $2)`,
|
|
[journalEntryId, amount],
|
|
)
|
|
}
|