Complete NextSteps roadmap: planning engine UI, calendar cluster, flexible wishes
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
This commit is contained in:
@@ -1,32 +1,29 @@
|
||||
"""HTTP routes for settings and tips.
|
||||
|
||||
Covers:
|
||||
- Break periods (CRUD) — uses models/break_period.py
|
||||
- Children (CRUD) — uses models/child.py
|
||||
- Tips endpoint
|
||||
|
||||
Leave wishes (formerly "break periods") moved to their own router,
|
||||
app/routers/leave_wishes.py, at /api/leave-wishes — see PLANNING_ENGINE_SPEC.md §4.
|
||||
"""
|
||||
|
||||
from datetime import datetime
|
||||
from uuid import UUID, uuid4
|
||||
from uuid import UUID
|
||||
|
||||
from fastapi import APIRouter, HTTPException, status
|
||||
|
||||
from app.dependencies import (
|
||||
BreakPeriodRepositoryDep,
|
||||
ChildRepositoryDep,
|
||||
ChildServiceDep,
|
||||
CurrentUserDep,
|
||||
LeaveWishRepositoryDep,
|
||||
ParentalLeaveRepositoryDep,
|
||||
PersonalDataRepositoryDep,
|
||||
PersonalDataServiceDep,
|
||||
PlannedLeaveRepositoryDep,
|
||||
VacationDaysRepositoryDep,
|
||||
WorkspaceRepositoryDep,
|
||||
)
|
||||
from app.entities.break_period import BreakPeriod
|
||||
from app.models.break_period import (
|
||||
BreakPeriodCreate,
|
||||
BreakPeriodResponse,
|
||||
BreakPeriodUpdate,
|
||||
)
|
||||
from app.models.child import ChildCreate, ChildResponse, ChildUpdate
|
||||
from app.models.personal_data import PersonalDataResponse, PersonalDataUpdate
|
||||
from app.services.tips_service import TipsService
|
||||
@@ -50,11 +47,13 @@ async def get_tips(
|
||||
child_repo: ChildRepositoryDep,
|
||||
pd_repo: PersonalDataRepositoryDep,
|
||||
vacation_repo: VacationDaysRepositoryDep,
|
||||
break_repo: BreakPeriodRepositoryDep,
|
||||
leave_wish_repo: LeaveWishRepositoryDep,
|
||||
ws_repo: WorkspaceRepositoryDep,
|
||||
_current_user: CurrentUserDep,
|
||||
) -> list[dict]:
|
||||
service = TipsService(leave_repo, planned_repo, child_repo, pd_repo, vacation_repo, break_repo, ws_repo)
|
||||
service = TipsService(
|
||||
leave_repo, planned_repo, child_repo, pd_repo, vacation_repo, leave_wish_repo, ws_repo
|
||||
)
|
||||
tips = await service.get_tips(workspace_id)
|
||||
return [
|
||||
{"id": t.id, "severity": t.severity, "message_key": t.message_key, "data": t.data}
|
||||
@@ -85,6 +84,7 @@ async def create_child(
|
||||
name=payload.name,
|
||||
birth_date=payload.birth_date,
|
||||
preschool_start_date=payload.preschool_start_date,
|
||||
preschool_planning_days_per_year=payload.preschool_planning_days_per_year,
|
||||
)
|
||||
return _child_to_response(child)
|
||||
except ValidationError as exc:
|
||||
@@ -131,6 +131,7 @@ async def update_child(
|
||||
name=payload.name,
|
||||
birth_date=payload.birth_date,
|
||||
preschool_start_date=payload.preschool_start_date,
|
||||
preschool_planning_days_per_year=payload.preschool_planning_days_per_year,
|
||||
)
|
||||
return _child_to_response(child)
|
||||
except ValidationError as exc:
|
||||
@@ -155,96 +156,18 @@ async def delete_child(
|
||||
async def update_parent_settings(
|
||||
personal_data_uuid: UUID,
|
||||
payload: PersonalDataUpdate,
|
||||
repo: PersonalDataRepositoryDep,
|
||||
service: PersonalDataServiceDep,
|
||||
_current_user: CurrentUserDep,
|
||||
) -> PersonalDataResponse:
|
||||
try:
|
||||
entity = await repo.get_by_id(personal_data_uuid)
|
||||
if entity is None:
|
||||
raise HTTPException(
|
||||
status.HTTP_404_NOT_FOUND, f"PersonalData {personal_data_uuid} not found"
|
||||
)
|
||||
|
||||
# Apply partial updates
|
||||
if payload.salary_type is not None:
|
||||
entity.salary_type = payload.salary_type
|
||||
if payload.employment_status is not None:
|
||||
entity.employment_status = payload.employment_status
|
||||
|
||||
updated = await repo.update(personal_data_uuid, entity)
|
||||
updated = await service.update(
|
||||
personal_data_uuid,
|
||||
salary_type=payload.salary_type,
|
||||
employment_status=payload.employment_status,
|
||||
min_vacation_days_per_year=payload.min_vacation_days_per_year,
|
||||
)
|
||||
return PersonalDataResponse.from_entity(updated)
|
||||
except NotFoundError as exc:
|
||||
raise HTTPException(status.HTTP_404_NOT_FOUND, str(exc)) from exc
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Break periods
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
break_router = APIRouter(prefix="/api/break-periods", tags=["break-periods"])
|
||||
|
||||
|
||||
def _to_response(bp: BreakPeriod) -> BreakPeriodResponse:
|
||||
return BreakPeriodResponse.from_entity(bp)
|
||||
|
||||
|
||||
@break_router.get("/{workspace_id}", response_model=list[BreakPeriodResponse])
|
||||
async def list_break_periods(
|
||||
workspace_id: UUID,
|
||||
repo: BreakPeriodRepositoryDep,
|
||||
_current_user: CurrentUserDep,
|
||||
) -> list[BreakPeriodResponse]:
|
||||
periods = await repo.get_by_workspace(workspace_id)
|
||||
return [_to_response(bp) for bp in periods]
|
||||
|
||||
|
||||
@break_router.post("", response_model=BreakPeriodResponse, status_code=status.HTTP_201_CREATED)
|
||||
async def create_break_period(
|
||||
payload: BreakPeriodCreate,
|
||||
repo: BreakPeriodRepositoryDep,
|
||||
_current_user: CurrentUserDep,
|
||||
) -> BreakPeriodResponse:
|
||||
bp = BreakPeriod(
|
||||
id=uuid4(),
|
||||
workspace_id=payload.workspace_id,
|
||||
name=payload.name,
|
||||
start_date=payload.start_date,
|
||||
end_date=payload.end_date,
|
||||
target_weeks=payload.target_weeks,
|
||||
created_at=datetime.now(),
|
||||
updated_at=datetime.now(),
|
||||
)
|
||||
created = await repo.create(bp)
|
||||
return _to_response(created)
|
||||
|
||||
|
||||
@break_router.put("/{break_period_id}", response_model=BreakPeriodResponse)
|
||||
async def update_break_period(
|
||||
break_period_id: UUID,
|
||||
payload: BreakPeriodUpdate,
|
||||
repo: BreakPeriodRepositoryDep,
|
||||
_current_user: CurrentUserDep,
|
||||
) -> BreakPeriodResponse:
|
||||
existing = await repo.get_by_id(break_period_id)
|
||||
if existing is None:
|
||||
raise HTTPException(status.HTTP_404_NOT_FOUND, f"BreakPeriod {break_period_id} not found")
|
||||
# BreakPeriodUpdate in models/break_period.py has all fields required (not Optional).
|
||||
# Apply all fields unconditionally.
|
||||
existing.name = payload.name
|
||||
existing.start_date = payload.start_date
|
||||
existing.end_date = payload.end_date
|
||||
existing.target_weeks = payload.target_weeks
|
||||
updated = await repo.update(break_period_id, existing)
|
||||
return _to_response(updated)
|
||||
|
||||
|
||||
@break_router.delete("/{break_period_id}", status_code=status.HTTP_204_NO_CONTENT)
|
||||
async def delete_break_period(
|
||||
break_period_id: UUID,
|
||||
repo: BreakPeriodRepositoryDep,
|
||||
_current_user: CurrentUserDep,
|
||||
) -> None:
|
||||
try:
|
||||
await repo.delete(break_period_id)
|
||||
except ValidationError as exc:
|
||||
raise HTTPException(status.HTTP_422_UNPROCESSABLE_ENTITY, str(exc)) from exc
|
||||
except NotFoundError as exc:
|
||||
raise HTTPException(status.HTTP_404_NOT_FOUND, str(exc)) from exc
|
||||
|
||||
Reference in New Issue
Block a user