jacobh2
76b1e712b9
Works through every numbered item in NextSteps260913.md section 3, plus the three known verification issues in section 4.1. Surface what the backend already computed: - 3.1 render surplus_advice in PlanResults, mirroring the shortfall remedies - 3.2 surface VacationBalance.is_assumed so assumed statutory years are visible - 3.3 age-4 expiry given the proposed plan, via a new Age4Projection reusing the existing _age4_projections arithmetic (Dashboard stat verified, not rebuilt) Calendar cluster (one pass over the holiday data): - new GET /api/calendar/days exposing roda dagar, klamdagar and day overrides, paginated four years at a time - 3.4 shade roda dagar/klamdagar, with R/K badges so colour is not the only signal - 3.6 click-to-override behind an explicit mode toggle, leaving drag multi-select intact - 3.7 click month/year to advance - 3.8 per-year red-days list in Settings, statutory days plus overrides i18n: - 3.5 five backend-generated Swedish surfaces converted to message_key + data, following the tips_service pattern; old string fields replaced, not kept Flexible wishes (3.9): - PLANNING_ENGINE_SPEC section 10: window_mode, candidate search, cost function, deterministic tie-break, two-pass ordering, test matrix rows 15-24 - backend: entity, migration 006, _FULL_SCHEMA sync, repository, allocator - frontend: season-preset toggle in WishEditor, unplaced outcome rendering Fixes (4.1): - pin typecheck to the local tsc rather than npx resolving a newer TypeScript - ignore generated coverage/ and dist/ in the ESLint flat config - fix the flaky usePlanApply test properly, with waitFor rather than a retry Tests: backend 361 -> 404, frontend 540 -> 704. Coverage 89.47% -> 96.52% lines. Not yet verified in a browser. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01RXMhc9nT6sNz1SL4j8dznL
104 lines
3.8 KiB
Python
104 lines
3.8 KiB
Python
"""SQLite implementation of ChildRepository."""
|
|
|
|
from datetime import date, datetime
|
|
from uuid import UUID
|
|
|
|
import aiosqlite
|
|
|
|
from app.entities.child import Child
|
|
from app.repositories.child_repository import ChildRepository
|
|
from app.utils.errors import NotFoundError
|
|
|
|
|
|
class SQLiteChildRepository(ChildRepository):
|
|
def __init__(self, connection: aiosqlite.Connection) -> None:
|
|
self._conn = connection
|
|
|
|
@staticmethod
|
|
def _row_to_entity(row: aiosqlite.Row) -> Child:
|
|
return Child(
|
|
id=UUID(row["id"]),
|
|
workspace_id=UUID(row["workspace_id"]),
|
|
name=row["name"],
|
|
birth_date=date.fromisoformat(row["birth_date"]),
|
|
preschool_start_date=(
|
|
date.fromisoformat(row["preschool_start_date"])
|
|
if row["preschool_start_date"]
|
|
else None
|
|
),
|
|
preschool_planning_days_per_year=row["preschool_planning_days_per_year"],
|
|
created_at=datetime.fromisoformat(row["created_at"]),
|
|
)
|
|
|
|
async def create(self, item: Child) -> Child:
|
|
item.created_at = item.created_at or datetime.now()
|
|
await self._conn.execute(
|
|
"""
|
|
INSERT INTO child
|
|
(id, workspace_id, name, birth_date, preschool_start_date,
|
|
preschool_planning_days_per_year, created_at)
|
|
VALUES (?, ?, ?, ?, ?, ?, ?)
|
|
""",
|
|
(
|
|
str(item.id),
|
|
str(item.workspace_id),
|
|
item.name,
|
|
item.birth_date.isoformat(),
|
|
item.preschool_start_date.isoformat() if item.preschool_start_date else None,
|
|
item.preschool_planning_days_per_year,
|
|
item.created_at.isoformat(),
|
|
),
|
|
)
|
|
await self._conn.commit()
|
|
return item
|
|
|
|
async def get_by_id(self, id: UUID) -> Child | None:
|
|
cursor = await self._conn.execute("SELECT * FROM child WHERE id = ?", (str(id),))
|
|
row = await cursor.fetchone()
|
|
return self._row_to_entity(row) if row else None
|
|
|
|
async def update(self, id: UUID, item: Child) -> Child:
|
|
cursor = await self._conn.execute(
|
|
"""
|
|
UPDATE child
|
|
SET name = ?, birth_date = ?, preschool_start_date = ?,
|
|
preschool_planning_days_per_year = ?
|
|
WHERE id = ?
|
|
""",
|
|
(
|
|
item.name,
|
|
item.birth_date.isoformat(),
|
|
item.preschool_start_date.isoformat() if item.preschool_start_date else None,
|
|
item.preschool_planning_days_per_year,
|
|
str(id),
|
|
),
|
|
)
|
|
await self._conn.commit()
|
|
if cursor.rowcount == 0:
|
|
raise NotFoundError(f"Child {id} not found")
|
|
refreshed = await self.get_by_id(id)
|
|
assert refreshed is not None
|
|
return refreshed
|
|
|
|
async def delete(self, id: UUID) -> None:
|
|
cursor = await self._conn.execute("DELETE FROM child WHERE id = ?", (str(id),))
|
|
await self._conn.commit()
|
|
if cursor.rowcount == 0:
|
|
raise NotFoundError(f"Child {id} not found")
|
|
|
|
async def list(self, **filters: object) -> list[Child]:
|
|
clauses: list[str] = []
|
|
params: list[object] = []
|
|
if "workspace_id" in filters and filters["workspace_id"] is not None:
|
|
clauses.append("workspace_id = ?")
|
|
params.append(str(filters["workspace_id"]))
|
|
where = f" WHERE {' AND '.join(clauses)}" if clauses else ""
|
|
cursor = await self._conn.execute(
|
|
f"SELECT * FROM child{where} ORDER BY birth_date ASC", params
|
|
)
|
|
rows = await cursor.fetchall()
|
|
return [self._row_to_entity(r) for r in rows]
|
|
|
|
async def list_by_workspace(self, workspace_id: UUID) -> list[Child]:
|
|
return await self.list(workspace_id=workspace_id)
|