fix: generate tax deadlines for the installed base + correct 2893 label carryover (#1029)
* fix(bookkeeping): refresh correction line description on account change When editing an ändringsverifikation, CorrectionEntryDialog pre-filled each line's description from the original entry but never re-derived it when the user changed the account, so a description carried over from the old account (e.g. 2393 "Lån från närstående personer, långfristig del") stayed stale on the newly chosen account (e.g. 2893, the kortfristig account). The regular JournalEntryForm already auto-fills on account change; this mirrors it. The refresh is guarded: it only overwrites the description when it is empty or still equals the previously selected account's name, so a memo the user typed themselves is preserved. Logic is extracted into a pure, unit-tested helper. Note: the wrong text on an already-posted correction cannot be repaired (line descriptions of posted verifikat are immutable per BFL / migration 017); this prevents recurrence on future corrections. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(deadlines): generate tax deadlines for the installed base Automatic tax deadlines only regenerated when a tax-relevant settings field changed value (didTaxFieldsChange). Companies fill those fields once at onboarding, so a later save changed nothing and generated nothing; the annual cron was the only unconditional trigger. As a result only ~5 of ~776 real companies had any system deadlines, and the /deadlines empty state told users to "check the tax settings" that were already complete. - Settings save now also regenerates when the company has zero system deadlines yet (safe first-time backfill; cannot reset is_completed/status). Decision extracted into shouldRegenerateTaxDeadlines() with tests. - The empty-state banner gets a "Generera nu" action wired to the existing /api/tax-deadlines/generate route (previously it had no caller). New sv/en strings. - generateNewYearDeadlines (annual cron) paginates company_settings via fetchAllRows: a plain .select() silently caps at 1000 rows, leaving companies beyond the cap without next-year deadlines. - scripts/backfill-tax-deadlines.ts: one-off that reruns the real generator for non-sandbox companies with zero system deadlines. Known gap (follow-up): moms_period='yearly' has no deadline config, so annual VAT filers get no momsdeklaration deadline yet. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(deadlines): address review feedback + fix settings-route test - settings/route.ts: fail safe when the system-deadline count query errors. A null count on error was treated as 0, which would trigger a delete+regenerate and reset is_completed/status on a transient failure; now a count error keeps the self-heal off (CodeRabbit, Major). - Update app/api/settings/__tests__/route.test.ts (added on main via the withRouteContext refactor) for the extra deadline-count query and the new shouldRegenerateTaxDeadlines export; add self-heal / no-regen cases. - Soften the "no deadlines created" copy: zero generated rows can also mean no applicable obligations (or the moms_yearly gap), not just incomplete settings (CodeRabbit, Minor). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Jakob Wennberg
co-authored by
Claude Opus 4.8
Claude Opus 4.8
parent
8534ff1006
commit
5ac560ce41
@@ -22,9 +22,13 @@ vi.mock('@/lib/auth/require-write', () => ({
|
||||
vi.mock('@/lib/tax/deadline-generator', () => ({
|
||||
didTaxFieldsChange: vi.fn().mockReturnValue(false),
|
||||
regenerateTaxDeadlinesForUser: vi.fn().mockResolvedValue(undefined),
|
||||
shouldRegenerateTaxDeadlines: vi.fn(
|
||||
(changed: boolean, count: number) => changed || count === 0,
|
||||
),
|
||||
}))
|
||||
|
||||
import { PUT } from '../route'
|
||||
import { regenerateTaxDeadlinesForUser } from '@/lib/tax/deadline-generator'
|
||||
|
||||
describe('PUT /api/settings', () => {
|
||||
beforeEach(() => {
|
||||
@@ -71,6 +75,7 @@ describe('PUT /api/settings', () => {
|
||||
enqueueMany([
|
||||
{ data: { entity_type: 'enskild_firma', onboarding_complete: false } }, // fetch oldSettings
|
||||
{ data: { id: 's1', company_name: 'New Name' } }, // update ... returning
|
||||
{ data: null, count: 5 }, // deadlines count (has some -> no regen)
|
||||
])
|
||||
|
||||
const request = createMockRequest('/api/settings', {
|
||||
@@ -103,6 +108,7 @@ describe('PUT /api/settings', () => {
|
||||
reminder_days_level_3: 35,
|
||||
},
|
||||
},
|
||||
{ data: null, count: 5 }, // deadlines count (has some -> no regen)
|
||||
])
|
||||
|
||||
const request = createMockRequest('/api/settings', {
|
||||
@@ -126,6 +132,52 @@ describe('PUT /api/settings', () => {
|
||||
})
|
||||
})
|
||||
|
||||
it('regenerates tax deadlines when the company has none yet (self-heal)', async () => {
|
||||
enqueueMany([
|
||||
{ data: { entity_type: 'aktiebolag', onboarding_complete: true } }, // oldSettings
|
||||
{
|
||||
data: {
|
||||
id: 's1',
|
||||
entity_type: 'aktiebolag',
|
||||
moms_period: 'quarterly',
|
||||
f_skatt: true,
|
||||
vat_registered: true,
|
||||
pays_salaries: true,
|
||||
fiscal_year_start_month: 1,
|
||||
},
|
||||
}, // update
|
||||
{ data: null, count: 0 }, // no system deadlines -> self-heal generation
|
||||
])
|
||||
|
||||
const request = createMockRequest('/api/settings', {
|
||||
method: 'PUT',
|
||||
body: { f_skatt: true },
|
||||
})
|
||||
const response = await PUT(request, { params: Promise.resolve({}) })
|
||||
const { status } = await parseJsonResponse(response)
|
||||
|
||||
expect(status).toBe(200)
|
||||
expect(vi.mocked(regenerateTaxDeadlinesForUser)).toHaveBeenCalledOnce()
|
||||
})
|
||||
|
||||
it('does not regenerate tax deadlines when the company already has some', async () => {
|
||||
enqueueMany([
|
||||
{ data: { entity_type: 'aktiebolag', onboarding_complete: true } }, // oldSettings
|
||||
{ data: { id: 's1', entity_type: 'aktiebolag' } }, // update
|
||||
{ data: null, count: 12 }, // already has deadlines
|
||||
])
|
||||
|
||||
const request = createMockRequest('/api/settings', {
|
||||
method: 'PUT',
|
||||
body: { company_name: 'Unchanged Tax' },
|
||||
})
|
||||
const response = await PUT(request, { params: Promise.resolve({}) })
|
||||
const { status } = await parseJsonResponse(response)
|
||||
|
||||
expect(status).toBe(200)
|
||||
expect(vi.mocked(regenerateTaxDeadlinesForUser)).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('returns 400 when reminder thresholds are not increasing', async () => {
|
||||
enqueue({
|
||||
data: {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { NextResponse } from 'next/server'
|
||||
import { withRouteContext } from '@/lib/api/with-route-context'
|
||||
import { didTaxFieldsChange, regenerateTaxDeadlinesForUser } from '@/lib/tax/deadline-generator'
|
||||
import { didTaxFieldsChange, regenerateTaxDeadlinesForUser, shouldRegenerateTaxDeadlines } from '@/lib/tax/deadline-generator'
|
||||
import { validateBody } from '@/lib/api/validate'
|
||||
import { UpdateSettingsSchema } from '@/lib/api/schemas'
|
||||
|
||||
@@ -139,8 +139,27 @@ export const PUT = withRouteContext(
|
||||
return NextResponse.json({ error: error.message }, { status: 500 })
|
||||
}
|
||||
|
||||
// Check if tax-relevant fields changed and regenerate deadlines
|
||||
if (oldSettings && didTaxFieldsChange(oldSettings, data)) {
|
||||
// Regenerate tax deadlines when a tax-relevant field changed OR when the
|
||||
// company has no system-generated deadlines yet. The latter is the common
|
||||
// case: tax settings are filled at onboarding, so a later save with no
|
||||
// tax-field change never triggered generation and the deadlines page stayed
|
||||
// empty even though the settings were "filled in". Backfilling when the set
|
||||
// is empty is safe: there is no existing progress/status to clobber.
|
||||
const taxFieldsChanged = Boolean(oldSettings && didTaxFieldsChange(oldSettings, data))
|
||||
let existingSystemDeadlineCount = 0
|
||||
if (!taxFieldsChanged) {
|
||||
const { count, error: countError } = await supabase
|
||||
.from('deadlines')
|
||||
.select('id', { count: 'exact', head: true })
|
||||
.eq('company_id', companyId)
|
||||
.eq('source', 'system')
|
||||
// Fail safe: on a count error, assume deadlines already exist so we do
|
||||
// NOT delete+regenerate on a transient failure (regeneration would reset
|
||||
// is_completed/status). A non-zero placeholder keeps the self-heal off.
|
||||
existingSystemDeadlineCount = countError ? 1 : (count ?? 0)
|
||||
}
|
||||
|
||||
if (shouldRegenerateTaxDeadlines(taxFieldsChanged, existingSystemDeadlineCount)) {
|
||||
try {
|
||||
await regenerateTaxDeadlinesForUser(supabase, companyId, {
|
||||
entity_type: data.entity_type,
|
||||
|
||||
Reference in New Issue
Block a user