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
90 lines
3.1 KiB
Python
90 lines
3.1 KiB
Python
"""Business logic for child management."""
|
|
|
|
from datetime import datetime
|
|
from uuid import UUID, uuid4
|
|
|
|
from app.entities.child import Child
|
|
from app.repositories.child_repository import ChildRepository
|
|
from app.utils.errors import NotFoundError, ValidationError
|
|
|
|
|
|
class ChildService:
|
|
def __init__(self, repo: ChildRepository) -> None:
|
|
self._repo = repo
|
|
|
|
async def create(
|
|
self,
|
|
workspace_id: UUID,
|
|
name: str,
|
|
birth_date,
|
|
preschool_start_date=None,
|
|
preschool_planning_days_per_year: int = 6,
|
|
) -> Child:
|
|
"""Create a new child."""
|
|
if preschool_start_date is not None and preschool_start_date <= birth_date:
|
|
raise ValidationError("preschool_start_date must be after birth_date")
|
|
_validate_preschool_planning_days(preschool_planning_days_per_year)
|
|
|
|
now = datetime.now()
|
|
entity = Child(
|
|
id=uuid4(),
|
|
workspace_id=workspace_id,
|
|
name=name,
|
|
birth_date=birth_date,
|
|
preschool_start_date=preschool_start_date,
|
|
preschool_planning_days_per_year=preschool_planning_days_per_year,
|
|
created_at=now,
|
|
)
|
|
return await self._repo.create(entity)
|
|
|
|
async def get(self, child_id: UUID) -> Child:
|
|
"""Get a child by ID."""
|
|
entity = await self._repo.get_by_id(child_id)
|
|
if entity is None:
|
|
raise NotFoundError(f"Child {child_id} not found")
|
|
return entity
|
|
|
|
async def list_by_workspace(self, workspace_id: UUID) -> list[Child]:
|
|
"""Get all children in a workspace."""
|
|
return await self._repo.list_by_workspace(workspace_id)
|
|
|
|
async def update(
|
|
self,
|
|
child_id: UUID,
|
|
name: str | None = None,
|
|
birth_date=None,
|
|
preschool_start_date=None,
|
|
preschool_planning_days_per_year: int | None = None,
|
|
) -> Child:
|
|
"""Update a child (partial update)."""
|
|
entity = await self.get(child_id)
|
|
|
|
if name is not None:
|
|
entity.name = name
|
|
if birth_date is not None:
|
|
entity.birth_date = birth_date
|
|
if preschool_start_date is not None:
|
|
entity.preschool_start_date = preschool_start_date
|
|
if preschool_planning_days_per_year is not None:
|
|
_validate_preschool_planning_days(preschool_planning_days_per_year)
|
|
entity.preschool_planning_days_per_year = preschool_planning_days_per_year
|
|
|
|
# Validate after all updates
|
|
if (
|
|
entity.preschool_start_date is not None
|
|
and entity.preschool_start_date <= entity.birth_date
|
|
):
|
|
raise ValidationError("preschool_start_date must be after birth_date")
|
|
|
|
return await self._repo.update(child_id, entity)
|
|
|
|
async def delete(self, child_id: UUID) -> None:
|
|
"""Delete a child."""
|
|
await self.get(child_id) # raises NotFoundError if missing
|
|
await self._repo.delete(child_id)
|
|
|
|
|
|
def _validate_preschool_planning_days(value: int) -> None:
|
|
if not 0 <= value <= 30:
|
|
raise ValidationError("preschool_planning_days_per_year must be between 0 and 30")
|