* feat(bookkeeping): make blocked fiscal-year creation actionable When creating a new räkenskapsår is blocked because a prior period is still open, the "Skapa räkenskapsår" dialog no longer dead-ends on an English toast. The API now returns the canonical bilingual error envelope with the blocking periods (id/name/dates) under details, and the dialog renders a Swedish panel that locks them inline (reversible locked_at) via the existing /lock endpoint and retries creation. The guard rule is unchanged and remains BFL-compliant: BFL 6 kap allows löpande bokföring of the new year in parallel with the prior year's bokslut, so a lock (not a full close) is sufficient and reversible. - Add PERIOD_CREATE_BLOCKED_BY_OPEN_PERIODS structured error code - Return envelope + details.blockingPeriods from the 409 (was English string) - CreatePeriodDialog: inline "lås och skapa" panel + lock-and-retry - Update route tests for the new envelope shape Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(ui): prevent mouse wheel from mutating number inputs A focused <input type="number"> would change its value on scroll, silently turning e.g. a 20000 salary into 19998. Blur number inputs on wheel so the page scrolls instead of editing the value. Applied at the Input primitive so all number fields are protected. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(salary): auto-derive skattetabell and kolumn for employees Replace the opaque manual "Skattetabell (29-42)" and "Kolumn (1-6)" inputs on the employee form with a self-deriving flow: the user picks their folkbokföringskommun from a searchable dropdown and the tax table fills itself in, while the column derives from the personnummer we already collect. - Add a searchable municipality picker (MunicipalityCombobox) backed by a new cached GET /api/salary/tax-tables/kommuner endpoint. - Wrap the whole "Skatt" card in a self-contained EmployeeTaxCard used by both the create and edit pages, with InfoTooltips and named column options. - deriveTaxColumn(): auto-select column 1 for under-66 employees; leave the ambiguous 66+ case (pension vs working senior) to a clearly-named manual choice. - Fix fetchKommunTaxRates() to page through all ~1300 församling rows instead of a single 500-row page (which silently dropped ~200 kommuner, incl. Göteborg) and normalize the uppercase names to title case. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(import): correct CSV amount-column guess and surface skipped rows Manual CSV column-mapping auto-guess walked each data row right-to-left and picked the first numeric cell as the amount, so on the common ...;Belopp;Saldo layout it grabbed the trailing running-balance column. Extract the guess into a pure, tested suggestColumnMapping(): match header labels first (belopp/amount -> amount, saldo/balance -> balance), auto-fill the balance field, and fall back to value heuristics that skip the balance column and prefer a column carrying negative values. Also surface stats.skipped_rows + parse warnings in BankFileConfirmStep - the manual-mapping path skips the preview step that was the only place they showed, so skipped rows were silently dropped from view. Add a unit test reproducing the Saldo-as-amount regression. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat: add "Save as draft" functionality for invoices - Implemented a new feature to allow users to save invoices as unnumbered drafts without generating an invoice number until finalized. - Added a `save_as_draft` flag to the CreateInvoiceInput schema to handle draft saving logic. - Updated the invoice creation API to skip number allocation when saving as a draft. - Introduced a new endpoint for finalizing drafts, which allocates an invoice number and emits an `invoice.created` event. - Enhanced the UI to include a "Save as draft" button, with loading states and tooltips. - Updated tests to cover the new draft saving and finalization logic, including race conditions for concurrent modifications. - Added relevant error handling for draft finalization and deletion scenarios. * feat(employee): add employment start and end date fields to employee forms * feat: enhance invoice and salary run handling with improved validation and event logging --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
92 lines
3.5 KiB
TypeScript
92 lines
3.5 KiB
TypeScript
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
|
import { NextResponse } from 'next/server'
|
|
import { parseJsonResponse } from '@/tests/helpers'
|
|
|
|
const mockSupabase = {
|
|
auth: { getUser: vi.fn() },
|
|
}
|
|
vi.mock('@/lib/supabase/server', () => ({
|
|
createClient: () => Promise.resolve(mockSupabase),
|
|
}))
|
|
|
|
vi.mock('@/lib/company/context', () => ({
|
|
getActiveCompanyId: vi.fn().mockResolvedValue('company-1'),
|
|
}))
|
|
|
|
vi.mock('@/lib/auth/require-auth', () => ({
|
|
requireAuth: vi.fn(),
|
|
}))
|
|
|
|
vi.mock('@/lib/salary/tax-tables', () => ({
|
|
fetchKommunTaxRates: vi.fn(),
|
|
}))
|
|
|
|
import { GET } from '../route'
|
|
import { requireAuth } from '@/lib/auth/require-auth'
|
|
import { fetchKommunTaxRates } from '@/lib/salary/tax-tables'
|
|
|
|
const mockUser = { id: 'user-1', email: 'test@test.se' }
|
|
|
|
describe('GET /api/salary/tax-tables/kommuner', () => {
|
|
beforeEach(() => {
|
|
vi.clearAllMocks()
|
|
vi.mocked(requireAuth).mockResolvedValue({
|
|
user: mockUser as never,
|
|
supabase: mockSupabase as never,
|
|
error: null,
|
|
})
|
|
vi.mocked(fetchKommunTaxRates).mockResolvedValue([
|
|
{ kommun: 'Östersund', totalRate: 33.0, tableNumber: 33 },
|
|
{ kommun: 'Aronsjö', totalRate: 32.49, tableNumber: 32 },
|
|
{ kommun: 'Stockholm', totalRate: 29.82, tableNumber: 30 },
|
|
])
|
|
})
|
|
|
|
it('returns 401 when not authenticated', async () => {
|
|
vi.mocked(requireAuth).mockResolvedValue({
|
|
user: null as never,
|
|
supabase: mockSupabase as never,
|
|
error: NextResponse.json({ error: 'Unauthorized' }, { status: 401 }),
|
|
})
|
|
|
|
const request = new Request('http://localhost/api/salary/tax-tables/kommuner?year=2030')
|
|
const response = await GET(request, { params: Promise.resolve({}) })
|
|
const { status } = await parseJsonResponse(response)
|
|
expect(status).toBe(401)
|
|
})
|
|
|
|
it('returns the kommun list sorted by Swedish collation', async () => {
|
|
const request = new Request('http://localhost/api/salary/tax-tables/kommuner?year=2031')
|
|
const response = await GET(request, { params: Promise.resolve({}) })
|
|
const { status, body } = await parseJsonResponse<{
|
|
data: { year: number; kommuner: { kommun: string; tableNumber: number }[] }
|
|
}>(response)
|
|
|
|
expect(status).toBe(200)
|
|
expect(body.data.year).toBe(2031)
|
|
expect(body.data.kommuner.map((k) => k.kommun)).toEqual(['Aronsjö', 'Stockholm', 'Östersund'])
|
|
expect(body.data.kommuner[1]).toMatchObject({ kommun: 'Stockholm', tableNumber: 30 })
|
|
})
|
|
|
|
it('falls back to the current year for a non-numeric year (no NaN reaches Skatteverket/cache)', async () => {
|
|
const currentYear = new Date().getFullYear()
|
|
const request = new Request('http://localhost/api/salary/tax-tables/kommuner?year=not-a-year')
|
|
const response = await GET(request, { params: Promise.resolve({}) })
|
|
const { status, body } = await parseJsonResponse<{ data: { year: number } }>(response)
|
|
|
|
expect(status).toBe(200)
|
|
expect(body.data.year).toBe(currentYear)
|
|
expect(fetchKommunTaxRates).toHaveBeenCalledWith(currentYear)
|
|
})
|
|
|
|
it('caches per year — a second request for the same year does not refetch', async () => {
|
|
const req1 = new Request('http://localhost/api/salary/tax-tables/kommuner?year=2032')
|
|
await GET(req1, { params: Promise.resolve({}) })
|
|
const req2 = new Request('http://localhost/api/salary/tax-tables/kommuner?year=2032')
|
|
await GET(req2, { params: Promise.resolve({}) })
|
|
|
|
expect(fetchKommunTaxRates).toHaveBeenCalledTimes(1)
|
|
expect(fetchKommunTaxRates).toHaveBeenCalledWith(2032)
|
|
})
|
|
})
|