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
119 lines
3.8 KiB
Python
119 lines
3.8 KiB
Python
"""API schemas (Pydantic) for LeaveWish.
|
|
|
|
Schemas validate request bodies and shape responses. Separate from domain entities
|
|
so the wire format can evolve independently. Business-rule validation (e.g. the
|
|
parent_mode / parent_personal_data_uuid pairing) lives in the service, not here —
|
|
these schemas only enforce shape and range.
|
|
"""
|
|
|
|
from datetime import datetime
|
|
from uuid import UUID
|
|
|
|
from pydantic import BaseModel, Field
|
|
|
|
from app.entities.leave_wish import LeaveWish
|
|
|
|
|
|
class LeaveWishCreate(BaseModel):
|
|
workspace_id: UUID
|
|
child_id: UUID | None = None
|
|
name: str = Field(min_length=1, max_length=255)
|
|
|
|
window_start_month: int = Field(ge=1, le=12)
|
|
window_start_day: int = Field(ge=1, le=31)
|
|
window_end_month: int = Field(ge=1, le=12)
|
|
window_end_day: int = Field(ge=1, le=31)
|
|
|
|
target_weeks: int = Field(ge=1, le=52)
|
|
recurrence: str = "once" # 'yearly' | 'once'
|
|
first_year: int = Field(ge=2000, le=2200)
|
|
last_year: int | None = Field(default=None, ge=2000, le=2200)
|
|
|
|
priority: int = Field(default=1, ge=1)
|
|
parent_mode: str = "either" # 'either' | 'both' | 'specific'
|
|
parent_personal_data_uuid: UUID | None = None
|
|
|
|
goal_override: str | None = None # 'max_time' | 'max_money' | 'balanced' | None
|
|
|
|
# PLANNING_ENGINE_SPEC.md §10.1 — 'fixed': window_start_*/window_end_* are the
|
|
# exact placement (default). 'flexible': the same fields describe the
|
|
# bounding range the allocator searches within for the best-costing window.
|
|
window_mode: str = "fixed" # 'fixed' | 'flexible'
|
|
|
|
|
|
class LeaveWishUpdate(BaseModel):
|
|
"""Partial update — all fields optional; only provided fields are changed."""
|
|
|
|
child_id: UUID | None = None
|
|
name: str | None = Field(None, min_length=1, max_length=255)
|
|
|
|
window_start_month: int | None = Field(None, ge=1, le=12)
|
|
window_start_day: int | None = Field(None, ge=1, le=31)
|
|
window_end_month: int | None = Field(None, ge=1, le=12)
|
|
window_end_day: int | None = Field(None, ge=1, le=31)
|
|
|
|
target_weeks: int | None = Field(None, ge=1, le=52)
|
|
recurrence: str | None = None
|
|
first_year: int | None = Field(None, ge=2000, le=2200)
|
|
last_year: int | None = Field(None, ge=2000, le=2200)
|
|
|
|
priority: int | None = Field(None, ge=1)
|
|
parent_mode: str | None = None
|
|
parent_personal_data_uuid: UUID | None = None
|
|
|
|
goal_override: str | None = None
|
|
|
|
window_mode: str | None = None # 'fixed' | 'flexible'
|
|
|
|
|
|
class LeaveWishResponse(BaseModel):
|
|
id: UUID
|
|
workspace_id: UUID
|
|
child_id: UUID | None
|
|
name: str
|
|
|
|
window_start_month: int
|
|
window_start_day: int
|
|
window_end_month: int
|
|
window_end_day: int
|
|
|
|
target_weeks: int
|
|
recurrence: str
|
|
first_year: int
|
|
last_year: int | None
|
|
|
|
priority: int
|
|
parent_mode: str
|
|
parent_personal_data_uuid: UUID | None
|
|
|
|
goal_override: str | None
|
|
|
|
window_mode: str
|
|
|
|
created_at: datetime | None
|
|
updated_at: datetime | None
|
|
|
|
@classmethod
|
|
def from_entity(cls, entity: LeaveWish) -> "LeaveWishResponse":
|
|
return cls(
|
|
id=entity.id,
|
|
workspace_id=entity.workspace_id,
|
|
child_id=entity.child_id,
|
|
name=entity.name,
|
|
window_start_month=entity.window_start_month,
|
|
window_start_day=entity.window_start_day,
|
|
window_end_month=entity.window_end_month,
|
|
window_end_day=entity.window_end_day,
|
|
target_weeks=entity.target_weeks,
|
|
recurrence=entity.recurrence,
|
|
first_year=entity.first_year,
|
|
last_year=entity.last_year,
|
|
priority=entity.priority,
|
|
parent_mode=entity.parent_mode,
|
|
parent_personal_data_uuid=entity.parent_personal_data_uuid,
|
|
goal_override=entity.goal_override,
|
|
window_mode=entity.window_mode,
|
|
created_at=entity.created_at,
|
|
updated_at=entity.updated_at,
|
|
)
|