jacobh2
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
136 lines
5.3 KiB
Python
136 lines
5.3 KiB
Python
"""HTTP-level tests for `/api/day-assertions` — restructure step 3b.
|
|
|
|
Replaces `TestPlannedDayExclusionRouter` (deleted along with the router it
|
|
tested). The create/list round trip and the foreign-workspace/foreign-child
|
|
rejections carry over; the delete shape changes from "by id" to "by natural
|
|
key" (see `app.routers.day_assertion.clear_day_assertion`'s docstring for
|
|
why), so this file's round-trip test clears by key instead of by id.
|
|
"""
|
|
|
|
from datetime import date
|
|
from uuid import uuid4
|
|
|
|
from httpx import AsyncClient
|
|
|
|
from tests.conftest import SeededIds
|
|
|
|
_DAY = date(2027, 2, 3)
|
|
|
|
|
|
class TestDayAssertionRouter:
|
|
async def test_create_list_clear_round_trip(
|
|
self, authed_client: AsyncClient, seeded_ids: SeededIds
|
|
) -> None:
|
|
payload = {
|
|
"workspace_id": str(seeded_ids.workspace_id),
|
|
"child_id": str(seeded_ids.child_id),
|
|
"parent_personal_data_uuid": str(seeded_ids.personal_data_uuid),
|
|
"date": _DAY.isoformat(),
|
|
"day_type": "vacation",
|
|
}
|
|
created = await authed_client.post("/api/day-assertions", json=payload)
|
|
assert created.status_code == 201, created.text
|
|
body = created.json()
|
|
assert body["date"] == _DAY.isoformat()
|
|
assert body["day_type"] == "vacation"
|
|
|
|
listed = await authed_client.get(f"/api/day-assertions/workspace/{seeded_ids.workspace_id}")
|
|
assert listed.status_code == 200
|
|
assert [r["id"] for r in listed.json()] == [body["id"]]
|
|
|
|
clear_params = {
|
|
"workspace_id": str(seeded_ids.workspace_id),
|
|
"child_id": str(seeded_ids.child_id),
|
|
"parent_personal_data_uuid": str(seeded_ids.personal_data_uuid),
|
|
"date": _DAY.isoformat(),
|
|
}
|
|
cleared = await authed_client.request("DELETE", "/api/day-assertions", params=clear_params)
|
|
assert cleared.status_code == 204
|
|
|
|
after = await authed_client.get(f"/api/day-assertions/workspace/{seeded_ids.workspace_id}")
|
|
assert after.json() == []
|
|
|
|
# Idempotent — clearing an already-empty slot is a no-op, never 404.
|
|
again = await authed_client.request("DELETE", "/api/day-assertions", params=clear_params)
|
|
assert again.status_code == 204
|
|
|
|
async def test_exclusion_shaped_assertion_is_accepted(
|
|
self, authed_client: AsyncClient, seeded_ids: SeededIds
|
|
) -> None:
|
|
response = await authed_client.post(
|
|
"/api/day-assertions",
|
|
json={
|
|
"workspace_id": str(seeded_ids.workspace_id),
|
|
"child_id": str(seeded_ids.child_id),
|
|
"parent_personal_data_uuid": str(seeded_ids.personal_data_uuid),
|
|
"date": _DAY.isoformat(),
|
|
"day_type": "none",
|
|
},
|
|
)
|
|
assert response.status_code == 201, response.text
|
|
assert response.json()["day_type"] == "none"
|
|
|
|
async def test_invalid_day_type_is_rejected(
|
|
self, authed_client: AsyncClient, seeded_ids: SeededIds
|
|
) -> None:
|
|
response = await authed_client.post(
|
|
"/api/day-assertions",
|
|
json={
|
|
"workspace_id": str(seeded_ids.workspace_id),
|
|
"child_id": str(seeded_ids.child_id),
|
|
"parent_personal_data_uuid": str(seeded_ids.personal_data_uuid),
|
|
"date": _DAY.isoformat(),
|
|
"day_type": "not-a-real-type",
|
|
},
|
|
)
|
|
assert response.status_code == 422
|
|
|
|
async def test_a_foreign_workspace_create_is_rejected(
|
|
self, authed_client: AsyncClient, seeded_ids: SeededIds
|
|
) -> None:
|
|
response = await authed_client.post(
|
|
"/api/day-assertions",
|
|
json={
|
|
"workspace_id": str(uuid4()),
|
|
"child_id": str(seeded_ids.child_id),
|
|
"parent_personal_data_uuid": str(seeded_ids.personal_data_uuid),
|
|
"date": _DAY.isoformat(),
|
|
"day_type": "vacation",
|
|
},
|
|
)
|
|
assert response.status_code == 404
|
|
|
|
async def test_a_foreign_child_create_is_rejected(
|
|
self, authed_client: AsyncClient, seeded_ids: SeededIds
|
|
) -> None:
|
|
response = await authed_client.post(
|
|
"/api/day-assertions",
|
|
json={
|
|
"workspace_id": str(seeded_ids.workspace_id),
|
|
"child_id": str(uuid4()),
|
|
"parent_personal_data_uuid": str(seeded_ids.personal_data_uuid),
|
|
"date": _DAY.isoformat(),
|
|
"day_type": "vacation",
|
|
},
|
|
)
|
|
assert response.status_code == 404
|
|
|
|
async def test_a_foreign_list_is_rejected(self, authed_client: AsyncClient) -> None:
|
|
response = await authed_client.get(f"/api/day-assertions/workspace/{uuid4()}")
|
|
assert response.status_code == 404
|
|
|
|
async def test_a_foreign_workspace_clear_is_rejected(
|
|
self, authed_client: AsyncClient, seeded_ids: SeededIds
|
|
) -> None:
|
|
response = await authed_client.request(
|
|
"DELETE",
|
|
"/api/day-assertions",
|
|
params={
|
|
"workspace_id": str(uuid4()),
|
|
"child_id": str(seeded_ids.child_id),
|
|
"parent_personal_data_uuid": str(seeded_ids.personal_data_uuid),
|
|
"date": _DAY.isoformat(),
|
|
},
|
|
)
|
|
assert response.status_code == 404
|