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
74 lines
2.4 KiB
Python
74 lines
2.4 KiB
Python
"""API schemas (Pydantic) for Child.
|
|
|
|
Schemas validate request bodies and shape responses. Separate from domain entities
|
|
so the wire format can evolve independently.
|
|
"""
|
|
|
|
from datetime import date, datetime
|
|
from uuid import UUID
|
|
|
|
from pydantic import BaseModel, Field, field_validator
|
|
|
|
from app.entities.child import Child
|
|
|
|
|
|
class ChildCreate(BaseModel):
|
|
workspace_id: UUID
|
|
name: str = Field(min_length=1, max_length=255)
|
|
birth_date: date
|
|
preschool_start_date: date | None = None
|
|
preschool_planning_days_per_year: int = Field(default=6, ge=0, le=30)
|
|
|
|
@field_validator("preschool_start_date")
|
|
@classmethod
|
|
def validate_preschool_date(cls, v: date | None, info) -> date | None:
|
|
"""Preschool start date must be after birth date if both provided."""
|
|
if v is None:
|
|
return v
|
|
birth_date = info.data.get("birth_date")
|
|
if birth_date and v <= birth_date:
|
|
raise ValueError("preschool_start_date must be after birth_date")
|
|
return v
|
|
|
|
|
|
class ChildUpdate(BaseModel):
|
|
"""Partial update — all fields optional."""
|
|
|
|
name: str | None = Field(None, min_length=1, max_length=255)
|
|
birth_date: date | None = None
|
|
preschool_start_date: date | None = None
|
|
preschool_planning_days_per_year: int | None = Field(None, ge=0, le=30)
|
|
|
|
@field_validator("preschool_start_date")
|
|
@classmethod
|
|
def validate_preschool_date(cls, v: date | None, info) -> date | None:
|
|
"""Preschool start date must be after birth date if both provided."""
|
|
if v is None:
|
|
return v
|
|
birth_date = info.data.get("birth_date")
|
|
if birth_date and v <= birth_date:
|
|
raise ValueError("preschool_start_date must be after birth_date")
|
|
return v
|
|
|
|
|
|
class ChildResponse(BaseModel):
|
|
id: UUID
|
|
workspace_id: UUID
|
|
name: str
|
|
birth_date: date
|
|
preschool_start_date: date | None
|
|
preschool_planning_days_per_year: int
|
|
created_at: datetime | None
|
|
|
|
@classmethod
|
|
def from_entity(cls, entity: Child) -> "ChildResponse":
|
|
return cls(
|
|
id=entity.id,
|
|
workspace_id=entity.workspace_id,
|
|
name=entity.name,
|
|
birth_date=entity.birth_date,
|
|
preschool_start_date=entity.preschool_start_date,
|
|
preschool_planning_days_per_year=entity.preschool_planning_days_per_year,
|
|
created_at=entity.created_at,
|
|
)
|