From 425674ff358d643c7921aba41ef88abec1d30793 Mon Sep 17 00:00:00 2001 From: Jakob Wennberg <149234542+jakobwennberg@users.noreply.github.com> Date: Fri, 17 Jul 2026 17:09:31 +0200 Subject: [PATCH] chore(deadlines): legacy-type cleanup + ICS feed user-deadline fix (#1060) * feat(deadlines): gate F-skatt reminders on debited preliminary tax, add durable dismissal The f_skatt deadline was gated on the F-skatt approval flag (DB default true), giving nearly every company 12 monthly payment reminders for a tax Skatteverket may not have debited at all (64% of all system deadline rows, one lifetime completion). Approval carries no recurring obligation; the monthly duty is payment of debiterad preliminarskatt and exists only while the debited amount is > 0 (SFL 62 kap. 4-5 par., 55 kap. 2 par.). - Gate the f_skatt deadline on preliminary_tax_monthly > 0 (field already collected at onboarding, previously unread) and retitle it as a payment. - Storforetag keep the 12th in August (January-only 17th, 62 kap. 3 par.). - Declare the prod-only preliminary_tax_monthly column in a migration so installs built purely from migrations stop failing tax-settings saves. - Add deadlines.dismissed_at: DELETE on a system deadline now soft-dismisses it durably (hard deletes were resurrected by the nightly backfill within 24h); generator, backfill, and every read surface respect it. - Prune upcoming f_skatt rows for companies with no debited amount. Closes part of #1028. Co-Authored-By: Claude Fable 5 * feat(deadlines): gate AGI on employer registration, stop completing AGI deadline at XML generation The arbetsgivardeklaration deadline was gated on pays_salaries, which is wrong in both directions: a registered employer must file AGI every month including nil months (SFL 26 kap. 3 par.), and companies actively running payroll with the flag off got no AGI reminders at all (each missed monthly filing risks a forseningsavgift). - New company_settings.employer_registered (nullable, no default) gates AGI and the storforetag skatteinbetalning row; pays_salaries remains a fallback for rows saved before the flag existed and keeps its UI meaning. - Migration backfills employer_registered=true from pays_salaries=true and from actual payroll activity (salary_runs). - New employer_seasonal flag: sasongsregistrerade file only for payment months plus a December nil declaration, so only the December-period row is generated. - Settings UI: registration + seasonal checkboxes (sv/en strings). - AGI XML generation no longer auto-completes the deadline as submitted: SFL 26 kap. deems the obligation satisfied only when the declaration has come in to Skatteverket. The Skatteverket extension's kvittens reconcile remains the confirming path; manual filers tick the deadline themselves. Part of #1028. Co-Authored-By: Claude Fable 5 * feat(deadlines): statutory arsstamma replaces bokslut, moms_yearly auto-complete, EU-sales suggestion - Replace the non-statutory 'bokslut' deadline (3 months after FY end, no legal basis, off-by-one month math for broken FYs) with the statutory arsstamma deadline: within 6 months of FY end per ABL 7 kap. 10 par., the corporate act that gates the arsredovisning filing chain. Migration deletes pending bokslut rows; the backfill cron generates arsstamma rows. - Complete moms_yearly on Skatteverket submission/kvittens: the yearly branch previously returned null with a stale comment claiming annual VAT has no deadline type, leaving yearly filers with an eternally open row. The fiscal-year tax_period label is derived from company settings. - Add /api/settings/eu-trade-signal + a tax-settings callout: companies with booked EU sales (3108/3308/3107, last 15 months) but EU-trade/PS flags off are prompted to confirm the periodisk sammanstallning obligation (SFL 35 kap., 1 250 kr late fee per report). Suggestion only, never auto-enables. Part of #1028. Co-Authored-By: Claude Fable 5 * chore(deadlines): clean up legacy deadline types, fix ICS feed hiding user deadlines - Migration deletes pending rows of the retired bare 'moms' and 'inkomstdeklaration' types (completed rows kept as history) and the sandbox seed route now inserts the current moms_quarterly / inkomstdeklaration_ef types so legacy rows stop reappearing. - The calendar feed's include_tax_deadlines flag now hides only system-generated deadlines: user-created deadlines always appear. The old nesting skipped the entire deadlines fetch and dropped the user's own rows from the feed when the flag was off. Part of #1028. Co-Authored-By: Claude Fable 5 * fix(deadlines): include dismissed_at in DeadlineForm payload The Deadline type gained the required dismissed_at field; the form's submit payload literal must carry it for the Omit shape. Co-Authored-By: Claude Fable 5 * chore: retrigger Supabase preview check The initial preview-branch creation failed transiently; the subsequent migration run applied all four stack migrations (verified via list_migrations on the preview project), leaving a stale failed check. Co-Authored-By: Claude Fable 5 * fix(deadlines): make system-deadline dismissal atomic Constrain the dismiss update to source='system' and verify a row was actually updated: a concurrent regeneration can delete the row between lookup and update, and the route must not report a phantom success. Co-Authored-By: Claude Fable 5 --------- Co-authored-by: Claude Fable 5 --- app/api/calendar/feed/[token]/route.ts | 23 +++--- app/api/sandbox/seed/route.ts | 12 ++-- lib/calendar/__tests__/ics-generator.test.ts | 70 +++++++++++++++++++ lib/calendar/ics-generator.ts | 19 +++-- ...17153000_cleanup_legacy_deadline_types.sql | 12 ++++ 5 files changed, 113 insertions(+), 23 deletions(-) create mode 100644 lib/calendar/__tests__/ics-generator.test.ts create mode 100644 supabase/migrations/20260717153000_cleanup_legacy_deadline_types.sql diff --git a/app/api/calendar/feed/[token]/route.ts b/app/api/calendar/feed/[token]/route.ts index d703277d..b2198f0b 100644 --- a/app/api/calendar/feed/[token]/route.ts +++ b/app/api/calendar/feed/[token]/route.ts @@ -97,19 +97,18 @@ export async function GET( const startStr = startDate.toISOString().split('T')[0] const endStr = endDate.toISOString().split('T')[0] - // Fetch relevant data based on feed options + // Fetch relevant data based on feed options. Deadlines are always + // fetched: include_tax_deadlines only hides SYSTEM rows (the generator + // filters by source), while user-created deadlines always appear. const [deadlinesResult, invoicesResult] = await Promise.all([ - // Deadlines - feed.include_tax_deadlines - ? supabase - .from('deadlines') - .select('*') - .eq('company_id', feed.company_id) - .is('dismissed_at', null) - .gte('due_date', startStr) - .lte('due_date', endStr) - .order('due_date') - : { data: [] }, + supabase + .from('deadlines') + .select('*') + .eq('company_id', feed.company_id) + .is('dismissed_at', null) + .gte('due_date', startStr) + .lte('due_date', endStr) + .order('due_date'), // Invoices feed.include_invoices diff --git a/app/api/sandbox/seed/route.ts b/app/api/sandbox/seed/route.ts index 333a6755..b0a93e6f 100644 --- a/app/api/sandbox/seed/route.ts +++ b/app/api/sandbox/seed/route.ts @@ -637,11 +637,14 @@ export async function POST(request: Request) { { user_id: userId, company_id: companyId, - title: 'Momsdeklaration Q1 2026', + title: `Momsdeklaration Q1 ${currentYear}`, due_date: toDateStr(momsDeadline), deadline_type: 'tax', priority: 'important', - tax_deadline_type: 'moms', + // Current generator types: the bare 'moms'/'inkomstdeklaration' + // types were retired and seeding them recreates legacy rows the + // cleanup migration removed. + tax_deadline_type: 'moms_quarterly', tax_period: `${currentYear}-Q1`, source: 'system', status: 'upcoming', @@ -650,11 +653,12 @@ export async function POST(request: Request) { { user_id: userId, company_id: companyId, - title: 'Inkomstdeklaration 2025', + title: `Inkomstdeklaration ${currentYear - 1}`, due_date: `${currentYear}-05-02`, deadline_type: 'tax', priority: 'critical', - tax_deadline_type: 'inkomstdeklaration', + // Sandbox companies are enskild firma (see p_entity_type above). + tax_deadline_type: 'inkomstdeklaration_ef', tax_period: `${currentYear - 1}`, source: 'system', status: 'upcoming', diff --git a/lib/calendar/__tests__/ics-generator.test.ts b/lib/calendar/__tests__/ics-generator.test.ts new file mode 100644 index 00000000..94537b57 --- /dev/null +++ b/lib/calendar/__tests__/ics-generator.test.ts @@ -0,0 +1,70 @@ +import { describe, it, expect } from 'vitest' +import { generateCalendarFeed } from '../ics-generator' +import type { Deadline } from '@/types' + +function makeDeadline(overrides: Partial): Deadline { + return { + id: 'd-1', + user_id: 'user-1', + company_id: 'company-1', + title: 'Deadline', + due_date: '2027-03-12', + due_time: null, + deadline_type: 'other', + priority: 'normal', + is_completed: false, + completed_at: null, + customer_id: null, + is_auto_generated: false, + notes: null, + created_at: '2026-01-01T00:00:00Z', + updated_at: '2026-01-01T00:00:00Z', + tax_deadline_type: null, + tax_period: null, + source: 'user', + reminder_offsets: null, + status: 'upcoming', + status_changed_at: '2026-01-01T00:00:00Z', + dismissed_at: null, + linked_report_type: null, + linked_report_period: null, + ...overrides, + } as Deadline +} + +const SYSTEM_DEADLINE = makeDeadline({ + id: 'sys-1', + title: 'Momsdeklaration Q1 2027', + deadline_type: 'tax', + tax_deadline_type: 'moms_quarterly', + tax_period: '2027-Q1', + source: 'system', +}) + +const USER_DEADLINE = makeDeadline({ + id: 'usr-1', + title: 'Skicka avtal till kunden', + source: 'user', +}) + +describe('generateCalendarFeed deadline filtering', () => { + it('includes system and user deadlines when tax deadlines are on', async () => { + const ics = await generateCalendarFeed( + { deadlines: [SYSTEM_DEADLINE, USER_DEADLINE], invoices: [] }, + { includeTaxDeadlines: true, includeInvoices: false }, + ) + expect(ics).toContain('Momsdeklaration Q1 2027') + expect(ics).toContain('Skicka avtal till kunden') + }) + + it('keeps user-created deadlines when tax deadlines are off', async () => { + // The flag governs system-generated rows only; hiding the user's own + // manual deadlines with it was a bug. + const ics = await generateCalendarFeed( + { deadlines: [SYSTEM_DEADLINE, USER_DEADLINE], invoices: [] }, + { includeTaxDeadlines: false, includeInvoices: false }, + ) + expect(ics).not.toContain('Momsdeklaration Q1 2027') + expect(ics).toContain('Skicka avtal till kunden') + }) +}) diff --git a/lib/calendar/ics-generator.ts b/lib/calendar/ics-generator.ts index 2448a82c..d651d520 100644 --- a/lib/calendar/ics-generator.ts +++ b/lib/calendar/ics-generator.ts @@ -144,14 +144,19 @@ export function generateCalendarFeed( ): Promise { const events: EventAttributes[] = [] - if (options.includeTaxDeadlines) { - const taxDeadlines = data.deadlines.filter((d) => d.deadline_type === 'tax') - events.push(...generateDeadlineEvents(taxDeadlines)) + // The include_tax_deadlines flag governs SYSTEM-generated deadlines only: + // the user's own manual deadlines always appear in the feed. The previous + // nesting hid every deadline, including user-created ones, when the flag + // was off. + const visibleDeadlines = options.includeTaxDeadlines + ? data.deadlines + : data.deadlines.filter((d) => d.source !== 'system') - // Include non-tax deadlines too - const otherDeadlines = data.deadlines.filter((d) => d.deadline_type !== 'tax') - events.push(...generateDeadlineEvents(otherDeadlines)) - } + const taxDeadlines = visibleDeadlines.filter((d) => d.deadline_type === 'tax') + events.push(...generateDeadlineEvents(taxDeadlines)) + + const otherDeadlines = visibleDeadlines.filter((d) => d.deadline_type !== 'tax') + events.push(...generateDeadlineEvents(otherDeadlines)) if (options.includeInvoices) { events.push(...generateInvoiceEvents(data.invoices)) diff --git a/supabase/migrations/20260717153000_cleanup_legacy_deadline_types.sql b/supabase/migrations/20260717153000_cleanup_legacy_deadline_types.sql new file mode 100644 index 00000000..d7ab7521 --- /dev/null +++ b/supabase/migrations/20260717153000_cleanup_legacy_deadline_types.sql @@ -0,0 +1,12 @@ +-- Clean up rows of retired tax deadline types (issue #1028). +-- +-- The bare 'moms' and 'inkomstdeklaration' types were replaced by +-- moms_monthly/quarterly/yearly and inkomstdeklaration_ef/_ab long ago, but +-- their rows lingered (one per company from early seeding), polluting +-- history views and per-type analytics. Completed rows are kept as filing +-- history. The sandbox seed route stops inserting these types in the same +-- change, so they do not come back. +DELETE FROM public.deadlines +WHERE source = 'system' + AND tax_deadline_type IN ('moms', 'inkomstdeklaration') + AND is_completed = false;