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
698 lines
26 KiB
Python
698 lines
26 KiB
Python
"""API-level test for `/api/leave-wishes` POST and PUT routes.
|
|
|
|
Tests that `target_days` and other fields round-trip correctly through the
|
|
router (i.e. are passed from the request payload to the service). This guards
|
|
against the pattern where validation accepts a field but the router drops it
|
|
before calling the service.
|
|
"""
|
|
|
|
from datetime import date, datetime
|
|
from uuid import uuid4
|
|
|
|
import aiosqlite
|
|
import pytest_asyncio
|
|
from httpx import ASGITransport, AsyncClient
|
|
|
|
from app.dependencies import get_connection, get_current_user
|
|
from app.entities.child import Child
|
|
from app.entities.day_assertion import DayAssertion
|
|
from app.entities.personal_data import PersonalData
|
|
from app.entities.user import User
|
|
from app.entities.workspace import Workspace
|
|
from app.main import app
|
|
from app.repositories_impl.sqlite.child_repository import SQLiteChildRepository
|
|
from app.repositories_impl.sqlite.day_assertion_repository import SQLiteDayAssertionRepository
|
|
from app.repositories_impl.sqlite.personal_data_repository import SQLitePersonalDataRepository
|
|
from app.repositories_impl.sqlite.workspace_repository import SQLiteWorkspaceRepository
|
|
|
|
# Fixed identity for the authenticated caller in every test in this file —
|
|
# each test must also create a `PersonalData` row with this uuid in the
|
|
# workspace it seeds, so `get_current_personal_data` resolves to that
|
|
# workspace (see CLAUDE.md T1 authz work / audit §4 blast radius).
|
|
_CURRENT_USER_PD_UUID = uuid4()
|
|
|
|
|
|
@pytest_asyncio.fixture
|
|
async def client(connection: aiosqlite.Connection) -> AsyncClient:
|
|
"""An httpx client against the real app: `get_connection` and
|
|
`get_current_user` are overridden to use the test's in-memory connection
|
|
and a fixed fake user.
|
|
"""
|
|
app.dependency_overrides[get_connection] = lambda: connection
|
|
app.dependency_overrides[get_current_user] = lambda: User(
|
|
id=uuid4(),
|
|
personal_data_uuid=_CURRENT_USER_PD_UUID,
|
|
email="test@example.com",
|
|
hashed_password="not-a-real-hash",
|
|
created_at=datetime.now(),
|
|
)
|
|
async with AsyncClient(transport=ASGITransport(app=app), base_url="http://test") as ac:
|
|
yield ac
|
|
app.dependency_overrides.pop(get_connection, None)
|
|
app.dependency_overrides.pop(get_current_user, None)
|
|
|
|
|
|
class TestLeaveWishTargetDaysRoundTrip:
|
|
"""Test that `target_days` is correctly passed from router to service."""
|
|
|
|
async def test_create_leave_wish_with_target_days(
|
|
self,
|
|
client: AsyncClient,
|
|
connection: aiosqlite.Connection,
|
|
) -> None:
|
|
"""POST /api/leave-wishes with target_days should store it and return
|
|
it in the response."""
|
|
now = datetime.now()
|
|
workspace_repo = SQLiteWorkspaceRepository(connection)
|
|
ws = await workspace_repo.create(Workspace(id=uuid4(), name="Familj", created_at=now))
|
|
await SQLitePersonalDataRepository(connection).create(
|
|
PersonalData(
|
|
uuid=_CURRENT_USER_PD_UUID, workspace_id=ws.id, name="Alex", created_at=now
|
|
)
|
|
)
|
|
|
|
target_days_value = 15
|
|
response = await client.post(
|
|
"/api/leave-wishes",
|
|
json={
|
|
"workspace_id": str(ws.id),
|
|
"child_id": None,
|
|
"name": "Vårlov",
|
|
"window_start_month": 3,
|
|
"window_start_day": 1,
|
|
"window_end_month": 5,
|
|
"window_end_day": 31,
|
|
"target_weeks": 2,
|
|
"target_days": target_days_value,
|
|
"recurrence": "once",
|
|
"first_year": date.today().year + 1,
|
|
},
|
|
)
|
|
|
|
assert response.status_code == 201
|
|
body = response.json()
|
|
assert body["target_days"] == target_days_value
|
|
|
|
# Verify the value persists: list and check
|
|
listed = await client.get(f"/api/leave-wishes/{ws.id}")
|
|
assert listed.status_code == 200
|
|
assert listed.json()[0]["target_days"] == target_days_value
|
|
|
|
async def test_create_leave_wish_without_target_days_defaults_to_null(
|
|
self,
|
|
client: AsyncClient,
|
|
connection: aiosqlite.Connection,
|
|
) -> None:
|
|
"""POST without target_days should store NULL (defaults to None in
|
|
Pydantic)."""
|
|
now = datetime.now()
|
|
workspace_repo = SQLiteWorkspaceRepository(connection)
|
|
ws = await workspace_repo.create(Workspace(id=uuid4(), name="Familj", created_at=now))
|
|
await SQLitePersonalDataRepository(connection).create(
|
|
PersonalData(
|
|
uuid=_CURRENT_USER_PD_UUID, workspace_id=ws.id, name="Alex", created_at=now
|
|
)
|
|
)
|
|
|
|
response = await client.post(
|
|
"/api/leave-wishes",
|
|
json={
|
|
"workspace_id": str(ws.id),
|
|
"child_id": None,
|
|
"name": "Vårlov",
|
|
"window_start_month": 3,
|
|
"window_start_day": 1,
|
|
"window_end_month": 5,
|
|
"window_end_day": 31,
|
|
"target_weeks": 2,
|
|
"recurrence": "once",
|
|
"first_year": date.today().year + 1,
|
|
},
|
|
)
|
|
|
|
assert response.status_code == 201
|
|
body = response.json()
|
|
assert body["target_days"] is None
|
|
|
|
async def test_update_leave_wish_target_days(
|
|
self,
|
|
client: AsyncClient,
|
|
connection: aiosqlite.Connection,
|
|
) -> None:
|
|
"""PUT /api/leave-wishes/{id} with target_days should update it."""
|
|
now = datetime.now()
|
|
workspace_repo = SQLiteWorkspaceRepository(connection)
|
|
ws = await workspace_repo.create(Workspace(id=uuid4(), name="Familj", created_at=now))
|
|
await SQLitePersonalDataRepository(connection).create(
|
|
PersonalData(
|
|
uuid=_CURRENT_USER_PD_UUID, workspace_id=ws.id, name="Alex", created_at=now
|
|
)
|
|
)
|
|
|
|
# Create a wish without target_days
|
|
create_response = await client.post(
|
|
"/api/leave-wishes",
|
|
json={
|
|
"workspace_id": str(ws.id),
|
|
"child_id": None,
|
|
"name": "Vårlov",
|
|
"window_start_month": 3,
|
|
"window_start_day": 1,
|
|
"window_end_month": 5,
|
|
"window_end_day": 31,
|
|
"target_weeks": 2,
|
|
"recurrence": "once",
|
|
"first_year": date.today().year + 1,
|
|
},
|
|
)
|
|
assert create_response.status_code == 201
|
|
wish_id = create_response.json()["id"]
|
|
assert create_response.json()["target_days"] is None
|
|
|
|
# Update with target_days
|
|
target_days_value = 20
|
|
update_response = await client.put(
|
|
f"/api/leave-wishes/{wish_id}",
|
|
json={"target_days": target_days_value},
|
|
)
|
|
|
|
assert update_response.status_code == 200
|
|
body = update_response.json()
|
|
assert body["target_days"] == target_days_value
|
|
|
|
# Verify persistence
|
|
listed = await client.get(f"/api/leave-wishes/{ws.id}")
|
|
assert listed.status_code == 200
|
|
assert listed.json()[0]["target_days"] == target_days_value
|
|
|
|
async def test_update_leave_wish_omitting_target_days_leaves_unchanged(
|
|
self,
|
|
client: AsyncClient,
|
|
connection: aiosqlite.Connection,
|
|
) -> None:
|
|
"""PUT without target_days field should leave the stored value
|
|
unchanged."""
|
|
now = datetime.now()
|
|
workspace_repo = SQLiteWorkspaceRepository(connection)
|
|
ws = await workspace_repo.create(Workspace(id=uuid4(), name="Familj", created_at=now))
|
|
await SQLitePersonalDataRepository(connection).create(
|
|
PersonalData(
|
|
uuid=_CURRENT_USER_PD_UUID, workspace_id=ws.id, name="Alex", created_at=now
|
|
)
|
|
)
|
|
|
|
# Create a wish with target_days
|
|
target_days_value = 25
|
|
create_response = await client.post(
|
|
"/api/leave-wishes",
|
|
json={
|
|
"workspace_id": str(ws.id),
|
|
"child_id": None,
|
|
"name": "Vårlov",
|
|
"window_start_month": 3,
|
|
"window_start_day": 1,
|
|
"window_end_month": 5,
|
|
"window_end_day": 31,
|
|
"target_weeks": 2,
|
|
"target_days": target_days_value,
|
|
"recurrence": "once",
|
|
"first_year": date.today().year + 1,
|
|
},
|
|
)
|
|
assert create_response.status_code == 201
|
|
wish_id = create_response.json()["id"]
|
|
|
|
# Update other fields but omit target_days
|
|
update_response = await client.put(
|
|
f"/api/leave-wishes/{wish_id}",
|
|
json={"name": "Sommarvikarie"}, # Change name only
|
|
)
|
|
|
|
assert update_response.status_code == 200
|
|
body = update_response.json()
|
|
# target_days should be unchanged
|
|
assert body["target_days"] == target_days_value
|
|
# but name should be updated
|
|
assert body["name"] == "Sommarvikarie"
|
|
|
|
async def test_update_leave_wish_clear_target_days_to_null(
|
|
self,
|
|
client: AsyncClient,
|
|
connection: aiosqlite.Connection,
|
|
) -> None:
|
|
"""PUT with target_days explicitly set to null should clear it."""
|
|
now = datetime.now()
|
|
workspace_repo = SQLiteWorkspaceRepository(connection)
|
|
ws = await workspace_repo.create(Workspace(id=uuid4(), name="Familj", created_at=now))
|
|
await SQLitePersonalDataRepository(connection).create(
|
|
PersonalData(
|
|
uuid=_CURRENT_USER_PD_UUID, workspace_id=ws.id, name="Alex", created_at=now
|
|
)
|
|
)
|
|
|
|
# Create a wish with target_days
|
|
target_days_value = 30
|
|
create_response = await client.post(
|
|
"/api/leave-wishes",
|
|
json={
|
|
"workspace_id": str(ws.id),
|
|
"child_id": None,
|
|
"name": "Vårlov",
|
|
"window_start_month": 3,
|
|
"window_start_day": 1,
|
|
"window_end_month": 5,
|
|
"window_end_day": 31,
|
|
"target_weeks": 2,
|
|
"target_days": target_days_value,
|
|
"recurrence": "once",
|
|
"first_year": date.today().year + 1,
|
|
},
|
|
)
|
|
assert create_response.status_code == 201
|
|
wish_id = create_response.json()["id"]
|
|
|
|
# Update with target_days explicitly set to null
|
|
update_response = await client.put(
|
|
f"/api/leave-wishes/{wish_id}",
|
|
json={"target_days": None},
|
|
)
|
|
|
|
assert update_response.status_code == 200
|
|
body = update_response.json()
|
|
# target_days should now be None
|
|
assert body["target_days"] is None
|
|
|
|
# Verify persistence
|
|
listed = await client.get(f"/api/leave-wishes/{ws.id}")
|
|
assert listed.status_code == 200
|
|
assert listed.json()[0]["target_days"] is None
|
|
|
|
|
|
class TestLeaveWishWantsDubbeldagRoundTrip:
|
|
"""§Decision A (co-leave, opt-in dubbeldagar) — `wants_dubbeldag` round-trips
|
|
|
|
through the router exactly like `target_days` above, and is rejected
|
|
when `parent_mode` isn't `'both'`.
|
|
"""
|
|
|
|
async def test_create_defaults_to_false(
|
|
self,
|
|
client: AsyncClient,
|
|
connection: aiosqlite.Connection,
|
|
) -> None:
|
|
now = datetime.now()
|
|
workspace_repo = SQLiteWorkspaceRepository(connection)
|
|
ws = await workspace_repo.create(Workspace(id=uuid4(), name="Familj", created_at=now))
|
|
await SQLitePersonalDataRepository(connection).create(
|
|
PersonalData(
|
|
uuid=_CURRENT_USER_PD_UUID, workspace_id=ws.id, name="Alex", created_at=now
|
|
)
|
|
)
|
|
|
|
response = await client.post(
|
|
"/api/leave-wishes",
|
|
json={
|
|
"workspace_id": str(ws.id),
|
|
"child_id": None,
|
|
"name": "Vårlov",
|
|
"window_start_month": 3,
|
|
"window_start_day": 1,
|
|
"window_end_month": 5,
|
|
"window_end_day": 31,
|
|
"target_weeks": 2,
|
|
"recurrence": "once",
|
|
"first_year": date.today().year + 1,
|
|
},
|
|
)
|
|
|
|
assert response.status_code == 201
|
|
assert response.json()["wants_dubbeldag"] is False
|
|
|
|
async def test_create_with_both_parent_mode_can_opt_in(
|
|
self,
|
|
client: AsyncClient,
|
|
connection: aiosqlite.Connection,
|
|
) -> None:
|
|
now = datetime.now()
|
|
workspace_repo = SQLiteWorkspaceRepository(connection)
|
|
ws = await workspace_repo.create(Workspace(id=uuid4(), name="Familj", created_at=now))
|
|
await SQLitePersonalDataRepository(connection).create(
|
|
PersonalData(
|
|
uuid=_CURRENT_USER_PD_UUID, workspace_id=ws.id, name="Alex", created_at=now
|
|
)
|
|
)
|
|
|
|
response = await client.post(
|
|
"/api/leave-wishes",
|
|
json={
|
|
"workspace_id": str(ws.id),
|
|
"child_id": None,
|
|
"name": "Vårlov",
|
|
"window_start_month": 3,
|
|
"window_start_day": 1,
|
|
"window_end_month": 5,
|
|
"window_end_day": 31,
|
|
"target_weeks": 2,
|
|
"recurrence": "once",
|
|
"first_year": date.today().year + 1,
|
|
"parent_mode": "both",
|
|
"wants_dubbeldag": True,
|
|
},
|
|
)
|
|
|
|
assert response.status_code == 201
|
|
assert response.json()["wants_dubbeldag"] is True
|
|
|
|
async def test_create_rejects_wants_dubbeldag_outside_both_mode(
|
|
self,
|
|
client: AsyncClient,
|
|
connection: aiosqlite.Connection,
|
|
) -> None:
|
|
now = datetime.now()
|
|
workspace_repo = SQLiteWorkspaceRepository(connection)
|
|
ws = await workspace_repo.create(Workspace(id=uuid4(), name="Familj", created_at=now))
|
|
await SQLitePersonalDataRepository(connection).create(
|
|
PersonalData(
|
|
uuid=_CURRENT_USER_PD_UUID, workspace_id=ws.id, name="Alex", created_at=now
|
|
)
|
|
)
|
|
|
|
response = await client.post(
|
|
"/api/leave-wishes",
|
|
json={
|
|
"workspace_id": str(ws.id),
|
|
"child_id": None,
|
|
"name": "Vårlov",
|
|
"window_start_month": 3,
|
|
"window_start_day": 1,
|
|
"window_end_month": 5,
|
|
"window_end_day": 31,
|
|
"target_weeks": 2,
|
|
"recurrence": "once",
|
|
"first_year": date.today().year + 1,
|
|
"wants_dubbeldag": True, # parent_mode defaults to 'either'
|
|
},
|
|
)
|
|
|
|
assert response.status_code == 422
|
|
|
|
async def test_update_can_toggle_it(
|
|
self,
|
|
client: AsyncClient,
|
|
connection: aiosqlite.Connection,
|
|
) -> None:
|
|
now = datetime.now()
|
|
workspace_repo = SQLiteWorkspaceRepository(connection)
|
|
ws = await workspace_repo.create(Workspace(id=uuid4(), name="Familj", created_at=now))
|
|
await SQLitePersonalDataRepository(connection).create(
|
|
PersonalData(
|
|
uuid=_CURRENT_USER_PD_UUID, workspace_id=ws.id, name="Alex", created_at=now
|
|
)
|
|
)
|
|
|
|
create_response = await client.post(
|
|
"/api/leave-wishes",
|
|
json={
|
|
"workspace_id": str(ws.id),
|
|
"child_id": None,
|
|
"name": "Vårlov",
|
|
"window_start_month": 3,
|
|
"window_start_day": 1,
|
|
"window_end_month": 5,
|
|
"window_end_day": 31,
|
|
"target_weeks": 2,
|
|
"recurrence": "once",
|
|
"first_year": date.today().year + 1,
|
|
"parent_mode": "both",
|
|
},
|
|
)
|
|
assert create_response.status_code == 201
|
|
wish_id = create_response.json()["id"]
|
|
assert create_response.json()["wants_dubbeldag"] is False
|
|
|
|
update_response = await client.put(
|
|
f"/api/leave-wishes/{wish_id}",
|
|
json={"wants_dubbeldag": True},
|
|
)
|
|
|
|
assert update_response.status_code == 200
|
|
assert update_response.json()["wants_dubbeldag"] is True
|
|
|
|
|
|
class TestLeaveWishScopeQueryParam:
|
|
"""`?scope=series` widens PUT/DELETE from one year to the whole series.
|
|
|
|
The calendar's period popover offers "this year" vs "every year"; the
|
|
scope has to reach the service or the choice is decorative.
|
|
"""
|
|
|
|
async def _workspace(self, connection: aiosqlite.Connection) -> Workspace:
|
|
now = datetime.now()
|
|
ws = await SQLiteWorkspaceRepository(connection).create(
|
|
Workspace(id=uuid4(), name="Familj", created_at=now)
|
|
)
|
|
await SQLitePersonalDataRepository(connection).create(
|
|
PersonalData(
|
|
uuid=_CURRENT_USER_PD_UUID, workspace_id=ws.id, name="Alex", created_at=now
|
|
)
|
|
)
|
|
return ws
|
|
|
|
async def _create_series(self, client: AsyncClient, ws: Workspace) -> list[dict[str, object]]:
|
|
first_year = date.today().year + 1
|
|
response = await client.post(
|
|
"/api/leave-wishes",
|
|
json={
|
|
"workspace_id": str(ws.id),
|
|
"name": "Höstlov",
|
|
"window_start_month": 10,
|
|
"window_start_day": 5,
|
|
"window_end_month": 10,
|
|
"window_end_day": 11,
|
|
"target_weeks": 1,
|
|
"recurrence": "yearly",
|
|
"first_year": first_year,
|
|
"last_year": first_year + 2,
|
|
},
|
|
)
|
|
assert response.status_code == 201, response.text
|
|
assert response.json()["series_id"] is not None
|
|
listed = await client.get(f"/api/leave-wishes/{ws.id}")
|
|
assert listed.status_code == 200, listed.text
|
|
return sorted(listed.json(), key=lambda row: row["first_year"])
|
|
|
|
async def test_create_yearly_returns_a_series_and_lists_one_row_per_year(
|
|
self, client: AsyncClient, connection: aiosqlite.Connection
|
|
) -> None:
|
|
ws = await self._workspace(connection)
|
|
rows = await self._create_series(client, ws)
|
|
|
|
first_year = date.today().year + 1
|
|
assert [r["first_year"] for r in rows] == [first_year, first_year + 1, first_year + 2]
|
|
assert len({r["series_id"] for r in rows}) == 1
|
|
# `recurrence` is an instruction, not a response field any more.
|
|
assert "recurrence" not in rows[0]
|
|
|
|
async def test_update_defaults_to_this_year_only(
|
|
self, client: AsyncClient, connection: aiosqlite.Connection
|
|
) -> None:
|
|
ws = await self._workspace(connection)
|
|
rows = await self._create_series(client, ws)
|
|
|
|
response = await client.put(
|
|
f"/api/leave-wishes/{rows[1]['id']}", json={"name": "Bara detta år"}
|
|
)
|
|
assert response.status_code == 200, response.text
|
|
|
|
after = sorted(
|
|
(await client.get(f"/api/leave-wishes/{ws.id}")).json(), key=lambda r: r["first_year"]
|
|
)
|
|
assert [r["name"] for r in after] == ["Höstlov", "Bara detta år", "Höstlov"]
|
|
|
|
async def test_update_with_scope_series_applies_to_every_year(
|
|
self, client: AsyncClient, connection: aiosqlite.Connection
|
|
) -> None:
|
|
ws = await self._workspace(connection)
|
|
rows = await self._create_series(client, ws)
|
|
|
|
response = await client.put(
|
|
f"/api/leave-wishes/{rows[1]['id']}?scope=series", json={"name": "Alla år"}
|
|
)
|
|
assert response.status_code == 200, response.text
|
|
|
|
after = (await client.get(f"/api/leave-wishes/{ws.id}")).json()
|
|
assert {r["name"] for r in after} == {"Alla år"}
|
|
assert len(after) == 3
|
|
|
|
async def test_delete_defaults_to_this_year_only(
|
|
self, client: AsyncClient, connection: aiosqlite.Connection
|
|
) -> None:
|
|
ws = await self._workspace(connection)
|
|
rows = await self._create_series(client, ws)
|
|
|
|
response = await client.delete(f"/api/leave-wishes/{rows[1]['id']}")
|
|
assert response.status_code == 204, response.text
|
|
|
|
after = (await client.get(f"/api/leave-wishes/{ws.id}")).json()
|
|
assert [r["id"] for r in sorted(after, key=lambda r: r["first_year"])] == [
|
|
rows[0]["id"],
|
|
rows[2]["id"],
|
|
]
|
|
|
|
async def test_delete_with_scope_series_removes_every_year(
|
|
self, client: AsyncClient, connection: aiosqlite.Connection
|
|
) -> None:
|
|
ws = await self._workspace(connection)
|
|
rows = await self._create_series(client, ws)
|
|
|
|
response = await client.delete(f"/api/leave-wishes/{rows[1]['id']}?scope=series")
|
|
assert response.status_code == 204, response.text
|
|
|
|
assert (await client.get(f"/api/leave-wishes/{ws.id}")).json() == []
|
|
|
|
async def test_an_unknown_scope_is_a_422(
|
|
self, client: AsyncClient, connection: aiosqlite.Connection
|
|
) -> None:
|
|
ws = await self._workspace(connection)
|
|
rows = await self._create_series(client, ws)
|
|
|
|
response = await client.delete(f"/api/leave-wishes/{rows[0]['id']}?scope=everything")
|
|
assert response.status_code == 422, response.text
|
|
|
|
|
|
class TestLeaveWishDeleteClearsDayAssertions:
|
|
"""Bugs 2 & 3 (adversarial-review follow-ups) — deleting a wish must
|
|
|
|
clear every `DayAssertion` attached to it, INCLUDING one whose mirrored
|
|
`planned_leave_day` row is already missing (a "dangling" assertion —
|
|
e.g. left behind by a crash between `DayAssertionService`'s own
|
|
assertion write and its mirror write, before that service had a `uow`).
|
|
Before the fix, `LeaveWishService._clear_assertions_for` only walked
|
|
SURVIVING `planned_leave_day` rows, so a dangling assertion was
|
|
invisible to it and outlived the wish as a `wish_id=NULL` ad-hoc
|
|
assertion that permanently locked its date. Also asserts the DELETE
|
|
itself returns its correct 2xx status (bug 3 — reported as a live 503
|
|
despite the mutation succeeding).
|
|
"""
|
|
|
|
async def _workspace_with_child(
|
|
self, connection: aiosqlite.Connection
|
|
) -> tuple[Workspace, Child]:
|
|
now = datetime.now()
|
|
ws = await SQLiteWorkspaceRepository(connection).create(
|
|
Workspace(id=uuid4(), name="Familj", created_at=now)
|
|
)
|
|
await SQLitePersonalDataRepository(connection).create(
|
|
PersonalData(
|
|
uuid=_CURRENT_USER_PD_UUID, workspace_id=ws.id, name="Alex", created_at=now
|
|
)
|
|
)
|
|
child = await SQLiteChildRepository(connection).create(
|
|
Child(
|
|
id=uuid4(),
|
|
workspace_id=ws.id,
|
|
name="Barn",
|
|
birth_date=date(2024, 1, 1),
|
|
created_at=now,
|
|
)
|
|
)
|
|
return ws, child
|
|
|
|
async def test_delete_clears_a_normally_mirrored_assertion(
|
|
self, client: AsyncClient, connection: aiosqlite.Connection
|
|
) -> None:
|
|
ws, child = await self._workspace_with_child(connection)
|
|
create = await client.post(
|
|
"/api/leave-wishes",
|
|
json={
|
|
"workspace_id": str(ws.id),
|
|
"child_id": str(child.id),
|
|
"name": "Sommar",
|
|
"window_start_month": 7,
|
|
"window_start_day": 1,
|
|
"window_end_month": 7,
|
|
"window_end_day": 5,
|
|
"target_weeks": 1,
|
|
"first_year": date.today().year + 1,
|
|
},
|
|
)
|
|
assert create.status_code == 201, create.text
|
|
wish = create.json()
|
|
|
|
day = f"{wish['first_year']}-07-01"
|
|
asserted = await client.post(
|
|
"/api/day-assertions",
|
|
json={
|
|
"workspace_id": str(ws.id),
|
|
"child_id": str(child.id),
|
|
"parent_personal_data_uuid": str(_CURRENT_USER_PD_UUID),
|
|
"date": day,
|
|
"day_type": "vacation",
|
|
"wish_id": wish["id"],
|
|
},
|
|
)
|
|
assert asserted.status_code == 201, asserted.text
|
|
|
|
response = await client.delete(f"/api/leave-wishes/{wish['id']}")
|
|
assert response.status_code == 204, response.text
|
|
|
|
remaining = await client.get(f"/api/day-assertions/workspace/{ws.id}")
|
|
assert remaining.status_code == 200
|
|
assert remaining.json() == []
|
|
|
|
async def test_delete_clears_a_dangling_assertion_with_no_mirrored_row(
|
|
self, client: AsyncClient, connection: aiosqlite.Connection
|
|
) -> None:
|
|
"""The assertion exists, but its `planned_leave_day` mirror row does
|
|
|
|
not — e.g. left behind by a pre-uow-fix crash. `list_by_wish` (the
|
|
by-`wish_id` lookup, not a row walk) must still find and clear it.
|
|
"""
|
|
ws, child = await self._workspace_with_child(connection)
|
|
create = await client.post(
|
|
"/api/leave-wishes",
|
|
json={
|
|
"workspace_id": str(ws.id),
|
|
"child_id": str(child.id),
|
|
"name": "Sommar",
|
|
"window_start_month": 7,
|
|
"window_start_day": 1,
|
|
"window_end_month": 7,
|
|
"window_end_day": 5,
|
|
"target_weeks": 1,
|
|
"first_year": date.today().year + 1,
|
|
},
|
|
)
|
|
assert create.status_code == 201, create.text
|
|
wish = create.json()
|
|
day = date(wish["first_year"], 7, 1)
|
|
|
|
# A dangling assertion: inserted directly at the repository, with
|
|
# `wish_id` pointing at the wish, but NO `planned_leave_day` row —
|
|
# exactly the state a crash mid-mirror (bug 1, before its `uow` fix)
|
|
# would leave behind.
|
|
now = datetime.now()
|
|
await SQLiteDayAssertionRepository(connection).create(
|
|
DayAssertion(
|
|
id=uuid4(),
|
|
workspace_id=ws.id,
|
|
child_id=child.id,
|
|
parent_personal_data_uuid=_CURRENT_USER_PD_UUID,
|
|
date=day,
|
|
day_type="vacation",
|
|
wish_id=wish["id"],
|
|
created_at=now,
|
|
updated_at=now,
|
|
)
|
|
)
|
|
|
|
response = await client.delete(f"/api/leave-wishes/{wish['id']}")
|
|
assert response.status_code == 204, response.text
|
|
|
|
remaining = await client.get(f"/api/day-assertions/workspace/{ws.id}")
|
|
assert remaining.status_code == 200
|
|
assert remaining.json() == [], (
|
|
"a dangling assertion (no mirrored row) must not outlive the wish it "
|
|
"was attached to as a permanently-locked, invisible ad-hoc assertion"
|
|
)
|