782415122d
The calendar mixed two kinds of truth in one table. `planned_leave_day` was simultaneously the allocator's output cache, the user's override store (`is_pinned`, plus ad-hoc rows with no `wish_id`), and the resource ledger that analytics and the age-4 maths read. The planner therefore had to ask "am I allowed to touch this row?" on every sync, and got it wrong at the edges. Every user assertion is now one `day_assertion` row — a concrete `day_type` replaces a pinned day, a row with no `wish_id` replaces an ad-hoc day, and `day_type='none'` replaces `planned_day_exclusion`. `planned_leave_day` becomes purely derived with a single writer, and `PlanningService.pinned_keys()` is the single answer to "is this day pinned", used by the allocator's loader, by `sync_plan` and by the read router alike. On top of that, every calendar band is now a real event: an ad-hoc band opens the same full editor as a wish-backed one and saving it promotes it to a `LeaveWish`, so it can be named, repeated yearly, assigned to either or both parents, and handed to the planner. "Planering" is a `moveable` toggle plus a from/to month bound plus a separate lock/unlock action on the days themselves, replacing a three-rung ladder whose "planner decides" rung set a search window equal to the drawn dates and so could never move anything. Bugs found and fixed along the way: - The plan erased its own history. Fixed windows clip to today, so an elapsed auto-placed day fell into `stale_keys` and was deleted on the next sync — and a background sync runs on every workspace load. Past rows are now frozen and counted as spent. - Migration 010's downgrade silently destroyed every pinned day and exclusion (`is_pinned` returned as DEFAULT 0, the exclusion table came back empty, exit 0, no warning). It now reconstructs both from `day_assertion`, and 009 itemises what it cannot recover before dropping the table. - Deleting a period left its assertions behind, locking those dates forever with no UI path to clear them. Wish deletion now clears them by `wish_id`. - `DayAssertionService` and `LeaveWishService` committed multi-statement writes without a transaction; a crash mid-write diverged the tables or half-deleted a series. Both now run in a unit of work. - A sibling year's shortfall was never surfaced: the toast only inspected the edited occurrence's outcome, so a fully unfunded later year rendered as an empty band with no warning. - A flexible window whose bound had entirely elapsed was dropped from the proposal with no outcome at all. It now reports as `unplaced`. - Unlocking a period deleted its days instead of returning them to the planner. - The e2e global setup posted to a route deleted in this change, which would have failed the whole suite before its first test. Gates: backend 938 tests / 91% coverage, frontend 1351 / 97.4 | 92.2 | 94.37 | 97.4. Migrations 009 and 010 audited against a hand-built realistic database: the upgrade reconciles exactly and a constraint violation fails safe, leaving the schema at 008. Not complete. Step 4's toggle, month picker and lock/unlock action are verified by browser walk and unit tests, but the partial-lock readout was not exercised. `ideas.md` §7 adds a full plan for the vacation-forfeiture defect (the planner detects expiring days and then does nothing about them) — not implemented here. Remaining smaller items are listed in the session's restructure notes. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01T4wjgbVL4HAC5Rdaw75VbV
231 lines
6.2 KiB
TypeScript
231 lines
6.2 KiB
TypeScript
/**
|
|
* Shared test fixtures — domain entities.
|
|
*
|
|
* Prefer the `make*` factories over the `MOCK_*` constants in new tests: a
|
|
* factory returns a complete, correctly-typed object, so overriding one field
|
|
* can't silently leave the rest `undefined`/wrong the way a hand-rolled
|
|
* partial object cast with `as any` can. See `frontend/tests/fixtures/index.ts`
|
|
* for the full barrel of factories (plan, analytics, calendar, scraper, hooks).
|
|
*/
|
|
|
|
import type {
|
|
Child,
|
|
DayAssertion,
|
|
DayOverride,
|
|
LeaveWish,
|
|
ParentalLeaveFetch,
|
|
PersonalData,
|
|
PlannedLeaveDay,
|
|
TierData,
|
|
Tip,
|
|
VacationDays,
|
|
Workspace,
|
|
} from '@/types'
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Workspace
|
|
// ---------------------------------------------------------------------------
|
|
|
|
export function makeWorkspace(overrides: Partial<Workspace> = {}): Workspace {
|
|
return {
|
|
id: 'ws-1',
|
|
name: 'Familjen Testsson',
|
|
createdAt: '2026-01-01T00:00:00',
|
|
takePlOnRedDays: false,
|
|
...overrides,
|
|
}
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Personal data (parents)
|
|
// ---------------------------------------------------------------------------
|
|
|
|
export function makePersonalData(overrides: Partial<PersonalData> = {}): PersonalData {
|
|
return {
|
|
uuid: 'pd-a',
|
|
workspaceId: 'ws-1',
|
|
name: 'Förälder A',
|
|
salaryType: 'monthly',
|
|
employmentStatus: 'employed',
|
|
createdAt: '2026-01-01T00:00:00',
|
|
...overrides,
|
|
}
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Child
|
|
// ---------------------------------------------------------------------------
|
|
|
|
export function makeChild(overrides: Partial<Child> = {}): Child {
|
|
return {
|
|
id: 'child-1',
|
|
workspaceId: 'ws-1',
|
|
name: 'Barnet',
|
|
birthDate: '2025-06-01',
|
|
preschoolStartDate: null,
|
|
preschoolPlanningDaysPerYear: 6,
|
|
createdAt: '2026-01-01T00:00:00',
|
|
...overrides,
|
|
}
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Vacation days
|
|
// ---------------------------------------------------------------------------
|
|
|
|
export function makeVacationDays(overrides: Partial<VacationDays> = {}): VacationDays {
|
|
return {
|
|
id: 'vd-1',
|
|
personalDataUuid: 'pd-a',
|
|
workspaceId: 'ws-1',
|
|
year: 2026,
|
|
totalDays: 25,
|
|
savedDaysIn: 0,
|
|
createdAt: '2026-01-01T00:00:00',
|
|
updatedAt: '2026-01-01T00:00:00',
|
|
...overrides,
|
|
}
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Parental leave fetch (+ tier data)
|
|
// ---------------------------------------------------------------------------
|
|
|
|
export function makeTierData(overrides: Partial<TierData> = {}): TierData {
|
|
return {
|
|
sjukpenningTotal: 390,
|
|
sjukpenningUsed: 80,
|
|
sjukpenningLeft: 310,
|
|
lagstaNivaTotal: 90,
|
|
lagstaNivaUsed: 0,
|
|
lagstaNivaLeft: 90,
|
|
...overrides,
|
|
}
|
|
}
|
|
|
|
export function makeParentalLeaveFetch(overrides: Partial<ParentalLeaveFetch> = {}): ParentalLeaveFetch {
|
|
return {
|
|
id: 'plf-1',
|
|
personalDataUuid: 'pd-a',
|
|
workspaceId: 'ws-1',
|
|
childId: 'child-1',
|
|
source: 'manual',
|
|
fetchedAt: '2026-05-01T10:00:00',
|
|
totalDays: 240,
|
|
daysUsed: 80,
|
|
daysLeft: 160,
|
|
reservedDaysTotal: 90,
|
|
reservedDaysLeft: 70,
|
|
transferableDaysLeft: 50,
|
|
transferableDaysReported: true,
|
|
dubbeldagarLeft: 55,
|
|
tierData: makeTierData(),
|
|
createdAt: '2026-05-01T10:00:00',
|
|
updatedAt: '2026-05-01T10:00:00',
|
|
...overrides,
|
|
}
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Leave wishes
|
|
// ---------------------------------------------------------------------------
|
|
|
|
export function makeLeaveWish(overrides: Partial<LeaveWish> = {}): LeaveWish {
|
|
return {
|
|
id: 'lw-1',
|
|
workspaceId: 'ws-1',
|
|
childId: null,
|
|
name: 'Sommar',
|
|
nameMessageKey: null,
|
|
windowStartMonth: 6,
|
|
windowStartDay: 15,
|
|
windowEndMonth: 7,
|
|
windowEndDay: 26,
|
|
targetWeeks: 6,
|
|
targetDays: null,
|
|
firstYear: 2026,
|
|
// A standalone (non-repeating) occurrence by default — override
|
|
// `seriesId` (and `lastYear`) to build one year of a repeating wish.
|
|
seriesId: null,
|
|
lastYear: null,
|
|
priority: 1,
|
|
parentMode: 'either',
|
|
parentPersonalDataUuid: null,
|
|
windowMode: 'fixed',
|
|
wantsDubbeldag: false,
|
|
createdAt: '2026-01-01T00:00:00',
|
|
updatedAt: '2026-01-01T00:00:00',
|
|
...overrides,
|
|
}
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Planned leave days
|
|
// ---------------------------------------------------------------------------
|
|
|
|
export function makePlannedLeaveDay(overrides: Partial<PlannedLeaveDay> = {}): PlannedLeaveDay {
|
|
return {
|
|
id: 'pld-1',
|
|
workspaceId: 'ws-1',
|
|
childId: 'child-1',
|
|
parentPersonalDataUuid: 'pd-a',
|
|
date: '2026-06-15',
|
|
dayType: 'vacation',
|
|
isDubbeldag: false,
|
|
wishId: null,
|
|
isPinned: false,
|
|
createdAt: '2026-01-01T00:00:00',
|
|
updatedAt: '2026-01-01T00:00:00',
|
|
...overrides,
|
|
}
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Day overrides (calendar exceptions)
|
|
// ---------------------------------------------------------------------------
|
|
|
|
export function makeDayOverride(overrides: Partial<DayOverride> = {}): DayOverride {
|
|
return {
|
|
id: 'do-1',
|
|
workspaceId: 'ws-1',
|
|
date: '2026-12-24',
|
|
isWorkingDay: false,
|
|
note: null,
|
|
createdAt: '2026-01-01T00:00:00',
|
|
updatedAt: '2026-01-01T00:00:00',
|
|
...overrides,
|
|
}
|
|
}
|
|
|
|
export function makeDayAssertion(overrides: Partial<DayAssertion> = {}): DayAssertion {
|
|
return {
|
|
id: 'da-1',
|
|
workspaceId: 'ws-1',
|
|
childId: 'child-1',
|
|
parentPersonalDataUuid: 'parent-1',
|
|
date: '2027-02-03',
|
|
dayType: 'none',
|
|
isDubbeldag: false,
|
|
wishId: null,
|
|
createdAt: '2027-01-01T00:00:00',
|
|
updatedAt: '2027-01-01T00:00:00',
|
|
...overrides,
|
|
}
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Tips
|
|
// ---------------------------------------------------------------------------
|
|
|
|
export function makeTip(overrides: Partial<Tip> = {}): Tip {
|
|
return {
|
|
id: 'tip-1',
|
|
severity: 'info',
|
|
messageKey: 'tips.example',
|
|
data: {},
|
|
anchorDate: null,
|
|
anchorRange: null,
|
|
...overrides,
|
|
}
|
|
}
|