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
65 lines
1.9 KiB
Python
65 lines
1.9 KiB
Python
"""API schemas (Pydantic) for the Swedish calendar endpoint (röda dagar /
|
|
klämdagar).
|
|
|
|
Wire format for `GET /api/calendar/days` — serves both §3.4 (shading the
|
|
Kalender page) and §3.8 (the per-year red-days list in Settings) from one
|
|
endpoint. Kept separate from the service's dataclasses so the wire format can
|
|
evolve independently.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from datetime import date
|
|
|
|
from pydantic import BaseModel, Field
|
|
|
|
from app.services.calendar_service import CalendarDay, CalendarWindow, DayType
|
|
|
|
|
|
class CalendarDayResponse(BaseModel):
|
|
date: date
|
|
name: str | None
|
|
day_type: DayType
|
|
is_override: bool
|
|
override_is_working_day: bool | None
|
|
is_free: bool
|
|
|
|
@classmethod
|
|
def from_domain(cls, day: CalendarDay) -> "CalendarDayResponse":
|
|
return cls(
|
|
date=day.date,
|
|
name=day.name,
|
|
day_type=day.day_type,
|
|
is_override=day.is_override,
|
|
override_is_working_day=day.override_is_working_day,
|
|
is_free=day.is_free,
|
|
)
|
|
|
|
|
|
class CalendarDaysResponse(BaseModel):
|
|
"""A `years`-year window of calendar days (max `MAX_WINDOW_YEARS`,
|
|
currently 4), plus the full cached range so the UI can bound its
|
|
pagination controls.
|
|
"""
|
|
|
|
start_year: int
|
|
end_year: int
|
|
min_year: int | None = Field(
|
|
default=None,
|
|
description="First year covered by the cache, or None if the cache is missing.",
|
|
)
|
|
max_year: int | None = Field(
|
|
default=None, description="Last year covered by the cache, or None if the cache is missing."
|
|
)
|
|
days: list[CalendarDayResponse]
|
|
|
|
@classmethod
|
|
def from_domain(cls, window: CalendarWindow) -> "CalendarDaysResponse":
|
|
return cls(
|
|
start_year=window.start_year,
|
|
end_year=window.end_year,
|
|
min_year=window.min_year,
|
|
max_year=window.max_year,
|
|
days=[CalendarDayResponse.from_domain(d) for d in window.days],
|
|
)
|