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
304 lines
9.0 KiB
Python
304 lines
9.0 KiB
Python
"""Migration 009's backfill: three legacy shapes -> one `day_assertion` row each.
|
|
|
|
`test_schema_parity.py` proves the migration chain and `_FULL_SCHEMA` describe
|
|
the same *shape*. This proves 009 moves the *data* correctly — restructure
|
|
step 3 (see `~/.claude/plans/please-make-a-plan-cheerful-beacon.md.restructure`):
|
|
|
|
- a pinned `planned_leave_day` row (`is_pinned=1`) -> an assertion carrying
|
|
its `day_type`/`is_dubbeldag`/`wish_id`.
|
|
- an ad-hoc `planned_leave_day` row (`wish_id IS NULL`) -> an assertion the
|
|
same way, even when NOT pinned.
|
|
- an ordinary planner-derived row (`is_pinned=0`, `wish_id` set) -> nothing:
|
|
it is exactly what the new table must NOT treat as an assertion.
|
|
- every `planned_day_exclusion` row -> a `day_type='none'` assertion.
|
|
- when a legacy exclusion and a pinned/ad-hoc row coincide at the same key,
|
|
the exclusion wins (`day_type='none'` survives, not the pin).
|
|
|
|
Driven through the real Alembic chain (upgrade to 008, insert pre-009 rows,
|
|
upgrade to head), not through `_FULL_SCHEMA`, because the pre-009 backfill
|
|
source rows must exist in their pre-migration shape.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import sqlite3
|
|
import uuid
|
|
from datetime import date, datetime
|
|
from pathlib import Path
|
|
|
|
from alembic import command
|
|
from alembic.config import Config
|
|
|
|
|
|
def _alembic_config(db_path: Path) -> Config:
|
|
cfg = Config("alembic.ini")
|
|
cfg.set_main_option("sqlalchemy.url", f"sqlite:///{db_path}")
|
|
return cfg
|
|
|
|
|
|
def _seed_workspace_and_child(conn: sqlite3.Connection, now: str) -> tuple[str, str]:
|
|
ws_id = str(uuid.uuid4())
|
|
child_id = str(uuid.uuid4())
|
|
conn.execute(
|
|
"INSERT INTO workspace (id, name, created_at) VALUES (?, ?, ?)", (ws_id, "WS", now)
|
|
)
|
|
conn.execute(
|
|
"INSERT INTO child (id, workspace_id, name, birth_date, "
|
|
"preschool_start_date, preschool_planning_days_per_year, created_at) "
|
|
"VALUES (?, ?, ?, ?, NULL, 0, ?)",
|
|
(child_id, ws_id, "Barn", date(2026, 5, 1).isoformat(), now),
|
|
)
|
|
return ws_id, child_id
|
|
|
|
|
|
def _insert_planned_leave_day(
|
|
conn: sqlite3.Connection,
|
|
*,
|
|
workspace_id: str,
|
|
child_id: str,
|
|
parent_id: str,
|
|
day: date,
|
|
day_type: str,
|
|
is_pinned: bool,
|
|
wish_id: str | None,
|
|
is_dubbeldag: bool = False,
|
|
now: str,
|
|
) -> None:
|
|
conn.execute(
|
|
"INSERT INTO planned_leave_day "
|
|
"(id, workspace_id, child_id, parent_personal_data_uuid, date, day_type, "
|
|
" is_dubbeldag, wish_id, is_pinned, created_at, updated_at) "
|
|
"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
|
|
(
|
|
str(uuid.uuid4()),
|
|
workspace_id,
|
|
child_id,
|
|
parent_id,
|
|
day.isoformat(),
|
|
day_type,
|
|
int(is_dubbeldag),
|
|
wish_id,
|
|
int(is_pinned),
|
|
now,
|
|
now,
|
|
),
|
|
)
|
|
|
|
|
|
def _insert_exclusion(
|
|
conn: sqlite3.Connection,
|
|
*,
|
|
workspace_id: str,
|
|
child_id: str,
|
|
parent_id: str,
|
|
day: date,
|
|
now: str,
|
|
) -> None:
|
|
conn.execute(
|
|
"INSERT INTO planned_day_exclusion "
|
|
"(id, workspace_id, child_id, parent_personal_data_uuid, date, created_at, updated_at) "
|
|
"VALUES (?, ?, ?, ?, ?, ?, ?)",
|
|
(str(uuid.uuid4()), workspace_id, child_id, parent_id, day.isoformat(), now, now),
|
|
)
|
|
|
|
|
|
def _assertions(db_path: Path, workspace_id: str) -> list[sqlite3.Row]:
|
|
conn = sqlite3.connect(db_path)
|
|
conn.row_factory = sqlite3.Row
|
|
try:
|
|
return conn.execute(
|
|
"SELECT * FROM day_assertion WHERE workspace_id = ? ORDER BY date", (workspace_id,)
|
|
).fetchall()
|
|
finally:
|
|
conn.close()
|
|
|
|
|
|
def test_pinned_row_becomes_a_concrete_assertion(tmp_path: Path) -> None:
|
|
db = tmp_path / "pinned.db"
|
|
command.upgrade(_alembic_config(db), "008")
|
|
now = datetime(2026, 1, 1, 12, 0, 0).isoformat()
|
|
|
|
conn = sqlite3.connect(db)
|
|
ws_id, child_id = _seed_workspace_and_child(conn, now)
|
|
parent_id = str(uuid.uuid4())
|
|
wish_id = str(uuid.uuid4())
|
|
_insert_planned_leave_day(
|
|
conn,
|
|
workspace_id=ws_id,
|
|
child_id=child_id,
|
|
parent_id=parent_id,
|
|
day=date(2027, 2, 3),
|
|
day_type="lagsta",
|
|
is_pinned=True,
|
|
wish_id=wish_id,
|
|
is_dubbeldag=True,
|
|
now=now,
|
|
)
|
|
conn.commit()
|
|
conn.close()
|
|
|
|
command.upgrade(_alembic_config(db), "head")
|
|
|
|
rows = _assertions(db, ws_id)
|
|
assert len(rows) == 1
|
|
assert rows[0]["day_type"] == "lagsta"
|
|
assert bool(rows[0]["is_dubbeldag"]) is True
|
|
assert rows[0]["wish_id"] == wish_id
|
|
assert rows[0]["parent_personal_data_uuid"] == parent_id
|
|
|
|
|
|
def test_ad_hoc_row_becomes_an_assertion_even_when_not_pinned(tmp_path: Path) -> None:
|
|
db = tmp_path / "adhoc.db"
|
|
command.upgrade(_alembic_config(db), "008")
|
|
now = datetime(2026, 1, 1, 12, 0, 0).isoformat()
|
|
|
|
conn = sqlite3.connect(db)
|
|
ws_id, child_id = _seed_workspace_and_child(conn, now)
|
|
parent_id = str(uuid.uuid4())
|
|
_insert_planned_leave_day(
|
|
conn,
|
|
workspace_id=ws_id,
|
|
child_id=child_id,
|
|
parent_id=parent_id,
|
|
day=date(2027, 3, 1),
|
|
day_type="vacation",
|
|
is_pinned=False,
|
|
wish_id=None,
|
|
now=now,
|
|
)
|
|
conn.commit()
|
|
conn.close()
|
|
|
|
command.upgrade(_alembic_config(db), "head")
|
|
|
|
rows = _assertions(db, ws_id)
|
|
assert len(rows) == 1
|
|
assert rows[0]["day_type"] == "vacation"
|
|
assert rows[0]["wish_id"] is None
|
|
|
|
|
|
def test_ordinary_planner_derived_row_is_not_backfilled(tmp_path: Path) -> None:
|
|
"""The whole point of the new table: a derived (unpinned, wish-attributed)
|
|
|
|
row is NOT a user assertion and must not become one.
|
|
"""
|
|
db = tmp_path / "derived.db"
|
|
command.upgrade(_alembic_config(db), "008")
|
|
now = datetime(2026, 1, 1, 12, 0, 0).isoformat()
|
|
|
|
conn = sqlite3.connect(db)
|
|
ws_id, child_id = _seed_workspace_and_child(conn, now)
|
|
parent_id = str(uuid.uuid4())
|
|
wish_id = str(uuid.uuid4())
|
|
_insert_planned_leave_day(
|
|
conn,
|
|
workspace_id=ws_id,
|
|
child_id=child_id,
|
|
parent_id=parent_id,
|
|
day=date(2027, 4, 1),
|
|
day_type="sjukpenning",
|
|
is_pinned=False,
|
|
wish_id=wish_id,
|
|
now=now,
|
|
)
|
|
conn.commit()
|
|
conn.close()
|
|
|
|
command.upgrade(_alembic_config(db), "head")
|
|
|
|
assert _assertions(db, ws_id) == []
|
|
|
|
|
|
def test_exclusion_row_becomes_a_none_assertion(tmp_path: Path) -> None:
|
|
db = tmp_path / "exclusion.db"
|
|
command.upgrade(_alembic_config(db), "008")
|
|
now = datetime(2026, 1, 1, 12, 0, 0).isoformat()
|
|
|
|
conn = sqlite3.connect(db)
|
|
ws_id, child_id = _seed_workspace_and_child(conn, now)
|
|
parent_id = str(uuid.uuid4())
|
|
_insert_exclusion(
|
|
conn,
|
|
workspace_id=ws_id,
|
|
child_id=child_id,
|
|
parent_id=parent_id,
|
|
day=date(2027, 2, 3),
|
|
now=now,
|
|
)
|
|
conn.commit()
|
|
conn.close()
|
|
|
|
command.upgrade(_alembic_config(db), "head")
|
|
|
|
rows = _assertions(db, ws_id)
|
|
assert len(rows) == 1
|
|
assert rows[0]["day_type"] == "none"
|
|
assert rows[0]["wish_id"] is None
|
|
assert bool(rows[0]["is_dubbeldag"]) is False
|
|
|
|
|
|
def test_exclusion_wins_over_a_coinciding_pinned_row(tmp_path: Path) -> None:
|
|
"""Historical data where an exclusion and a pinned row share a key —
|
|
|
|
shouldn't happen going forward (`PlannedDayExclusionService.exclude()`
|
|
always deletes the `planned_leave_day` row first), but the migration must
|
|
resolve it the same way at rest: the exclusion (a stronger, later
|
|
instruction) wins.
|
|
"""
|
|
db = tmp_path / "conflict.db"
|
|
command.upgrade(_alembic_config(db), "008")
|
|
now = datetime(2026, 1, 1, 12, 0, 0).isoformat()
|
|
|
|
conn = sqlite3.connect(db)
|
|
ws_id, child_id = _seed_workspace_and_child(conn, now)
|
|
parent_id = str(uuid.uuid4())
|
|
day = date(2027, 5, 1)
|
|
_insert_planned_leave_day(
|
|
conn,
|
|
workspace_id=ws_id,
|
|
child_id=child_id,
|
|
parent_id=parent_id,
|
|
day=day,
|
|
day_type="sjukpenning",
|
|
is_pinned=True,
|
|
wish_id=None,
|
|
now=now,
|
|
)
|
|
_insert_exclusion(
|
|
conn, workspace_id=ws_id, child_id=child_id, parent_id=parent_id, day=day, now=now
|
|
)
|
|
conn.commit()
|
|
conn.close()
|
|
|
|
command.upgrade(_alembic_config(db), "head")
|
|
|
|
rows = _assertions(db, ws_id)
|
|
assert len(rows) == 1
|
|
assert rows[0]["day_type"] == "none"
|
|
|
|
|
|
def test_downgrade_drops_the_table(tmp_path: Path) -> None:
|
|
db = tmp_path / "downgrade.db"
|
|
command.upgrade(_alembic_config(db), "head")
|
|
|
|
conn = sqlite3.connect(db)
|
|
tables = {
|
|
row[0]
|
|
for row in conn.execute("SELECT name FROM sqlite_master WHERE type = 'table'").fetchall()
|
|
}
|
|
conn.close()
|
|
assert "day_assertion" in tables
|
|
|
|
command.downgrade(_alembic_config(db), "008")
|
|
|
|
conn = sqlite3.connect(db)
|
|
tables = {
|
|
row[0]
|
|
for row in conn.execute("SELECT name FROM sqlite_master WHERE type = 'table'").fetchall()
|
|
}
|
|
# is_pinned / planned_day_exclusion are untouched by 009 either direction —
|
|
# step 3a is additive, see the migration's module docstring.
|
|
assert "planned_day_exclusion" in tables
|
|
conn.close()
|
|
assert "day_assertion" not in tables
|