Fix/skv connection flow (#1015)
* feat(salary): one-click AGI submission with filing state machine and success feedback The AGI panel required users to know that "Ladda ner AGI-fil" was the generate step, then click submit, signing link, and kvittens manually. A nollkorning filing stalled on "AGI-XML saknas" pointing at a UI path that does not exist. - New primary button "Lamna in till Skatteverket" chains the existing endpoints client-side: generate XML if missing, POST underlag, poll kontrollresultat, create signing link, open Mina Sidor in a tab opened synchronously at click (popup-blocker safe). Inline stepper shows each step; the four old buttons become collapsed advanced/recovery actions, auto-expanded in stale-draft and rejected states. XML download stays visible and free for manual filing. - deriveAgiFilingState() + useAgiSubmission() lift the per-period submission record to the run page: the progress rail and salary hero now render the real state machine (generated, underlag inskickat, vantar pa BankID-signatur, inlamnad med kvittensnummer) instead of telling users to "lamna in" an already-submitted declaration. - Success card with kvittensnummer and signature metadata once signed, plus a toast when a poll flips the state while the page is open. - AGI kvittens cron every 15 min instead of every 2 h so filings signed on another device get stamped and emailed promptly. - Advanced submit also auto-generates, and the stale "Lon -> AGI -> Generera" error text now points at the real buttons. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(enable-banking): instant OAuth callback feedback and dead-attempt cleanup The bank redirect landed on a blank page for the several seconds the callback spent exchanging the PSD2 session and mirroring accounts, and every failed connect attempt left a status='error' row that rendered forever as an "Atgard kravs" card next to a successful retry, showing duplicate connections to the same bank. - Stream a branded "Slutfor bankanslutningen" progress page from the callback: the shell flushes before the session exchange starts and a script/meta redirect follows when the work completes, with a 30s slow-work escape hatch. Fast outcomes (denial, bad params, unknown state) keep their plain redirects. - Delete never-activated connection rows (no session_id, no accounts_data) on denial or exchange failure, and sweep leftovers for the same bank on the next connect. Established connections keep their "Atgard krävs" card via the accounts_data guard; FKs are ON DELETE SET NULL so deletion has no dependents. - Show "Banken ar ansluten: hamtar dina konton" while the settings panel loads after the callback instead of an anonymous spinner. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(invoices): reject re-send of issued invoices and gate bookkeeping on the sent flip A direct POST to /api/invoices/[id]/send against an already-issued invoice re-emailed the customer and posted a second revenue verifikat (createInvoiceJournalEntry has no dedup), overwriting journal_entry_id and orphaning the first entry. Only the UI hid the button; the v1 route and the MCP commit executor already rejected non-drafts. - Non-draft invoices now return 409 INVOICE_ALREADY_SENT. - The draft to sent status flip is an optimistic lock (status guard plus row-count check); journal entry, accrual schedules, PDF archival and the invoice.sent event only run for the request that won the flip. - On a flip failure the journal entry is deferred: the row stays draft and a retry re-runs the pipeline, ending with exactly one verifikat. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(invoices): payment links, failure visibility and sandbox guard for recurring auto-send - sendInvoiceFromSchedule now auto-creates an online payment link via applyPaymentLinkToInvoice before rendering and passes the payment link QR to the PDF: parity with the dashboard and v1 send routes, which recurring invoices silently lacked. - The recurring cron persists last_run_warning both when a claimed run throws (hourly retries stay visible on the schedule) and when a stale schedule is rolled forward, so a deterministic failure can no longer skip a month silently. - Auto-send is blocked for sandbox companies at the email chokepoint (freeze-and-retain: the invoice is still generated as a draft), covering both the cron and the run-now route with one guard. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(salary): close the Fortnox payroll API gaps (phases 1-4) Payroll now runs end-to-end through the open API, including onboarding a client from another payroll system, with every write staged for approval. - v1: per-employee payslips (list/detail/PDF), payslip line writes, run roster attach/remove, absence ranges (per-day storage), jamkning fields, cutover opening balances (single + atomic bulk PUT), vacation balance + vacation-year-close. PUT added to the wrapper's idempotency/ test-key set (test keys could otherwise write through PUT). - MCP: 10 new tools (get_employee/get_payslip/list_absence/ get_vacation_balance reads + staged update_payslip_line, register_absence, create_employee, update_employee, set_employee_opening_balances, close_vacation_year), executors, risk tiers, op-type CHECK expansions. create_employee encrypts personnummer at staging: pending_operations never holds plaintext. - Scope-map audit retrofit: 11 formerly unmapped tools now scoped; BREAKING for keys that relied on the 4 default-allow writes. - Cutover: employee_opening_balances (derived lock trigger, self-unlocks on run correction), engine YTD/karens/liability integration, Ingaende saldon section in the employee editor. - Arbetsschema-lite: employees.hours_per_week/workdays_per_week drive the hourly/daily divisors; legacy 173/21 preserved exactly at defaults so existing pay math is byte-identical. - Vacation ledger + semesterberedning/arsavslut: recomputed per-year day balances (synced on book/correct, non-fatal), year-close with the min-20 floor, 5-year sparade-dagar expiry to forced payout, and a 2920/2940 drift adjustment via the bookkeeping engine; Semester dashboard card with preview-then-confirm dialog. - Fix: Zod 4 defaults leak through .partial(), which made every sparse employee PATCH fail validation and reset defaulted columns. Migrations 20260713100000/101000/110000/121000/122000 (applied to staging with version rows; prod via merge). vacation_ledger renamed from 20260713120000 to avoid colliding with vat_declaration_totals_rpc. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * perf: cut dashboard page-load latency (region, round trips, caching, VAT RPC) The dominant cost was infrastructure: Vercel functions ran in iad1 (Washington D.C.) while Supabase (DB + auth) lives in eu-north-1 (Stockholm), so every request paid 4-5 transatlantic round trips of auth + company resolution before doing any real work (measured 530-1900ms for single-query GETs in prod logs). Pin functions to arn1 and cut the redundant work on top: - vercel.json: functions to arn1, same city as the database - getActiveCompanyId: preference + first-membership queries run in parallel; the fallback result doubles as validation in the common single-company case (one round trip instead of two sequential) - withRouteContext: Server-Timing header and authMs/companyMs/handlerMs in the op-completed log, so latency is attributable per phase - dashboard layout: nav badge counts off the critical path; DashboardNav loads them client-side via the new use-worklist-badges SWR hook with debounced realtime revalidation - swr (new dependency, approved): global provider; useCompanySettings shares one cache entry across consumers and renders from cache on back-navigation instead of re-showing skeletons - /pending: realtime refetch debounced; bulk operations previously fired 4 requests per row-change event - VAT declaration: new get_vat_declaration_totals RPC returns per-account totals, settlement-shape detection (#984) and source_type counts in ONE round trip instead of paging every entry+line through PostgREST. Account lists stay TS-side parameters so ACCOUNT_RUTA remains the single source of truth. Shape-exclusion coverage moved to tests/pg/vat-declaration-totals-rpc.pg.test.ts; DDL already applied to staging. - bundle: CommandPalette lazy-mounts on first Ctrl/Cmd+K, AgentChat dynamic-imports the markdown parser, @vercel/speed-insights (new dependency, approved) added for real-user timings The /salary fetch-waterfall fix from the same effort already landed inside 2084a756. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(invoices): settle öre-rounded payments from the mark-paid flow An invoice with öresavrundning shows a rounded "Att betala" on the PDF; the customer pays that amount (up to 50 öre off the stored öre total) and the invoice-page mark-paid flow rejected it with MATCH_AMOUNT_EXCEEDS_REMAINING: a dead end, while the bank-transaction match flow already absorbed the residual to 3740. - PaymentBookingDialog now proposes the rounded bank leg plus the 3740 residual line (credit when rounded up, debit when rounded down), resolved via getDisplayTotal from the per-invoice override and company_settings.ore_rounding. - settleInvoicePayment and the v1 mark-paid route absorb the sub-krona residual, gated by planInvoicePaymentForLines: absorption applies ONLY when the caller lines carry the exact residual on 3740; otherwise the strict plan applies (sub-krona partials stay partial, no-3740 overshoots keep the 400), so the GL can never diverge from the AR sub-ledger. - planInvoicePayment absorb-band boundary tightened to >= 1 kr: an exactly-1-kr overshoot used to slip past both the guard and the absorb branch and silently over-record paid_amount (pre-existing on the bank-match path). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(security): resolve all 7 PR compliance findings - ASVS V3.3: per-request CSP nonce on the enable-banking finalize page (mirrors the mcp-oauth consent page); inline scripts are nonce-bound - ASVS V16: decouple callback finalize work from the response stream (eager promise + next/server after()) so a client disconnect cannot drop session persistence or the consent_granted audit emit - ISO 27001 A.8.15: failed audit-event emits log through the structured logger with a stable message for log-based alerting - ASVS V2.3: recurring-invoice cron and run-now routes resolve isSandboxCompany themselves and pass an explicit suppressAutoSend flag (defence in depth around the email chokepoint, freeze-and-retain kept) - ISO 27001 A.8.11: stagePendingOperation rejects plaintext personnummer-bearing keys in params/preview_data (key-based guard; EF org numbers make value-matching unsafe) - ASVS V4.5: employee PATCH body is truly sparse; cleared number fields are omitted instead of resetting DB values to hardcoded fallbacks - ASVS V8.2.1: route-level tests pin the v1 cross-company deny (404 by convention, not 403) on the payslip PDF endpoint Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat: implement vacation-year basis change validation and error handling - Added tests to block vacation-year basis changes when open balances exist. - Implemented error handling for open-balances guard query failures in the settings route. - Enhanced absence route to reject reversed date ranges with a validation error. - Updated absence handling to use atomic upserts instead of delete+insert for better performance and reliability. - Refactored salary calculation logic to correctly handle age-based avgifter rates according to Skatteverket's rules. - Improved error messaging for vacation year closure adjustments. - Adjusted employee opening balances handling to preserve audit information during upserts. * feat(settings): add validation to block vacation-year basis change with open balances feat(absence): reject reversed date ranges in absence queries fix(absence): update absence handling to use atomic upserts instead of delete+insert fix(employee): improve validation for jamkning dates in employee updates fix(opening-balances): ensure created_by field is preserved during upserts test(absence): enhance tests for absence range and date validations test(calculation): add tests for age-based avgifter rates and edge cases test(semesterberedning): validate vacation year closure adjustments and error handling test(employee-opening-balances): update tests to reflect changes in salary_run_employees schema * fix(migrations): implement NOT VALID constraints for pending_operations and add validation migration --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Mattsson
co-authored by
Claude Fable 5
Claude Fable 5
parent
e7e3c35f9e
commit
b6332e9ff4
@@ -0,0 +1,179 @@
|
||||
/**
|
||||
* Vacation-liability report: cutover opening-balance terms
|
||||
* (payroll gap-closure 2.2).
|
||||
*
|
||||
* A mid-year switcher's semesterlöneskuld arrived via SIE opening balances
|
||||
* on 2920/2940; the per-employee report must include the opening SEK terms,
|
||||
* start remaining days from the imported balance, and add saved-days from
|
||||
* the origin-year map.
|
||||
*/
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import type { SupabaseClient } from '@supabase/supabase-js'
|
||||
import { createQueuedMockSupabase } from '@/tests/helpers'
|
||||
import { generateVacationLiability } from '@/lib/reports/vacation-liability'
|
||||
|
||||
const COMPANY_ID = 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa'
|
||||
const EMPLOYEE_ID = 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb'
|
||||
|
||||
const EMPLOYEE = {
|
||||
id: EMPLOYEE_ID,
|
||||
first_name: 'Anna',
|
||||
last_name: 'Andersson',
|
||||
personnummer_last4: '0000',
|
||||
vacation_rule: 'procentregeln',
|
||||
vacation_days_per_year: 25,
|
||||
vacation_days_saved: 0,
|
||||
}
|
||||
|
||||
let mock: ReturnType<typeof createQueuedMockSupabase>
|
||||
let supabase: SupabaseClient
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
mock = createQueuedMockSupabase()
|
||||
supabase = mock.supabase as unknown as SupabaseClient
|
||||
})
|
||||
|
||||
describe('generateVacationLiability with opening balances', () => {
|
||||
it('adds opening SEK terms and starts days from the imported balance', async () => {
|
||||
mock.enqueue({ data: [EMPLOYEE] }) // employees page
|
||||
mock.enqueue({
|
||||
data: [
|
||||
{
|
||||
employee_id: EMPLOYEE_ID,
|
||||
vacation_accrual: 4200,
|
||||
vacation_accrual_avgifter: 1319.64,
|
||||
avgifter_rate: 0.3142,
|
||||
vacation_days_taken: 3,
|
||||
salary_run: { period_year: 2026, status: 'booked' },
|
||||
},
|
||||
],
|
||||
}) // booked sre page
|
||||
mock.enqueue({ data: [] }) // vacation ledger (none yet)
|
||||
mock.enqueue({
|
||||
data: [
|
||||
{
|
||||
employee_id: EMPLOYEE_ID,
|
||||
cutover_date: '2026-07-01',
|
||||
vacation_paid_days_remaining: 12.5,
|
||||
vacation_saved_days_by_year: { '2025': 5, '2024': 2 },
|
||||
opening_semester_liability: 42000,
|
||||
opening_semester_liability_avgifter: 13196.4,
|
||||
},
|
||||
],
|
||||
}) // opening balances
|
||||
|
||||
const report = await generateVacationLiability(supabase, COMPANY_ID, 2026)
|
||||
|
||||
expect(report.rows).toHaveLength(1)
|
||||
const row = report.rows[0]
|
||||
// Opening SEK + in-system accrual.
|
||||
expect(row.accruedAmount).toBe(46200)
|
||||
expect(row.accruedAvgifter).toBe(14516.04)
|
||||
expect(row.totalLiability).toBe(60716.04)
|
||||
// Remaining starts from the imported 12.5, not the 25-day entitlement.
|
||||
expect(row.vacationDaysRemaining).toBe(9.5)
|
||||
// Saved days: master-row 0 + origin-year map 5 + 2.
|
||||
expect(row.vacationDaysSaved).toBe(7)
|
||||
expect(report.totals.totalLiability).toBe(60716.04)
|
||||
})
|
||||
|
||||
it('ignores opening rows for report years before the cutover year', async () => {
|
||||
mock.enqueue({ data: [EMPLOYEE] })
|
||||
mock.enqueue({ data: [] }) // no booked runs in 2025
|
||||
mock.enqueue({ data: [] }) // vacation ledger
|
||||
mock.enqueue({
|
||||
data: [
|
||||
{
|
||||
employee_id: EMPLOYEE_ID,
|
||||
cutover_date: '2026-07-01',
|
||||
vacation_paid_days_remaining: 12.5,
|
||||
vacation_saved_days_by_year: {},
|
||||
opening_semester_liability: 42000,
|
||||
opening_semester_liability_avgifter: 13196.4,
|
||||
},
|
||||
],
|
||||
})
|
||||
|
||||
const report = await generateVacationLiability(supabase, COMPANY_ID, 2025)
|
||||
|
||||
expect(report.rows[0].accruedAmount).toBe(0)
|
||||
expect(report.rows[0].vacationDaysRemaining).toBe(25)
|
||||
})
|
||||
|
||||
it('is a no-op for companies without opening rows', async () => {
|
||||
mock.enqueue({ data: [EMPLOYEE] })
|
||||
mock.enqueue({
|
||||
data: [
|
||||
{
|
||||
employee_id: EMPLOYEE_ID,
|
||||
vacation_accrual: 4200,
|
||||
vacation_accrual_avgifter: 1319.64,
|
||||
avgifter_rate: 0.3142,
|
||||
vacation_days_taken: 0,
|
||||
salary_run: { period_year: 2026, status: 'booked' },
|
||||
},
|
||||
],
|
||||
})
|
||||
mock.enqueue({ data: [] }) // vacation ledger
|
||||
mock.enqueue({ data: [] }) // no opening rows
|
||||
|
||||
const report = await generateVacationLiability(supabase, COMPANY_ID, 2026)
|
||||
|
||||
expect(report.rows[0].accruedAmount).toBe(4200)
|
||||
expect(report.rows[0].vacationDaysRemaining).toBe(25)
|
||||
expect(report.rows[0].vacationDaysSaved).toBe(0)
|
||||
})
|
||||
|
||||
it('prefers the vacation ledger for DAYS when a row exists (v2)', async () => {
|
||||
mock.enqueue({ data: [EMPLOYEE] })
|
||||
mock.enqueue({
|
||||
data: [
|
||||
{
|
||||
employee_id: EMPLOYEE_ID,
|
||||
vacation_accrual: 4200,
|
||||
vacation_accrual_avgifter: 1319.64,
|
||||
avgifter_rate: 0.3142,
|
||||
// The sre says 3 taken, but the ledger (recomputed, incl. cutover
|
||||
// seed) is authoritative for days.
|
||||
vacation_days_taken: 3,
|
||||
salary_run: { period_year: 2026, status: 'booked' },
|
||||
},
|
||||
],
|
||||
})
|
||||
mock.enqueue({
|
||||
data: [
|
||||
{
|
||||
employee_id: EMPLOYEE_ID,
|
||||
vacation_year_start: '2026-01-01',
|
||||
entitled_days: 12.5,
|
||||
taken_days: 4,
|
||||
saved_days: { '2025': 5, '2024': 2 },
|
||||
},
|
||||
],
|
||||
}) // vacation ledger row wins for days
|
||||
mock.enqueue({
|
||||
data: [
|
||||
{
|
||||
employee_id: EMPLOYEE_ID,
|
||||
cutover_date: '2026-07-01',
|
||||
vacation_paid_days_remaining: 12.5,
|
||||
vacation_saved_days_by_year: { '2025': 5 },
|
||||
opening_semester_liability: 42000,
|
||||
opening_semester_liability_avgifter: 13196.4,
|
||||
},
|
||||
],
|
||||
})
|
||||
|
||||
const report = await generateVacationLiability(supabase, COMPANY_ID, 2026)
|
||||
const row = report.rows[0]
|
||||
|
||||
// Days come from the ledger, not entitled-minus-sre-taken.
|
||||
expect(row.vacationDaysEntitled).toBe(12.5)
|
||||
expect(row.vacationDaysTaken).toBe(4)
|
||||
expect(row.vacationDaysRemaining).toBe(8.5)
|
||||
expect(row.vacationDaysSaved).toBe(7)
|
||||
// SEK still derives from runs + opening terms.
|
||||
expect(row.accruedAmount).toBe(46200)
|
||||
})
|
||||
})
|
||||
File diff suppressed because it is too large
Load Diff
@@ -2,19 +2,20 @@ import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
import { buildVatSettlementProposal } from '../vat-settlement'
|
||||
|
||||
// ============================================================
|
||||
// Mock: results routed by table + applied filters (the builder runs its two
|
||||
// ledger queries and the existing-entries lookup concurrently, so a
|
||||
// sequential result queue would be order-fragile).
|
||||
// Mock: fetchVatAccountTotals now goes through the
|
||||
// get_vat_declaration_totals RPC (aggregation + settlement-shape detection
|
||||
// in SQL, verified by tests/pg/vat-declaration-totals-rpc.pg.test.ts), so
|
||||
// the mock seeds the RPC payload directly: per-account totals as the SQL
|
||||
// GROUP BY returns them (already excluding settlement entries) plus the
|
||||
// shaped entries the RPC surfaces. The existing-entries lookup and the
|
||||
// fiscal-period resolution still go through from().
|
||||
// ============================================================
|
||||
|
||||
interface MockData {
|
||||
/**
|
||||
* journal_entries rows for the entry-scope query (fetchEntryLines step 1).
|
||||
* Shape-detection reads status/entry_date/source_type/voucher_* off these.
|
||||
*/
|
||||
entries?: Array<Record<string, unknown>>
|
||||
/** journal_entry_lines rows (fetchEntryLines step 2). */
|
||||
lines?: Array<Record<string, unknown>>
|
||||
/** Per-account totals as returned by the RPC (post settlement-exclusion). */
|
||||
totals?: Array<{ account_number: string; debit: number; credit: number }>
|
||||
/** Settlement-shaped entries surfaced by the RPC. */
|
||||
shaped?: Array<Record<string, unknown>>
|
||||
/** Existing vat_settlement entries in the period. */
|
||||
existing?: Array<Record<string, unknown>>
|
||||
/** Error returned by the existing-settlement lookup. */
|
||||
@@ -23,73 +24,59 @@ interface MockData {
|
||||
fiscalPeriod?: { period_start: string; period_end: string } | null
|
||||
}
|
||||
|
||||
let neqCalls: Array<[string, unknown]>
|
||||
let rpcCalls: Array<{ fn: string; params: Record<string, unknown> }>
|
||||
|
||||
function makeClient(data: MockData) {
|
||||
neqCalls = []
|
||||
rpcCalls = []
|
||||
return {
|
||||
from: vi.fn().mockImplementation((table: string) => {
|
||||
const eqCalls: Array<[string, unknown]> = []
|
||||
rpc: vi.fn().mockImplementation(async (fn: string, params: Record<string, unknown>) => {
|
||||
rpcCalls.push({ fn, params })
|
||||
return {
|
||||
data: {
|
||||
totals: data.totals ?? [],
|
||||
settlement_shaped_entries: data.shaped ?? [],
|
||||
source_type_counts: {},
|
||||
},
|
||||
error: null,
|
||||
}
|
||||
}),
|
||||
from: vi.fn().mockImplementation(() => {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const b: Record<string, any> = {}
|
||||
for (const m of ['select', 'in', 'gte', 'lte', 'order', 'range', 'limit']) {
|
||||
for (const m of ['select', 'eq', 'neq', 'in', 'gte', 'lte', 'order', 'range', 'limit']) {
|
||||
b[m] = vi.fn().mockReturnValue(b)
|
||||
}
|
||||
b.eq = vi.fn().mockImplementation((col: string, val: unknown) => {
|
||||
eqCalls.push([col, val])
|
||||
return b
|
||||
})
|
||||
b.neq = vi.fn().mockImplementation((col: string, val: unknown) => {
|
||||
neqCalls.push([col, val])
|
||||
return b
|
||||
})
|
||||
b.maybeSingle = vi.fn().mockResolvedValue({ data: data.fiscalPeriod ?? null, error: null })
|
||||
b.then = (resolve: (v: unknown) => void) => {
|
||||
if (table === 'journal_entry_lines') return resolve({ data: data.lines ?? [], error: null })
|
||||
// journal_entries serves two queries: the entry scope for the ledger
|
||||
// totals (filters vat_settlement OUT via .neq) and the tagged
|
||||
// existing-settlement lookup (filters it IN via .eq).
|
||||
if (eqCalls.some(([col, val]) => col === 'source_type' && val === 'vat_settlement')) {
|
||||
return resolve(
|
||||
data.existingError
|
||||
? { data: null, error: data.existingError }
|
||||
: { data: data.existing ?? [], error: null },
|
||||
)
|
||||
}
|
||||
return resolve({ data: data.entries ?? [], error: null })
|
||||
}
|
||||
// The only awaited from() query left in the proposal builder is the
|
||||
// tagged existing-settlement lookup.
|
||||
b.then = (resolve: (v: unknown) => void) =>
|
||||
resolve(
|
||||
data.existingError
|
||||
? { data: null, error: data.existingError }
|
||||
: { data: data.existing ?? [], error: null },
|
||||
)
|
||||
return b
|
||||
}),
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
} as any
|
||||
}
|
||||
|
||||
let lineId = 0
|
||||
function vatLine(account: string, debit: number, credit: number, entryId = 'e1') {
|
||||
lineId += 1
|
||||
return {
|
||||
id: `l${lineId}`,
|
||||
journal_entry_id: entryId,
|
||||
account_number: account,
|
||||
debit_amount: debit,
|
||||
credit_amount: credit,
|
||||
}
|
||||
function total(account_number: string, debit: number, credit: number) {
|
||||
return { account_number, debit, credit }
|
||||
}
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
lineId = 0
|
||||
})
|
||||
|
||||
describe('buildVatSettlementProposal', () => {
|
||||
it('clears the 26xx accounts, books the filed whole-krona net on 2650 and the öre gap on 3740', async () => {
|
||||
const supabase = makeClient({
|
||||
entries: [{ id: 'e1' }],
|
||||
lines: [
|
||||
vatLine('2611', 0, 2500.75),
|
||||
vatLine('2641', 1000.5, 0),
|
||||
totals: [
|
||||
total('2611', 0, 2500.75),
|
||||
total('2641', 1000.5, 0),
|
||||
// Revenue feeds ruta05 but is never part of the settlement entry.
|
||||
vatLine('3001', 0, 10003.0),
|
||||
total('3001', 0, 10003.0),
|
||||
],
|
||||
})
|
||||
|
||||
@@ -123,16 +110,19 @@ describe('buildVatSettlementProposal', () => {
|
||||
expect(debits).toBeCloseTo(credits, 2)
|
||||
|
||||
// The projection must ignore already-booked settlements, or booking once
|
||||
// would change the next proposal.
|
||||
expect(neqCalls).toContainEqual(['source_type', 'vat_settlement'])
|
||||
// would change the next proposal: the RPC receives the settlement net
|
||||
// accounts so it can shape-detect and exclude them.
|
||||
expect(rpcCalls).toHaveLength(1)
|
||||
expect(rpcCalls[0].fn).toBe('get_vat_declaration_totals')
|
||||
expect(rpcCalls[0].params.p_net_accounts).toEqual(['2650', '1650'])
|
||||
expect(rpcCalls[0].params.p_company_id).toBe('company-1')
|
||||
})
|
||||
|
||||
it('books a refund period as a 1650 (Momsfordran) debit', async () => {
|
||||
const supabase = makeClient({
|
||||
entries: [{ id: 'e1' }],
|
||||
lines: [
|
||||
vatLine('2611', 0, 100),
|
||||
vatLine('2641', 400, 0),
|
||||
totals: [
|
||||
total('2611', 0, 100),
|
||||
total('2641', 400, 0),
|
||||
],
|
||||
})
|
||||
|
||||
@@ -152,9 +142,8 @@ describe('buildVatSettlementProposal', () => {
|
||||
|
||||
it('clears an account sitting on the wrong side (credit-note-heavy period)', async () => {
|
||||
const supabase = makeClient({
|
||||
entries: [{ id: 'e1' }],
|
||||
// Output VAT with a net DEBIT balance: credit notes exceeded sales.
|
||||
lines: [vatLine('2611', 50, 0)],
|
||||
totals: [total('2611', 50, 0)],
|
||||
})
|
||||
|
||||
const proposal = await buildVatSettlementProposal(supabase, 'company-1', 'monthly', 2026, 2)
|
||||
@@ -171,8 +160,7 @@ describe('buildVatSettlementProposal', () => {
|
||||
|
||||
it('is empty when the period has no VAT-account activity (revenue alone does not settle)', async () => {
|
||||
const supabase = makeClient({
|
||||
entries: [{ id: 'e1' }],
|
||||
lines: [vatLine('3001', 0, 1000)],
|
||||
totals: [total('3001', 0, 1000)],
|
||||
})
|
||||
|
||||
const proposal = await buildVatSettlementProposal(supabase, 'company-1', 'quarterly', 2026, 2)
|
||||
@@ -184,8 +172,7 @@ describe('buildVatSettlementProposal', () => {
|
||||
|
||||
it('uses the räkenskapsår bounds for yearly VAT when a fiscal period is supplied', async () => {
|
||||
const supabase = makeClient({
|
||||
entries: [{ id: 'e1' }],
|
||||
lines: [vatLine('2611', 0, 100), vatLine('2641', 25, 0)],
|
||||
totals: [total('2611', 0, 100), total('2641', 25, 0)],
|
||||
fiscalPeriod: { period_start: '2025-07-01', period_end: '2026-06-30' },
|
||||
})
|
||||
|
||||
@@ -205,8 +192,7 @@ describe('buildVatSettlementProposal', () => {
|
||||
voucher_series: 'M', voucher_number: 3,
|
||||
}]
|
||||
const supabase = makeClient({
|
||||
entries: [{ id: 'e1' }],
|
||||
lines: [vatLine('2611', 0, 100)],
|
||||
totals: [total('2611', 0, 100)],
|
||||
existing,
|
||||
})
|
||||
|
||||
@@ -221,17 +207,14 @@ describe('buildVatSettlementProposal', () => {
|
||||
source_type: 'manual', voucher_series: 'A', voucher_number: 9,
|
||||
}
|
||||
const supabase = makeClient({
|
||||
entries: [{ id: 'e1' }, manualSettlement],
|
||||
lines: [
|
||||
// Business activity on e1.
|
||||
vatLine('2611', 0, 100),
|
||||
vatLine('2641', 25, 0),
|
||||
// Manual momsomföring on e2: clears 26xx to 2650 without the
|
||||
// vat_settlement source_type (booked before #980 shipped).
|
||||
vatLine('2611', 100, 0, 'e2'),
|
||||
vatLine('2641', 0, 25, 'e2'),
|
||||
vatLine('2650', 0, 75, 'e2'),
|
||||
// The RPC already excluded the manual momsomföring from the totals
|
||||
// (that exclusion is pg-tested); what reaches JS is the business
|
||||
// activity plus the shaped entry to gate on.
|
||||
totals: [
|
||||
total('2611', 0, 100),
|
||||
total('2641', 25, 0),
|
||||
],
|
||||
shaped: [manualSettlement],
|
||||
})
|
||||
|
||||
const proposal = await buildVatSettlementProposal(supabase, 'company-1', 'quarterly', 2026, 1)
|
||||
@@ -254,33 +237,25 @@ describe('buildVatSettlementProposal', () => {
|
||||
|
||||
it('does not gate on a storno of a settlement (annullera must re-enable booking)', async () => {
|
||||
const supabase = makeClient({
|
||||
entries: [
|
||||
{ id: 'e1' },
|
||||
// A manual settlement that has been annulled...
|
||||
// Settlement + storno cancel out of the totals inside the RPC; both
|
||||
// still come back as shaped entries. Neither may gate: the reversed
|
||||
// manual settlement has no balance effect and the storno is the
|
||||
// cancellation itself.
|
||||
totals: [total('2611', 0, 100)],
|
||||
shaped: [
|
||||
{
|
||||
id: 'e2', status: 'reversed', entry_date: '2026-03-31',
|
||||
source_type: 'manual', voucher_series: 'A', voucher_number: 9,
|
||||
},
|
||||
// ...and its storno reversal.
|
||||
{
|
||||
id: 'e3', status: 'posted', entry_date: '2026-03-31',
|
||||
source_type: 'storno', voucher_series: 'A', voucher_number: 10,
|
||||
},
|
||||
],
|
||||
lines: [
|
||||
vatLine('2611', 0, 100),
|
||||
vatLine('2611', 100, 0, 'e2'),
|
||||
vatLine('2650', 0, 100, 'e2'),
|
||||
vatLine('2611', 0, 100, 'e3'),
|
||||
vatLine('2650', 100, 0, 'e3'),
|
||||
],
|
||||
})
|
||||
|
||||
const proposal = await buildVatSettlementProposal(supabase, 'company-1', 'quarterly', 2026, 1)
|
||||
|
||||
// Settlement + storno are both excluded from the projection (they would
|
||||
// otherwise double ruta 10), and neither gates: the period can be
|
||||
// settled again.
|
||||
expect(proposal.existing_entries).toEqual([])
|
||||
expect(proposal.filed_net).toBe(100)
|
||||
expect(proposal.lines).toEqual([
|
||||
@@ -294,20 +269,15 @@ describe('buildVatSettlementProposal', () => {
|
||||
|
||||
it('ignores a plain VAT payment on 2650 (no declaration accounts touched)', async () => {
|
||||
const supabase = makeClient({
|
||||
entries: [
|
||||
{ id: 'e1' },
|
||||
{
|
||||
id: 'e2', status: 'posted', entry_date: '2026-02-12',
|
||||
source_type: 'bank_transaction', voucher_series: 'A', voucher_number: 7,
|
||||
},
|
||||
],
|
||||
lines: [
|
||||
vatLine('2611', 0, 100),
|
||||
// Paying last period's VAT debt: 2650 against the bank account.
|
||||
// Touches a settlement net account but no declaration account, so it
|
||||
// is NOT settlement-shaped: it must neither gate nor shift the rutor.
|
||||
vatLine('2650', 75, 0, 'e2'),
|
||||
// Paying last period's VAT debt: 2650 against the bank account. The
|
||||
// entry touches a settlement net account but no declaration account,
|
||||
// so the RPC does NOT shape it: its 2650 total comes back as-is and
|
||||
// must neither gate nor shift the rutor / clearing lines.
|
||||
totals: [
|
||||
total('2611', 0, 100),
|
||||
total('2650', 75, 0),
|
||||
],
|
||||
shaped: [],
|
||||
})
|
||||
|
||||
const proposal = await buildVatSettlementProposal(supabase, 'company-1', 'quarterly', 2026, 1)
|
||||
@@ -325,8 +295,7 @@ describe('buildVatSettlementProposal', () => {
|
||||
|
||||
it('throws when the existing-settlement lookup fails (the UI gate depends on it)', async () => {
|
||||
const supabase = makeClient({
|
||||
entries: [{ id: 'e1' }],
|
||||
lines: [vatLine('2611', 0, 100)],
|
||||
totals: [total('2611', 0, 100)],
|
||||
existingError: { message: 'boom' },
|
||||
})
|
||||
|
||||
|
||||
@@ -822,6 +822,14 @@ export const MASTER_DATA_DUMP_TABLES: MasterDataTableSpec[] = [
|
||||
{ name: 'salary_run_employees', file: 'salary_run_employees.json', orderBy: 'created_at' },
|
||||
{ name: 'salary_line_items', file: 'salary_line_items.json', orderBy: 'created_at' },
|
||||
{ name: 'salary_absence_days', file: 'salary_absence_days.json' },
|
||||
// Cutover state (payroll gap-closure 2.1): part of the payroll underlag a
|
||||
// switching company brings; belongs in the archive like the run data it
|
||||
// seeds.
|
||||
{ name: 'employee_opening_balances', file: 'employee_opening_balances.json' },
|
||||
// Vacation ledger + year closures (payroll gap-closure 3.1). The closure
|
||||
// report is the underlag for the drift-adjustment verifikation (BFL 7 kap).
|
||||
{ name: 'employee_vacation_balances', file: 'employee_vacation_balances.json' },
|
||||
{ name: 'vacation_year_closures', file: 'vacation_year_closures.json' },
|
||||
{ name: 'salary_worked_days', file: 'salary_worked_days.json' },
|
||||
{ name: 'salary_payslip_links', file: 'salary_payslip_links.json' },
|
||||
{ name: 'shift_premium_rules', file: 'shift_premium_rules.json' },
|
||||
|
||||
@@ -94,6 +94,72 @@ export async function generateVacationLiability(
|
||||
return run && run.period_year === year && run.status === 'booked'
|
||||
})
|
||||
|
||||
// Cutover opening balances (payroll gap-closure 2.2): a mid-year switcher's
|
||||
// semesterlöneskuld arrived via SIE opening balances on 2920/2940, so the
|
||||
// per-employee liability must include the opening term or the report
|
||||
// understates against the booked balance. Days likewise: the opening row's
|
||||
// paid-days-remaining replaces the naive entitled-minus-taken, and saved
|
||||
// days by origin year add to the master-row aggregate. Applies for report
|
||||
// years >= the cutover year (post-cutover-year drift is reconciled by the
|
||||
// Phase 3 vacation ledger).
|
||||
// Vacation ledger v2 (payroll gap-closure 3.2): when a persisted balance
|
||||
// row exists for the report year, it is authoritative for DAYS (it already
|
||||
// folded in the cutover seed, legacy saved days, and booked-run recompute).
|
||||
// SEK stays derived from runs + the opening terms below.
|
||||
const { data: ledgerRows } = await supabase
|
||||
.from('employee_vacation_balances')
|
||||
.select('employee_id, vacation_year_start, entitled_days, taken_days, saved_days')
|
||||
.eq('company_id', companyId)
|
||||
.eq('status', 'open')
|
||||
.gte('vacation_year_start', `${year}-01-01`)
|
||||
.lte('vacation_year_start', `${year}-12-31`)
|
||||
const ledgerByEmployee = new Map(
|
||||
((ledgerRows ?? []) as Array<{
|
||||
employee_id: string
|
||||
vacation_year_start: string
|
||||
entitled_days: number
|
||||
taken_days: number
|
||||
saved_days: Record<string, number> | null
|
||||
}>).map((r) => [r.employee_id, r]),
|
||||
)
|
||||
|
||||
const { data: openingRows } = await supabase
|
||||
.from('employee_opening_balances')
|
||||
.select(
|
||||
'employee_id, cutover_date, vacation_paid_days_remaining, vacation_saved_days_by_year, opening_semester_liability, opening_semester_liability_avgifter',
|
||||
)
|
||||
.eq('company_id', companyId)
|
||||
const openingByEmployee = new Map<
|
||||
string,
|
||||
{
|
||||
paidDaysRemaining: number
|
||||
savedDays: number
|
||||
liability: number
|
||||
liabilityAvgifter: number
|
||||
}
|
||||
>()
|
||||
for (const opening of (openingRows || []) as Array<{
|
||||
employee_id: string
|
||||
cutover_date: string
|
||||
vacation_paid_days_remaining: number
|
||||
vacation_saved_days_by_year: Record<string, number> | null
|
||||
opening_semester_liability: number
|
||||
opening_semester_liability_avgifter: number
|
||||
}>) {
|
||||
const cutoverYear = Number(opening.cutover_date.slice(0, 4))
|
||||
if (year < cutoverYear) continue
|
||||
const savedDays = Object.values(opening.vacation_saved_days_by_year ?? {}).reduce(
|
||||
(sum, days) => sum + (Number(days) || 0),
|
||||
0,
|
||||
)
|
||||
openingByEmployee.set(opening.employee_id, {
|
||||
paidDaysRemaining: opening.vacation_paid_days_remaining || 0,
|
||||
savedDays,
|
||||
liability: opening.opening_semester_liability || 0,
|
||||
liabilityAvgifter: opening.opening_semester_liability_avgifter || 0,
|
||||
})
|
||||
}
|
||||
|
||||
// Aggregate per employee
|
||||
const accrualsByEmployee = new Map<string, {
|
||||
totalAccrual: number
|
||||
@@ -115,19 +181,47 @@ export async function generateVacationLiability(
|
||||
|
||||
const rows: VacationLiabilityRow[] = employees.map(emp => {
|
||||
const accruals = accrualsByEmployee.get(emp.id)
|
||||
const accruedAmount = r(accruals?.totalAccrual || 0)
|
||||
const accruedAvgifter = r(accruals?.totalAvgifter || 0)
|
||||
const daysTaken = accruals?.totalDaysTaken || 0
|
||||
const opening = openingByEmployee.get(emp.id)
|
||||
const ledger = ledgerByEmployee.get(emp.id)
|
||||
const accruedAmount = r((accruals?.totalAccrual || 0) + (opening?.liability || 0))
|
||||
const accruedAvgifter = r((accruals?.totalAvgifter || 0) + (opening?.liabilityAvgifter || 0))
|
||||
|
||||
// Days: ledger row wins (it already folded in cutover seed + legacy
|
||||
// saved days + booked-run recompute); else the opening row shifts the
|
||||
// starting balance; else the naive entitled-minus-taken.
|
||||
let daysTaken: number
|
||||
let daysEntitled: number
|
||||
let daysRemaining: number
|
||||
let daysSaved: number
|
||||
if (ledger) {
|
||||
daysTaken = ledger.taken_days
|
||||
daysEntitled = ledger.entitled_days
|
||||
daysRemaining = ledger.entitled_days - ledger.taken_days
|
||||
daysSaved = Object.values(ledger.saved_days ?? {}).reduce(
|
||||
(sum, days) => sum + (Number(days) || 0),
|
||||
0,
|
||||
)
|
||||
} else {
|
||||
daysTaken = accruals?.totalDaysTaken || 0
|
||||
daysEntitled = emp.vacation_days_per_year
|
||||
// With an opening row, remaining days start from the imported balance
|
||||
// rather than the full annual entitlement (the previous system already
|
||||
// consumed part of the year).
|
||||
daysRemaining = opening
|
||||
? opening.paidDaysRemaining - daysTaken
|
||||
: emp.vacation_days_per_year - daysTaken
|
||||
daysSaved = emp.vacation_days_saved + (opening?.savedDays || 0)
|
||||
}
|
||||
|
||||
return {
|
||||
employeeId: emp.id,
|
||||
employeeName: `${emp.first_name} ${emp.last_name}`,
|
||||
personnummerLast4: emp.personnummer_last4,
|
||||
vacationRule: emp.vacation_rule,
|
||||
vacationDaysEntitled: emp.vacation_days_per_year,
|
||||
vacationDaysEntitled: daysEntitled,
|
||||
vacationDaysTaken: daysTaken,
|
||||
vacationDaysRemaining: emp.vacation_days_per_year - daysTaken,
|
||||
vacationDaysSaved: emp.vacation_days_saved,
|
||||
vacationDaysRemaining: daysRemaining,
|
||||
vacationDaysSaved: daysSaved,
|
||||
accruedAmount,
|
||||
accruedAvgifter,
|
||||
avgifterRate: accruals?.lastRate || 0.3142,
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
import type { SupabaseClient } from '@supabase/supabase-js'
|
||||
import { fetchAllRows } from '@/lib/supabase/fetch-all'
|
||||
import { fetchEntryLines, type EntryLinesQuery } from '@/lib/bookkeeping/entry-lines'
|
||||
import type {
|
||||
VatDeclaration,
|
||||
VatDeclarationRutor,
|
||||
@@ -264,6 +262,21 @@ export interface VatAccountTotals {
|
||||
* from `totals`; surfaced so the settlement proposal can warn and gate.
|
||||
*/
|
||||
settlementShapedEntries: VatSettlementShapedEntry[]
|
||||
/**
|
||||
* Posted/reversed entry counts per source_type for the whole period,
|
||||
* INCLUDING tagged vat_settlement entries (they never match the
|
||||
* invoice/transaction buckets, and the metadata scan always counted them).
|
||||
* Comes back in the same RPC round trip so the declaration metadata no
|
||||
* longer needs its own paginated entry scan.
|
||||
*/
|
||||
sourceTypeCounts: Record<string, number>
|
||||
}
|
||||
|
||||
/** Wire shape of the get_vat_declaration_totals RPC jsonb payload. */
|
||||
interface VatTotalsRpcPayload {
|
||||
totals: Array<{ account_number: string; debit: number; credit: number }>
|
||||
settlement_shaped_entries: VatSettlementShapedEntry[]
|
||||
source_type_counts: Record<string, number>
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -296,56 +309,37 @@ export async function fetchVatAccountTotals(
|
||||
start: string,
|
||||
end: string
|
||||
): Promise<VatAccountTotals> {
|
||||
const lines = await fetchEntryLines<{
|
||||
journal_entry_id: string
|
||||
account_number: string
|
||||
debit_amount: number
|
||||
credit_amount: number
|
||||
journal_entries?: VatSettlementShapedEntry
|
||||
}>({
|
||||
supabase,
|
||||
entryColumns: 'id, status, entry_date, source_type, voucher_series, voucher_number',
|
||||
lineColumns: 'account_number, debit_amount, credit_amount',
|
||||
filterEntries: (q: EntryLinesQuery) =>
|
||||
q
|
||||
.eq('company_id', companyId)
|
||||
.in('status', ['posted', 'reversed'])
|
||||
.neq('source_type', 'vat_settlement')
|
||||
.gte('entry_date', start)
|
||||
.lte('entry_date', end),
|
||||
filterLines: (q: EntryLinesQuery) =>
|
||||
q.in('account_number', [...VAT_ACCOUNTS, ...VAT_SETTLEMENT_NET_ACCOUNTS]),
|
||||
// Aggregation, settlement-shape detection, and source_type counts all
|
||||
// happen in one SQL pass (get_vat_declaration_totals). The previous
|
||||
// implementation paged every entry + line for the period through PostgREST
|
||||
// and reduced in JS: dozens of round trips for a busy quarter. The account
|
||||
// lists are parameters so ACCOUNT_RUTA stays the single source of truth.
|
||||
const { data, error } = await supabase.rpc('get_vat_declaration_totals', {
|
||||
p_company_id: companyId,
|
||||
p_start: start,
|
||||
p_end: end,
|
||||
p_accounts: [...VAT_ACCOUNTS, ...VAT_SETTLEMENT_NET_ACCOUNTS],
|
||||
p_ruta_accounts: VAT_ACCOUNTS,
|
||||
p_net_accounts: VAT_SETTLEMENT_NET_ACCOUNTS,
|
||||
})
|
||||
|
||||
// Shape detection: an entry is a settlement when it touches both a
|
||||
// declaration account and a settlement net account (2650/1650).
|
||||
const declarationEntryIds = new Set<string>()
|
||||
const netEntryIds = new Set<string>()
|
||||
for (const line of lines) {
|
||||
if (ACCOUNT_RUTA[line.account_number]) declarationEntryIds.add(line.journal_entry_id)
|
||||
else if (VAT_SETTLEMENT_NET_ACCOUNTS.includes(line.account_number)) {
|
||||
netEntryIds.add(line.journal_entry_id)
|
||||
}
|
||||
}
|
||||
|
||||
const shapedById = new Map<string, VatSettlementShapedEntry>()
|
||||
for (const line of lines) {
|
||||
const id = line.journal_entry_id
|
||||
if (!declarationEntryIds.has(id) || !netEntryIds.has(id)) continue
|
||||
const entry = line.journal_entries
|
||||
if (!entry || entry.source_type === 'opening_balance') continue
|
||||
shapedById.set(id, entry)
|
||||
if (error) {
|
||||
throw new Error(`get_vat_declaration_totals failed: ${error.message}`)
|
||||
}
|
||||
|
||||
const payload = (data ?? {}) as Partial<VatTotalsRpcPayload>
|
||||
const totals = new Map<string, { debit: number; credit: number }>()
|
||||
for (const line of lines) {
|
||||
if (shapedById.has(line.journal_entry_id)) continue
|
||||
const t = totals.get(line.account_number) || { debit: 0, credit: 0 }
|
||||
t.debit += Number(line.debit_amount) || 0
|
||||
t.credit += Number(line.credit_amount) || 0
|
||||
totals.set(line.account_number, t)
|
||||
for (const row of payload.totals ?? []) {
|
||||
totals.set(row.account_number, {
|
||||
debit: Number(row.debit) || 0,
|
||||
credit: Number(row.credit) || 0,
|
||||
})
|
||||
}
|
||||
|
||||
return {
|
||||
totals,
|
||||
settlementShapedEntries: payload.settlement_shaped_entries ?? [],
|
||||
sourceTypeCounts: payload.source_type_counts ?? {},
|
||||
}
|
||||
return { totals, settlementShapedEntries: [...shapedById.values()] }
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -413,8 +407,9 @@ export async function calculateVatDeclaration(
|
||||
supabase, companyId, periodType, year, period, options.fiscalPeriodId
|
||||
)
|
||||
|
||||
// Fetch and aggregate posted VAT-account activity for the period
|
||||
const { totals } = await fetchVatAccountTotals(supabase, companyId, start, end)
|
||||
// Fetch and aggregate posted VAT-account activity for the period. The same
|
||||
// RPC round trip carries the per-source_type entry counts for the metadata.
|
||||
const { totals, sourceTypeCounts } = await fetchVatAccountTotals(supabase, companyId, start, end)
|
||||
|
||||
// Map account balances to momsdeklaration boxes
|
||||
const rutor = rutorFromTotals(totals)
|
||||
@@ -430,29 +425,17 @@ export async function calculateVatDeclaration(
|
||||
if (t) revenueByRate[rate] = round(t.credit - t.debit)
|
||||
}
|
||||
|
||||
// Count journal entries by source type for metadata.
|
||||
// Paginated with a stable id order so the invoice/transaction counts don't
|
||||
// silently truncate at 1000 entries for a busy VAT period.
|
||||
const entryCounts = await fetchAllRows<{ id: string; source_type: string }>(({ from, to }) =>
|
||||
supabase
|
||||
.from('journal_entries')
|
||||
.select('id, source_type')
|
||||
.eq('company_id', companyId)
|
||||
.in('status', ['posted', 'reversed'])
|
||||
.gte('entry_date', start)
|
||||
.lte('entry_date', end)
|
||||
.order('id', { ascending: true })
|
||||
.range(from, to)
|
||||
, { dedupeBy: (e) => e.id })
|
||||
|
||||
// Entry counts by source type for metadata: aggregated by the RPC in the
|
||||
// same round trip as the totals (SQL GROUP BY, so a busy VAT period can
|
||||
// never truncate the counts).
|
||||
const invoiceSources = new Set([
|
||||
'invoice_created', 'invoice_paid', 'invoice_cash_payment', 'credit_note',
|
||||
])
|
||||
let invoiceCount = 0
|
||||
let transactionCount = 0
|
||||
for (const e of entryCounts) {
|
||||
if (invoiceSources.has(e.source_type)) invoiceCount++
|
||||
else if (e.source_type === 'bank_transaction') transactionCount++
|
||||
for (const [sourceType, n] of Object.entries(sourceTypeCounts)) {
|
||||
if (invoiceSources.has(sourceType)) invoiceCount += n
|
||||
else if (sourceType === 'bank_transaction') transactionCount += n
|
||||
}
|
||||
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user