Files
F-r-ldraledigplannerare/backend/migrations/versions/010_drop_pinned_and_exclusion.py
T
jacobh2 782415122d Separate user intent from planner output via day assertions
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
2026-09-21 07:20:14 +02:00

135 lines
5.8 KiB
Python

"""Drop planned_leave_day.is_pinned and planned_day_exclusion — restructure step 3b.
Step 3a (migration 009) added `day_assertion` as an additive, reversible
replacement for both: a pinned `planned_leave_day` row, an ad-hoc row
(`wish_id IS NULL`), and a `planned_day_exclusion` row. Step 3b moved every
reader and writer onto `day_assertion` (see `AllocationInputLoader`,
`PlanningService.pinned_keys`/`sync_plan`, `DayAssertionService`) and deleted
the `/api/planned-days` write endpoints and the `/api/planned-day-exclusions`
router entirely — nothing reads either dropped column/table any more.
`planned_leave_day` is now purely derived output: no `is_pinned` column,
its ONE writer is `sync_plan`/`DayAssertionService`'s mirroring. SQLite
(3.35+, in use here) supports `ALTER TABLE ... DROP COLUMN` directly for a
column with no index/CHECK constraint referencing it, which `is_pinned`
never had.
Must stay in step with `app/db/connection.py`'s `_FULL_SCHEMA` —
`tests/integration/test_schema_parity.py` asserts exactly that.
Revision ID: 010
Revises: 009
Create Date: 2026-09-20
"""
from __future__ import annotations
from alembic import op
revision: str = "010"
down_revision: str | None = "009"
branch_labels: str | None = None
depends_on: str | None = None
_EXCLUSION_TABLE_DDL = """
CREATE TABLE IF NOT EXISTS planned_day_exclusion (
id TEXT PRIMARY KEY,
workspace_id TEXT NOT NULL,
child_id TEXT NOT NULL,
parent_personal_data_uuid TEXT NOT NULL,
date DATE NOT NULL,
created_at TIMESTAMP NOT NULL,
updated_at TIMESTAMP NOT NULL,
UNIQUE(workspace_id, child_id, parent_personal_data_uuid, date),
FOREIGN KEY (workspace_id) REFERENCES workspace(id) ON DELETE CASCADE,
FOREIGN KEY (child_id) REFERENCES child(id) ON DELETE CASCADE,
FOREIGN KEY (parent_personal_data_uuid) REFERENCES personal_data(uuid) ON DELETE CASCADE
)
"""
_EXCLUSION_INDEX_DDL = """
CREATE INDEX IF NOT EXISTS idx_planned_day_exclusion_workspace
ON planned_day_exclusion (workspace_id)
"""
def upgrade() -> None:
op.execute("DROP INDEX IF EXISTS idx_planned_day_exclusion_workspace")
op.execute("DROP TABLE IF EXISTS planned_day_exclusion")
op.execute("ALTER TABLE planned_leave_day DROP COLUMN is_pinned")
def downgrade() -> None:
"""Recreate `is_pinned`/`planned_day_exclusion`, reconstructed from
`day_assertion` — which still holds every fact at this point, since this
migration is the only one that ever drops the legacy shapes, and it does
so on `upgrade()`, not here. (009's `downgrade()`, which runs *after*
this one on a `downgrade` past 010, is what finally drops `day_assertion`
itself — see that migration's docstring for the point past which nothing
is recoverable.)
Reconstruction, not just DDL:
- a `day_assertion` row with a concrete `day_type`
(`sjukpenning`/`lagsta`/`vacation`) sets `is_pinned = 1` on the
`planned_leave_day` row at the same natural key (workspace_id,
child_id, parent_personal_data_uuid, date).
- a `day_assertion` row with `day_type = 'none'` becomes a
`planned_day_exclusion` row at that key, reusing the assertion's own
id/timestamps (they're 1:1, and an id only needs to be unique within
its own table).
Two ways this is honestly NOT a lossless round trip:
- A concrete assertion with no matching `planned_leave_day` row (an
ad-hoc/pinned day whose mirrored row was since deleted, e.g.
re-derived away by a later plan sync) has nothing to set `is_pinned`
on. The `UPDATE` below simply matches zero rows for it — the fact
is not an error, just unrepresentable in the pre-009 schema. (009's
`downgrade()` warns about exactly this before it drops the table
that's the last place the fact exists.)
- `day_assertion` never recorded *why* a row was a concrete assertion —
pinned, ad-hoc (`wish_id IS NULL`), or both; 009's own upgrade
backfill already conflates them (`WHERE is_pinned = 1 OR wish_id IS
NULL`). So a row that was ad-hoc but never pinned comes back with
`is_pinned = 1` instead of its original `0` — over-restored, not
under-restored, and only for rows already exempt from the allocator
via `wish_id IS NULL`.
- A row that was pinned AND later collided with an exclusion at the
same key before 009's upgrade ran: 009's `INSERT OR REPLACE` already
kept only the `'none'` assertion (exclusion wins — see 009's
docstring). That pinned fact was discarded at upgrade time, long
before this downgrade runs; there is no assertion left to recover it
from. The exclusion itself, however, round-trips correctly.
"""
op.execute("ALTER TABLE planned_leave_day ADD COLUMN is_pinned INTEGER NOT NULL DEFAULT 0")
op.execute(_EXCLUSION_TABLE_DDL)
op.execute(_EXCLUSION_INDEX_DDL)
from sqlalchemy import text
conn = op.get_bind()
# Concrete assertions -> re-pin the matching planned_leave_day row, if
# one still exists at that natural key (see docstring: if not, there is
# nothing to pin, and that's fine).
conn.execute(
text(
"UPDATE planned_leave_day SET is_pinned = 1 "
"WHERE (workspace_id, child_id, parent_personal_data_uuid, date) IN ("
" SELECT workspace_id, child_id, parent_personal_data_uuid, date "
" FROM day_assertion WHERE day_type != 'none'"
")"
)
)
# 'none' assertions -> recreate the exclusion rows they replaced.
conn.execute(
text(
"INSERT INTO planned_day_exclusion "
"(id, workspace_id, child_id, parent_personal_data_uuid, date, "
" created_at, updated_at) "
"SELECT id, workspace_id, child_id, parent_personal_data_uuid, date, "
" created_at, updated_at "
"FROM day_assertion WHERE day_type = 'none'"
)
)