b6332e9ff4
* 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>
890 lines
34 KiB
TypeScript
890 lines
34 KiB
TypeScript
/**
|
|
* Shared salary-calculation orchestration.
|
|
*
|
|
* Both the internal dashboard route (`POST /api/salary/runs/{id}/calculate`)
|
|
* and the v1 public route (`POST /api/v1/companies/{companyId}/salary-runs/{id}/calculate`)
|
|
* call this helper. It performs every side effect the dashboard's calculate
|
|
* step did: load config + employees + tax tables, derive absence / benefits
|
|
* / worked-hours, run the engine per employee, write line items + run-employee
|
|
* results + run totals + calculation_params.
|
|
*
|
|
* The function returns a discriminated result rather than a NextResponse so
|
|
* either caller can wrap it in their own response envelope (internal uses
|
|
* `errorResponseFromCode`; v1 uses `v1ErrorResponseFromCode`).
|
|
*
|
|
* Strict-mode: the function aborts at the FIRST per-employee failure. There
|
|
* is no partial-state recovery: either every employee succeeds and the run
|
|
* gets its aggregated totals + updated row, or the caller receives an error
|
|
* and the run remains in `draft`. This matches the dashboard's behaviour and
|
|
* is required for BFL 5 kap: a half-calculated run that later advances to
|
|
* `review` would post a wrong verifikation when `:book` runs.
|
|
*
|
|
* The function does NOT advance the salary_runs status. That's the route's
|
|
* responsibility: the dashboard leaves the run in `draft` (an explicit
|
|
* `/review` verb does the freeze), while v1 collapses calculate+review into
|
|
* a single verb. Routes layer the status transition on top of this result.
|
|
*/
|
|
|
|
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
import { calculateSalary } from './calculation-engine'
|
|
import { loadPayrollConfig, serializePayrollConfig } from './payroll-config'
|
|
import { fetchAllTaxTableRatesForRun, TaxTableUnavailableError } from './tax-tables'
|
|
import { loadAndDeriveAbsence } from './derive-absence-line-items'
|
|
import { getLineItemAccount } from './account-mapping'
|
|
import { computePremiumLines } from './shift-premium-engine'
|
|
import { roundOre } from '@/lib/money'
|
|
import { dailyDivisor, hourlyDivisor } from './work-schedule'
|
|
import type { WorkedDayShift } from './shift-premium-engine'
|
|
import type { Logger } from '@/lib/logger'
|
|
import type { SalaryLineItemType, ShiftPremiumRule, ShiftPremiumItemType } from '@/types'
|
|
|
|
/** Item types that the calculator derives from per-day absence records. */
|
|
const DERIVED_ABSENCE_TYPES: SalaryLineItemType[] = [
|
|
'sick_karens',
|
|
'sick_day2_14',
|
|
'sick_day15_plus',
|
|
'vab',
|
|
'parental_leave',
|
|
'unpaid_leave',
|
|
]
|
|
|
|
/**
|
|
* Item types that the calculator derives from shift_premium_rules + worked
|
|
* days. These are wiped at the start of each per-employee pass and
|
|
* regenerated so the displayed line items always match the latest rules.
|
|
*/
|
|
const DERIVED_PREMIUM_TYPES: ShiftPremiumItemType[] = [
|
|
'overtime_50',
|
|
'overtime_100',
|
|
'ob_weekday_evening',
|
|
'ob_weekend',
|
|
'ob_night',
|
|
'ob_holiday',
|
|
]
|
|
|
|
/**
|
|
* Effective hourly rate used as the base for shift-premium computation.
|
|
* - Hourly employees: their stored hourly_rate.
|
|
* - Monthly employees: monthly_salary / hourlyDivisor(hours_per_week):
|
|
* 173 at the 40h default (common Swedish derivation for full-time
|
|
* monthly → hourly, matches the timlön conventions used in CBAs), the
|
|
* exact 52w formula for other schedules (arbetsschema-lite).
|
|
*/
|
|
function effectiveHourlyRate(emp: {
|
|
salary_type: 'monthly' | 'hourly'
|
|
hourly_rate: number | null
|
|
monthly_salary: number | null
|
|
hours_per_week?: number | null
|
|
}): number {
|
|
if (emp.salary_type === 'hourly') return emp.hourly_rate || 0
|
|
const monthly = emp.monthly_salary || 0
|
|
return monthly > 0 ? Math.round((monthly / hourlyDivisor(emp.hours_per_week)) * 100) / 100 : 0
|
|
}
|
|
|
|
/** Benefit-type → line-item-type mapping for the derived benefit rows. */
|
|
const BENEFIT_TYPE_TO_LINE_ITEM: Record<string, SalaryLineItemType> = {
|
|
bike: 'benefit_bike',
|
|
car: 'benefit_car',
|
|
meals: 'benefit_meals',
|
|
housing: 'benefit_housing',
|
|
wellness: 'benefit_wellness',
|
|
other: 'benefit_other',
|
|
}
|
|
|
|
export interface RunSalaryCalculationArgs {
|
|
supabase: SupabaseClient
|
|
companyId: string
|
|
salaryRunId: string
|
|
log: Logger
|
|
requestId: string
|
|
}
|
|
|
|
export type RunSalaryCalculationResult =
|
|
| { ok: true; run: Record<string, unknown>; warnings: string[] }
|
|
| { ok: false; code: string; details?: unknown; status?: number }
|
|
|
|
/**
|
|
* Run the per-employee calculation for a salary run.
|
|
*
|
|
* Preconditions enforced inside:
|
|
* - salary_runs row exists, is owned by `companyId`, and is in `draft` status
|
|
* - at least one salary_run_employee row exists for the run
|
|
* - every employee has a valid salary amount + tax configuration
|
|
* - every needed tax table is fetchable from Skatteverket (or local fallback)
|
|
*
|
|
* Returns the updated salary_runs row + warnings on success. Returns a
|
|
* structured `{ ok: false; code; details? }` on any failure. The caller is
|
|
* responsible for converting that to its response envelope.
|
|
*/
|
|
export async function runSalaryCalculation(
|
|
args: RunSalaryCalculationArgs,
|
|
): Promise<RunSalaryCalculationResult> {
|
|
const { supabase, companyId, salaryRunId: id, log, requestId } = args
|
|
const opLog = log.child({ salaryRunId: id })
|
|
|
|
// 1. Precondition: run exists, owned by company, is in draft status.
|
|
const { data: run, error: runError } = await supabase
|
|
.from('salary_runs')
|
|
.select('*')
|
|
.eq('id', id)
|
|
.eq('company_id', companyId)
|
|
.single()
|
|
|
|
if (runError || !run) {
|
|
return { ok: false, code: 'SALARY_RUN_NOT_FOUND' }
|
|
}
|
|
if (run.status !== 'draft') {
|
|
return {
|
|
ok: false,
|
|
code: 'SALARY_RUN_CALCULATE_FAILED',
|
|
details: { currentStatus: run.status, reason: 'not_draft' },
|
|
}
|
|
}
|
|
|
|
const paymentYear = parseInt(run.payment_date.split('-')[0])
|
|
|
|
// 2. Load year config.
|
|
const config = await loadPayrollConfig(supabase, paymentYear)
|
|
|
|
// 3. Load roster: `salary_run_employees` joined with employees + line items.
|
|
// Defense-in-depth: filter by company_id too even though salary_run_id is a
|
|
// foreign key. RLS already constrains the table per-company, but per
|
|
// CLAUDE.md every query carries the company_id filter explicitly so a
|
|
// future RLS lapse can't surface cross-tenant rows.
|
|
const { data: runEmployeesData, error: empError } = await supabase
|
|
.from('salary_run_employees')
|
|
.select('*, employee:employees(*), line_items:salary_line_items(*)')
|
|
.eq('salary_run_id', id)
|
|
.eq('company_id', companyId)
|
|
|
|
if (empError) {
|
|
return { ok: false, code: 'DATABASE_ERROR', details: empError }
|
|
}
|
|
// An empty roster is valid: a registered employer must still file a
|
|
// nolldeklaration (HU-only AGI) for months without payroll. Calculation
|
|
// then yields all-zero totals plus a frozen calculation_params snapshot,
|
|
// and every downstream loop simply iterates zero times.
|
|
const runEmployees = runEmployeesData ?? []
|
|
|
|
// 4. Pre-calculation validation: ensure every employee has the data the
|
|
// engine needs. We accumulate ALL errors so the caller sees a complete
|
|
// list rather than fixing one and discovering the next on the retry.
|
|
const validationErrors: string[] = []
|
|
for (const sre of runEmployees) {
|
|
const emp = sre.employee
|
|
if (!emp) continue
|
|
const name = `${emp.first_name} ${emp.last_name}`
|
|
|
|
// A per-run monthly salary of 0 is allowed: it represents an intentional
|
|
// nollkörning (the user edited this month's salary down to 0). Only a
|
|
// negative value is rejected. New employees still require monthly_salary > 0
|
|
// at creation (CreateEmployeeSchema), so a stray 0 cannot arise by accident.
|
|
if (emp.salary_type === 'monthly' && sre.monthly_salary < 0) {
|
|
validationErrors.push(`${name}: Månadslön kan inte vara negativ`)
|
|
}
|
|
if (emp.salary_type === 'hourly' && (!emp.hourly_rate || emp.hourly_rate <= 0)) {
|
|
validationErrors.push(`${name}: Timlön saknas eller är 0`)
|
|
}
|
|
if (emp.f_skatt_status === 'a_skatt' && !emp.is_sidoinkomst && !emp.tax_table_number) {
|
|
validationErrors.push(`${name}: Skattetabell saknas (krävs för A-skatt)`)
|
|
}
|
|
}
|
|
if (validationErrors.length > 0) {
|
|
return {
|
|
ok: false,
|
|
code: 'VALIDATION_ERROR',
|
|
details: { issues: validationErrors, reason: 'employee_data_incomplete' },
|
|
}
|
|
}
|
|
|
|
// 5. Fetch every needed tax table in one batch. The Skatteverket API has
|
|
// fallback to local data; if both fail TaxTableUnavailableError surfaces
|
|
// as a distinct retryable 503.
|
|
const tableNumbers = [
|
|
...new Set(
|
|
runEmployees
|
|
.filter((e) => e.employee?.tax_table_number)
|
|
.map((e) => e.employee.tax_table_number as number),
|
|
),
|
|
]
|
|
const columns = [
|
|
...new Set(
|
|
runEmployees
|
|
.filter((e) => e.employee?.tax_column)
|
|
.map((e) => e.employee.tax_column as number),
|
|
),
|
|
]
|
|
let taxRates: Awaited<ReturnType<typeof fetchAllTaxTableRatesForRun>>['rates'] = []
|
|
let taxTableSource: Awaited<ReturnType<typeof fetchAllTaxTableRatesForRun>>['source'] = 'api'
|
|
if (tableNumbers.length > 0) {
|
|
try {
|
|
const result = await fetchAllTaxTableRatesForRun(
|
|
paymentYear,
|
|
tableNumbers,
|
|
columns.length > 0 ? columns : [1],
|
|
)
|
|
taxRates = result.rates
|
|
taxTableSource = result.source
|
|
} catch (err) {
|
|
if (err instanceof TaxTableUnavailableError) {
|
|
return {
|
|
ok: false,
|
|
code: 'SALARY_RUN_TAX_TABLE_MISSING',
|
|
details: { reason: err.message, paymentYear, tableNumbers },
|
|
status: 503,
|
|
}
|
|
}
|
|
throw err
|
|
}
|
|
}
|
|
|
|
// 6. YTD aggregation across prior BOOKED runs in the same period_year.
|
|
// Drives the engine's progressive-tax + capped-avgift calculations.
|
|
const { data: priorRuns } = await supabase
|
|
.from('salary_run_employees')
|
|
.select(
|
|
'employee_id, gross_salary, tax_withheld, net_salary, salary_run:salary_runs!inner(period_year, period_month, status)',
|
|
)
|
|
.eq('company_id', companyId)
|
|
.eq('salary_run.period_year', run.period_year)
|
|
.eq('salary_run.status', 'booked')
|
|
.lt('salary_run.period_month', run.period_month)
|
|
|
|
// 6b. Cutover opening balances (payroll gap-closure 2.2): a company that
|
|
// switched to Accounted mid-year has YTD state from its previous
|
|
// payroll system that no booked run here carries. Fetched BEFORE the
|
|
// prior-run aggregation because the cutover month also decides which
|
|
// booked runs count (see the exclusion in the loop below). YTD is
|
|
// payslip display + reporting only: per-month tax lookup and the
|
|
// per-month avgifter caps never read it.
|
|
const rosterEmployeeIds = runEmployees
|
|
.map((sre) => sre.employee?.id)
|
|
.filter((id): id is string => !!id)
|
|
const openingByEmployee = new Map<
|
|
string,
|
|
{ cutoverDate: string; karensPeriodsAdjustment: number }
|
|
>()
|
|
const openingRowsTyped: Array<{
|
|
employee_id: string
|
|
cutover_date: string
|
|
ytd_gross: number
|
|
ytd_tax: number
|
|
ytd_net: number
|
|
karens_periods_adjustment: number
|
|
}> = []
|
|
if (rosterEmployeeIds.length > 0) {
|
|
const { data: openingRows } = await supabase
|
|
.from('employee_opening_balances')
|
|
.select('employee_id, cutover_date, ytd_gross, ytd_tax, ytd_net, karens_periods_adjustment')
|
|
.eq('company_id', companyId)
|
|
.in('employee_id', rosterEmployeeIds)
|
|
|
|
for (const opening of (openingRows || []) as typeof openingRowsTyped) {
|
|
openingRowsTyped.push(opening)
|
|
openingByEmployee.set(opening.employee_id, {
|
|
cutoverDate: opening.cutover_date,
|
|
karensPeriodsAdjustment: opening.karens_periods_adjustment ?? 0,
|
|
})
|
|
}
|
|
}
|
|
|
|
const ytdByEmployee = new Map<string, { gross: number; tax: number; net: number }>()
|
|
// Cast via unknown: supabase-js infers the to-one `salary_run` embed as an
|
|
// array, but PostgREST returns an object for a many-to-one relationship.
|
|
for (const prior of (priorRuns || []) as unknown as Array<{
|
|
employee_id: string
|
|
gross_salary: number
|
|
tax_withheld: number
|
|
net_salary: number
|
|
salary_run: { period_year: number; period_month: number }
|
|
}>) {
|
|
// The opening balance is authoritative for pre-cutover YTD: a booked run
|
|
// backdated before the cutover month covers a month the opening already
|
|
// carries, so counting both would double the YTD.
|
|
const opening = openingByEmployee.get(prior.employee_id)
|
|
if (opening) {
|
|
const cutoverYear = Number(opening.cutoverDate.slice(0, 4))
|
|
const cutoverMonth = Number(opening.cutoverDate.slice(5, 7))
|
|
if (
|
|
prior.salary_run.period_year === cutoverYear &&
|
|
prior.salary_run.period_month < cutoverMonth
|
|
) {
|
|
continue
|
|
}
|
|
}
|
|
const current = ytdByEmployee.get(prior.employee_id) || { gross: 0, tax: 0, net: 0 }
|
|
current.gross += prior.gross_salary
|
|
current.tax += prior.tax_withheld
|
|
current.net += prior.net_salary
|
|
ytdByEmployee.set(prior.employee_id, current)
|
|
}
|
|
|
|
// Merge the opening YTD when the run's period is in the cutover year, on
|
|
// or after the cutover month (the month gate prevents double-count if
|
|
// someone backdates an in-system run before cutover).
|
|
for (const opening of openingRowsTyped) {
|
|
const cutoverYear = Number(opening.cutover_date.slice(0, 4))
|
|
const cutoverMonth = Number(opening.cutover_date.slice(5, 7))
|
|
const runOnOrAfterCutover =
|
|
run.period_year === cutoverYear && run.period_month >= cutoverMonth
|
|
if (!runOnOrAfterCutover) continue
|
|
const current = ytdByEmployee.get(opening.employee_id) || { gross: 0, tax: 0, net: 0 }
|
|
current.gross = roundOre(current.gross + (opening.ytd_gross || 0))
|
|
current.tax = roundOre(current.tax + (opening.ytd_tax || 0))
|
|
current.net = roundOre(current.net + (opening.ytd_net || 0))
|
|
ytdByEmployee.set(opening.employee_id, current)
|
|
}
|
|
|
|
// 7. Pay period bounds: used to load per-day absence + worked-day records.
|
|
const periodYear = run.period_year as number
|
|
const periodMonth = run.period_month as number
|
|
const periodStart = `${periodYear}-${String(periodMonth).padStart(2, '0')}-01`
|
|
const periodEndDate = new Date(Date.UTC(periodYear, periodMonth, 0)) // last day of month
|
|
const periodEnd = periodEndDate.toISOString().slice(0, 10)
|
|
|
|
// 7b. Load active shift_premium_rules once per run. Filtered by company.
|
|
// Inactive rules excluded: the engine also re-checks, but this saves
|
|
// network bytes for companies with many archived rules.
|
|
const { data: premiumRulesRaw, error: rulesError } = await supabase
|
|
.from('shift_premium_rules')
|
|
.select('*')
|
|
.eq('company_id', companyId)
|
|
.eq('is_active', true)
|
|
if (rulesError) {
|
|
return { ok: false, code: 'DATABASE_ERROR', details: rulesError }
|
|
}
|
|
const premiumRules = (premiumRulesRaw ?? []) as ShiftPremiumRule[]
|
|
|
|
// Per-run aggregates collected during the loop.
|
|
let totalGross = 0
|
|
let totalTax = 0
|
|
let totalNet = 0
|
|
let totalAvgifter = 0
|
|
let totalVacationAccrual = 0
|
|
let totalEmployerCost = 0
|
|
|
|
// Surfaced as warnings: UI / agent shows alongside the successful
|
|
// calculation, not an error.
|
|
const lakarintygEmployees: string[] = []
|
|
const fkReportingEmployees: string[] = []
|
|
|
|
// 8. Per-employee calculation loop.
|
|
for (const sre of runEmployees) {
|
|
const emp = sre.employee
|
|
if (!emp) continue
|
|
|
|
// 8a. Derive absence line items from per-day records. The cutover karens
|
|
// adjustment applies only while the 12-month högriskskydd lookback
|
|
// still reaches into pre-cutover time; past that horizon the
|
|
// adjustment is stale and imported day rows carry the truth.
|
|
const opening = openingByEmployee.get(emp.id)
|
|
const lookbackStartMs = Date.parse(`${periodStart}T00:00:00Z`) - 365 * 86_400_000
|
|
const karensAdjustmentApplies =
|
|
opening !== undefined &&
|
|
opening.karensPeriodsAdjustment > 0 &&
|
|
lookbackStartMs < Date.parse(`${opening.cutoverDate}T00:00:00Z`)
|
|
const absenceResult = await loadAndDeriveAbsence({
|
|
supabase,
|
|
companyId,
|
|
employeeId: emp.id,
|
|
monthlySalary: sre.monthly_salary || 0,
|
|
payrollConfig: config,
|
|
periodStart,
|
|
periodEnd,
|
|
karensPeriodsAdjustment: karensAdjustmentApplies ? opening.karensPeriodsAdjustment : 0,
|
|
dailyDivisor: dailyDivisor(emp.workdays_per_week),
|
|
})
|
|
|
|
// 8b. For hourly employees, derive worked hours from the calendar.
|
|
// For all employees (when premium rules exist), the same rows feed
|
|
// the shift-premium engine in 8z below.
|
|
let derivedHoursWorked: number | null = null
|
|
let workedDayRows: Array<{ work_date: string; hours: number; start_time: string | null; end_time: string | null }> = []
|
|
if (emp.salary_type === 'hourly' || premiumRules.length > 0) {
|
|
const { data: workedDays, error: workedError } = await supabase
|
|
.from('salary_worked_days')
|
|
.select('hours, work_date, start_time, end_time')
|
|
.eq('company_id', companyId)
|
|
.eq('employee_id', emp.id)
|
|
.gte('work_date', periodStart)
|
|
.lte('work_date', periodEnd)
|
|
if (workedError) {
|
|
return { ok: false, code: 'DATABASE_ERROR', details: workedError }
|
|
}
|
|
workedDayRows = (workedDays ?? []) as typeof workedDayRows
|
|
}
|
|
if (emp.salary_type === 'hourly') {
|
|
derivedHoursWorked = workedDayRows.reduce(
|
|
(sum, d) => Math.round((sum + Number(d.hours)) * 100) / 100,
|
|
0,
|
|
)
|
|
opLog.info('Derived hours_worked from calendar', {
|
|
employeeId: emp.id,
|
|
periodStart,
|
|
periodEnd,
|
|
rowCount: workedDayRows.length,
|
|
derivedHoursWorked,
|
|
})
|
|
|
|
// Refresh the hourly_salary line item so the displayed Lönerader table
|
|
// matches what the engine actually calculated.
|
|
if (derivedHoursWorked > 0 && (emp.hourly_rate || 0) > 0) {
|
|
const baseAmount =
|
|
Math.round((emp.hourly_rate as number) * derivedHoursWorked * 100) / 100
|
|
await supabase
|
|
.from('salary_line_items')
|
|
.delete()
|
|
.eq('salary_run_employee_id', sre.id)
|
|
.eq('item_type', 'hourly_salary')
|
|
await supabase.from('salary_line_items').insert({
|
|
salary_run_employee_id: sre.id,
|
|
company_id: companyId,
|
|
item_type: 'hourly_salary',
|
|
description: 'Timlön',
|
|
quantity: derivedHoursWorked,
|
|
amount: baseAmount,
|
|
is_taxable: true,
|
|
is_avgift_basis: true,
|
|
is_vacation_basis: true,
|
|
is_gross_deduction: false,
|
|
is_net_deduction: false,
|
|
account_number: getLineItemAccount('hourly_salary'),
|
|
sort_order: 0,
|
|
})
|
|
}
|
|
}
|
|
|
|
// Refresh the monthly 'Grundlön' line so the displayed Lönerader table
|
|
// matches the per-run monthly salary the engine actually uses. The engine
|
|
// recomputes baseSalary from sre.monthly_salary (not from this line item),
|
|
// so this update is display-only: it keeps the row consistent after the
|
|
// user edits this month's salary on the draft.
|
|
if (emp.salary_type === 'monthly') {
|
|
const baseAmount =
|
|
Math.round((sre.monthly_salary || 0) * (emp.employment_degree / 100) * 100) / 100
|
|
await supabase
|
|
.from('salary_line_items')
|
|
.update({ amount: baseAmount })
|
|
.eq('salary_run_employee_id', sre.id)
|
|
.eq('company_id', companyId)
|
|
.eq('item_type', 'monthly_salary')
|
|
}
|
|
|
|
const employeeName = `${emp.first_name} ${emp.last_name}`
|
|
if (absenceResult.flagLakarintyg) lakarintygEmployees.push(employeeName)
|
|
if (absenceResult.flagFkReporting) fkReportingEmployees.push(employeeName)
|
|
|
|
// 8c. Replace derived absence rows.
|
|
const { error: delAbsErr } = await supabase
|
|
.from('salary_line_items')
|
|
.delete()
|
|
.eq('salary_run_employee_id', sre.id)
|
|
.in('item_type', DERIVED_ABSENCE_TYPES)
|
|
if (delAbsErr) {
|
|
return { ok: false, code: 'DATABASE_ERROR', details: delAbsErr }
|
|
}
|
|
|
|
// 8d. Derive benefit line items from employee_benefits.
|
|
const { data: activeBenefits, error: benefitsErr } = await supabase
|
|
.from('employee_benefits')
|
|
.select('id, benefit_type, description, monthly_value')
|
|
.eq('employee_id', emp.id)
|
|
.eq('company_id', companyId)
|
|
.eq('is_active', true)
|
|
.lte('valid_from', run.payment_date)
|
|
.or(`valid_to.is.null,valid_to.gte.${run.payment_date}`)
|
|
if (benefitsErr) {
|
|
return { ok: false, code: 'DATABASE_ERROR', details: benefitsErr }
|
|
}
|
|
|
|
const { error: delBenefitErr } = await supabase
|
|
.from('salary_line_items')
|
|
.delete()
|
|
.eq('salary_run_employee_id', sre.id)
|
|
.not('source_benefit_id', 'is', null)
|
|
if (delBenefitErr) {
|
|
return { ok: false, code: 'DATABASE_ERROR', details: delBenefitErr }
|
|
}
|
|
|
|
const derivedBenefitRows = (activeBenefits ?? [])
|
|
.filter((b) => b.monthly_value > 0)
|
|
.map((b, idx) => {
|
|
const itemType = BENEFIT_TYPE_TO_LINE_ITEM[b.benefit_type] ?? 'benefit_other'
|
|
return {
|
|
salary_run_employee_id: sre.id,
|
|
company_id: companyId,
|
|
item_type: itemType,
|
|
description: b.description,
|
|
quantity: 1,
|
|
amount: Math.round(b.monthly_value * 100) / 100,
|
|
is_taxable: true,
|
|
is_avgift_basis: true,
|
|
is_vacation_basis: false,
|
|
is_gross_deduction: false,
|
|
is_net_deduction: false,
|
|
account_number: getLineItemAccount(itemType, emp.employment_type),
|
|
sort_order: 200 + idx,
|
|
source_benefit_id: b.id,
|
|
}
|
|
})
|
|
|
|
if (derivedBenefitRows.length > 0) {
|
|
const { error: insBenefitErr } = await supabase
|
|
.from('salary_line_items')
|
|
.insert(derivedBenefitRows)
|
|
if (insBenefitErr) {
|
|
return { ok: false, code: 'DATABASE_ERROR', details: insBenefitErr }
|
|
}
|
|
}
|
|
|
|
if (absenceResult.lineItems.length > 0) {
|
|
const rows = absenceResult.lineItems.map((li, idx) => ({
|
|
salary_run_employee_id: sre.id,
|
|
company_id: companyId,
|
|
item_type: li.item_type,
|
|
description: li.description,
|
|
quantity: li.quantity,
|
|
amount: Math.round(li.amount * 100) / 100,
|
|
is_taxable: li.is_taxable,
|
|
is_avgift_basis: li.is_avgift_basis,
|
|
is_vacation_basis: li.is_vacation_basis,
|
|
is_gross_deduction: li.is_gross_deduction,
|
|
is_net_deduction: false,
|
|
account_number: getLineItemAccount(li.item_type),
|
|
sort_order: 100 + idx,
|
|
}))
|
|
const { error: insAbsErr } = await supabase.from('salary_line_items').insert(rows)
|
|
if (insAbsErr) {
|
|
return { ok: false, code: 'DATABASE_ERROR', details: insAbsErr }
|
|
}
|
|
}
|
|
|
|
// 8d2. Derive shift-premium rows (OB-tillägg, övertid 50/100). The engine
|
|
// consumes start_time/end_time when present; rows without explicit
|
|
// times fall back to a default 08:00-17:00 shift (no pure-night/
|
|
// pure-weekend rules trigger for those days). The premium rate is
|
|
// applied to the employee's effectiveHourlyRate so monthly
|
|
// employees still get OB by deriving an hourly rate as
|
|
// monthly_salary / 173.
|
|
const { error: delPremiumErr } = await supabase
|
|
.from('salary_line_items')
|
|
.delete()
|
|
.eq('salary_run_employee_id', sre.id)
|
|
.in('item_type', DERIVED_PREMIUM_TYPES as unknown as string[])
|
|
if (delPremiumErr) {
|
|
return { ok: false, code: 'DATABASE_ERROR', details: delPremiumErr }
|
|
}
|
|
|
|
let derivedPremiumRows: Array<{
|
|
salary_run_employee_id: string
|
|
company_id: string
|
|
item_type: ShiftPremiumItemType
|
|
description: string
|
|
quantity: number
|
|
amount: number
|
|
is_taxable: boolean
|
|
is_avgift_basis: boolean
|
|
is_vacation_basis: boolean
|
|
is_gross_deduction: boolean
|
|
is_net_deduction: boolean
|
|
account_number: string
|
|
sort_order: number
|
|
}> = []
|
|
|
|
if (premiumRules.length > 0 && workedDayRows.length > 0) {
|
|
const baseHourlyRate = effectiveHourlyRate({
|
|
salary_type: emp.salary_type,
|
|
hourly_rate: emp.hourly_rate,
|
|
monthly_salary: sre.monthly_salary,
|
|
hours_per_week: emp.hours_per_week,
|
|
})
|
|
const shifts: WorkedDayShift[] = workedDayRows.map((row) => ({
|
|
work_date: row.work_date,
|
|
hours: Number(row.hours),
|
|
start_time: row.start_time,
|
|
end_time: row.end_time,
|
|
}))
|
|
const premiumLines = computePremiumLines({
|
|
employeeId: emp.id,
|
|
baseHourlyRate,
|
|
workedDays: shifts,
|
|
rules: premiumRules,
|
|
})
|
|
derivedPremiumRows = premiumLines.map((line, idx) => ({
|
|
salary_run_employee_id: sre.id,
|
|
company_id: companyId,
|
|
item_type: line.itemType,
|
|
description: line.description,
|
|
quantity: line.hours,
|
|
amount: line.amount,
|
|
is_taxable: true,
|
|
is_avgift_basis: true,
|
|
is_vacation_basis: true,
|
|
is_gross_deduction: false,
|
|
is_net_deduction: false,
|
|
account_number: getLineItemAccount(line.itemType, emp.employment_type),
|
|
sort_order: 300 + idx,
|
|
}))
|
|
if (derivedPremiumRows.length > 0) {
|
|
const { error: insPremiumErr } = await supabase
|
|
.from('salary_line_items')
|
|
.insert(derivedPremiumRows)
|
|
if (insPremiumErr) {
|
|
return { ok: false, code: 'DATABASE_ERROR', details: insPremiumErr }
|
|
}
|
|
}
|
|
}
|
|
|
|
// 8e. Assemble the in-memory line item set fed to calculateSalary.
|
|
const manualLineItems = (sre.line_items || [])
|
|
.filter((li: Record<string, unknown>) => {
|
|
if (DERIVED_ABSENCE_TYPES.includes(li.item_type as SalaryLineItemType)) return false
|
|
if (DERIVED_PREMIUM_TYPES.includes(li.item_type as ShiftPremiumItemType)) return false
|
|
if (li.source_benefit_id) return false
|
|
if (li.item_type === 'semesterersattning') return false
|
|
return true
|
|
})
|
|
.map((li: Record<string, unknown>) => ({
|
|
itemType: li.item_type as SalaryLineItemType,
|
|
amount: li.amount as number,
|
|
isTaxable: li.is_taxable as boolean,
|
|
isAvgiftBasis: li.is_avgift_basis as boolean,
|
|
isVacationBasis: li.is_vacation_basis as boolean,
|
|
isGrossDeduction: li.is_gross_deduction as boolean,
|
|
isNetDeduction: li.is_net_deduction as boolean,
|
|
}))
|
|
const derivedLineItems = absenceResult.lineItems.map((li) => ({
|
|
itemType: li.item_type as SalaryLineItemType,
|
|
amount: li.amount,
|
|
isTaxable: li.is_taxable,
|
|
isAvgiftBasis: li.is_avgift_basis,
|
|
isVacationBasis: li.is_vacation_basis,
|
|
isGrossDeduction: li.is_gross_deduction,
|
|
isNetDeduction: false,
|
|
}))
|
|
const derivedBenefitLineItems = derivedBenefitRows.map((row) => ({
|
|
itemType: row.item_type as SalaryLineItemType,
|
|
amount: row.amount,
|
|
isTaxable: true,
|
|
isAvgiftBasis: true,
|
|
isVacationBasis: false,
|
|
isGrossDeduction: false,
|
|
isNetDeduction: false,
|
|
}))
|
|
const derivedPremiumLineItems = derivedPremiumRows.map((row) => ({
|
|
itemType: row.item_type as SalaryLineItemType,
|
|
amount: row.amount,
|
|
isTaxable: true,
|
|
isAvgiftBasis: true,
|
|
isVacationBasis: true,
|
|
isGrossDeduction: false,
|
|
isNetDeduction: false,
|
|
}))
|
|
const lineItems = [...manualLineItems, ...derivedLineItems, ...derivedBenefitLineItems, ...derivedPremiumLineItems]
|
|
|
|
// 8f. Run the engine for this employee.
|
|
const result = calculateSalary(
|
|
{
|
|
employmentType: emp.employment_type,
|
|
salaryType: emp.salary_type,
|
|
monthlySalary: sre.monthly_salary || 0,
|
|
hourlyRate: emp.hourly_rate || undefined,
|
|
hoursWorked:
|
|
derivedHoursWorked !== null && derivedHoursWorked > 0
|
|
? derivedHoursWorked
|
|
: sre.hours_worked || undefined,
|
|
employmentDegree: emp.employment_degree,
|
|
taxTableNumber: emp.tax_table_number,
|
|
taxColumn: emp.tax_column || 1,
|
|
isSidoinkomst: emp.is_sidoinkomst,
|
|
jamkningPercentage: emp.jamkning_percentage,
|
|
jamkningValidFrom: emp.jamkning_valid_from,
|
|
jamkningValidTo: emp.jamkning_valid_to,
|
|
fSkattStatus: emp.f_skatt_status,
|
|
personnummer: emp.personnummer,
|
|
paymentDate: run.payment_date,
|
|
vacationRule: emp.vacation_rule,
|
|
vacationDaysPerYear: emp.vacation_days_per_year,
|
|
semestertillaggRate: emp.semestertillagg_rate,
|
|
dailyDivisor: dailyDivisor(emp.workdays_per_week),
|
|
vaxaStodEligible: emp.vaxa_stod_eligible,
|
|
vaxaStodStart: emp.vaxa_stod_start,
|
|
vaxaStodEnd: emp.vaxa_stod_end,
|
|
lineItems,
|
|
periodStart,
|
|
periodEnd,
|
|
employmentStart: emp.employment_start,
|
|
employmentEnd: emp.employment_end,
|
|
},
|
|
config,
|
|
taxRates.map((r) => ({
|
|
tableYear: r.tableYear,
|
|
tableNumber: r.tableNumber,
|
|
columnNumber: r.columnNumber,
|
|
incomeFrom: r.incomeFrom,
|
|
incomeTo: r.incomeTo,
|
|
taxAmount: r.taxAmount,
|
|
})),
|
|
)
|
|
|
|
// Aggregated absence counts derived from per-day records.
|
|
const sickDays = absenceResult.aggregated.sickDays
|
|
const vabDays = absenceResult.aggregated.vabDays
|
|
const parentalDays = absenceResult.aggregated.parentalDays
|
|
const vacationDays = (sre.line_items || [])
|
|
.filter((li: Record<string, unknown>) => li.item_type === 'vacation')
|
|
.reduce(
|
|
(sum: number, li: Record<string, unknown>) => sum + ((li.quantity as number) || 0),
|
|
0,
|
|
)
|
|
|
|
// 8g. Write the per-employee row. Mirrors calendar-derived hours into the
|
|
// hours_worked snapshot column so downstream code (reports, storno via
|
|
// correct/route) sees a consistent value.
|
|
const snapshotHoursWorked =
|
|
derivedHoursWorked !== null && derivedHoursWorked > 0
|
|
? derivedHoursWorked
|
|
: sre.hours_worked
|
|
const { error: empUpdateError } = await supabase
|
|
.from('salary_run_employees')
|
|
.update({
|
|
hours_worked: snapshotHoursWorked,
|
|
gross_salary: result.grossSalary,
|
|
gross_deductions: result.grossDeductions,
|
|
benefit_values: result.benefitValues,
|
|
taxable_income: result.taxableIncome,
|
|
tax_withheld: result.taxWithheld,
|
|
net_deductions: result.netDeductions,
|
|
net_salary: result.netSalary,
|
|
avgifter_rate: result.avgifterRate,
|
|
avgifter_amount: result.avgifterAmount,
|
|
avgifter_basis: result.avgifterBasis,
|
|
avgifter_category: result.avgifterCategory,
|
|
vacation_accrual: result.vacationAccrual,
|
|
vacation_accrual_avgifter: result.vacationAccrualAvgifter,
|
|
tax_table_number: emp.tax_table_number,
|
|
tax_column: emp.tax_column,
|
|
tax_table_year: paymentYear,
|
|
sick_days: sickDays,
|
|
vab_days: vabDays,
|
|
parental_days: parentalDays,
|
|
vacation_days_taken: vacationDays,
|
|
calculation_breakdown: { steps: result.steps },
|
|
ytd_gross:
|
|
Math.round(
|
|
((ytdByEmployee.get(sre.employee_id)?.gross || 0) + result.grossSalary) * 100,
|
|
) / 100,
|
|
ytd_tax:
|
|
Math.round(
|
|
((ytdByEmployee.get(sre.employee_id)?.tax || 0) + result.taxWithheld) * 100,
|
|
) / 100,
|
|
ytd_net:
|
|
Math.round(
|
|
((ytdByEmployee.get(sre.employee_id)?.net || 0) + result.netSalary) * 100,
|
|
) / 100,
|
|
})
|
|
.eq('id', sre.id)
|
|
|
|
if (empUpdateError) {
|
|
return { ok: false, code: 'DATABASE_ERROR', details: empUpdateError }
|
|
}
|
|
|
|
// 8h. Replace any existing 'semesterersattning' line item (the engine
|
|
// derives it on every calculate).
|
|
const { error: delSemErr } = await supabase
|
|
.from('salary_line_items')
|
|
.delete()
|
|
.eq('salary_run_employee_id', sre.id)
|
|
.eq('item_type', 'semesterersattning')
|
|
if (delSemErr) {
|
|
return { ok: false, code: 'DATABASE_ERROR', details: delSemErr }
|
|
}
|
|
if (result.vacationCompensation > 0) {
|
|
const { error: insSemErr } = await supabase.from('salary_line_items').insert({
|
|
salary_run_employee_id: sre.id,
|
|
company_id: companyId,
|
|
item_type: 'semesterersattning',
|
|
description: 'Semesterersättning',
|
|
quantity: 1,
|
|
amount: Math.round(result.vacationCompensation * 100) / 100,
|
|
is_taxable: true,
|
|
is_avgift_basis: true,
|
|
is_vacation_basis: false,
|
|
is_gross_deduction: false,
|
|
is_net_deduction: false,
|
|
account_number: getLineItemAccount('semesterersattning', emp.employment_type),
|
|
sort_order: 50,
|
|
})
|
|
if (insSemErr) {
|
|
return { ok: false, code: 'DATABASE_ERROR', details: insSemErr }
|
|
}
|
|
}
|
|
|
|
totalGross += result.grossSalary
|
|
totalTax += result.taxWithheld
|
|
totalNet += result.netSalary
|
|
totalAvgifter += result.avgifterAmount
|
|
totalVacationAccrual += result.vacationAccrual
|
|
totalEmployerCost += result.totalEmployerCost
|
|
}
|
|
|
|
// 9. Update run totals + freeze the calculation_params snapshot.
|
|
const { data: updatedRun, error: updateError } = await supabase
|
|
.from('salary_runs')
|
|
.update({
|
|
total_gross: Math.round(totalGross * 100) / 100,
|
|
total_tax: Math.round(totalTax * 100) / 100,
|
|
total_net: Math.round(totalNet * 100) / 100,
|
|
total_avgifter: Math.round(totalAvgifter * 100) / 100,
|
|
total_vacation_accrual: Math.round(totalVacationAccrual * 100) / 100,
|
|
total_employer_cost: Math.round(totalEmployerCost * 100) / 100,
|
|
calculation_params: serializePayrollConfig(config),
|
|
})
|
|
.eq('id', id)
|
|
// Defense-in-depth: scope the write to the company explicitly. The
|
|
// first SELECT confirmed `company_id = companyId` for this id, but the
|
|
// CLAUDE.md rule is that every write carries the filter so the
|
|
// intent is explicit at the SQL layer even if upstream code is later
|
|
// refactored.
|
|
.eq('company_id', companyId)
|
|
.select()
|
|
.single()
|
|
|
|
if (updateError) {
|
|
return { ok: false, code: 'DATABASE_ERROR', details: updateError }
|
|
}
|
|
|
|
// 10. Warnings: non-blocking annotations the caller should surface.
|
|
const warnings: string[] = []
|
|
if (taxTableSource === 'fallback') {
|
|
warnings.push(
|
|
`Skatteverkets skattetabell-API är inte nåbart: beräkningen använder lokal reservdata för ${paymentYear}. Kontrollera att Skatteverket inte publicerat ändringar innan lönekörningen bokförs.`,
|
|
)
|
|
} else if (taxTableSource === 'mixed') {
|
|
warnings.push(
|
|
`Skatteverkets skattetabell-API svarade bara delvis: vissa skattetabeller kommer från lokal reservdata för ${paymentYear}. Kontrollera att Skatteverket inte publicerat ändringar innan lönekörningen bokförs.`,
|
|
)
|
|
}
|
|
if (lakarintygEmployees.length > 0) {
|
|
warnings.push(
|
|
`Läkarintyg krävs från och med dag 8: ${lakarintygEmployees.join(', ')}. ` +
|
|
`Kontrollera att läkarintyg finns innan lönekörningen godkänns.`,
|
|
)
|
|
}
|
|
if (fkReportingEmployees.length > 0) {
|
|
warnings.push(
|
|
`Försäkringskassan tar över sjuklön från dag 15: ${fkReportingEmployees.join(', ')}. ` +
|
|
`Säkerställ att anmälan till FK är gjord.`,
|
|
)
|
|
}
|
|
|
|
opLog.info('salary calculation complete', {
|
|
requestId,
|
|
salaryRunId: id,
|
|
warningCount: warnings.length,
|
|
taxTableSource,
|
|
})
|
|
|
|
return { ok: true, run: updatedRun as Record<string, unknown>, warnings }
|
|
}
|