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
57 lines
2.2 KiB
Python
57 lines
2.2 KiB
Python
"""Business logic for PersonalData (parent profile) settings.
|
|
|
|
Routers call services, not repositories directly (see child_service.py, the
|
|
reference service). This currently only covers the settings-update path
|
|
(`salary_type`, `employment_status`, `min_vacation_days_per_year`) — creation
|
|
lives in AuthService/WorkspaceService, which construct PersonalData directly
|
|
as part of registration/invite flows.
|
|
"""
|
|
|
|
from uuid import UUID
|
|
|
|
from app.entities.personal_data import PersonalData
|
|
from app.repositories.personal_data_repository import PersonalDataRepository
|
|
from app.utils.errors import NotFoundError, ValidationError
|
|
|
|
_MIN_VACATION_DAYS_FLOOR = 0
|
|
_MIN_VACATION_DAYS_CEILING = 60 # generous upper bound; real cap is entitlement-dependent
|
|
|
|
|
|
class PersonalDataService:
|
|
def __init__(self, repo: PersonalDataRepository) -> None:
|
|
self._repo = repo
|
|
|
|
async def get(self, personal_data_uuid: UUID) -> PersonalData:
|
|
entity = await self._repo.get_by_id(personal_data_uuid)
|
|
if entity is None:
|
|
raise NotFoundError(f"PersonalData {personal_data_uuid} not found")
|
|
return entity
|
|
|
|
async def update(
|
|
self,
|
|
personal_data_uuid: UUID,
|
|
salary_type: str | None = None,
|
|
employment_status: str | None = None,
|
|
min_vacation_days_per_year: int | None = None,
|
|
) -> PersonalData:
|
|
"""Partial update. Raises ValidationError/NotFoundError."""
|
|
entity = await self.get(personal_data_uuid)
|
|
|
|
if salary_type is not None:
|
|
entity.salary_type = salary_type
|
|
if employment_status is not None:
|
|
entity.employment_status = employment_status
|
|
if min_vacation_days_per_year is not None:
|
|
_validate_min_vacation_days(min_vacation_days_per_year)
|
|
entity.min_vacation_days_per_year = min_vacation_days_per_year
|
|
|
|
return await self._repo.update(personal_data_uuid, entity)
|
|
|
|
|
|
def _validate_min_vacation_days(value: int) -> None:
|
|
if not _MIN_VACATION_DAYS_FLOOR <= value <= _MIN_VACATION_DAYS_CEILING:
|
|
raise ValidationError(
|
|
f"min_vacation_days_per_year must be between {_MIN_VACATION_DAYS_FLOOR} "
|
|
f"and {_MIN_VACATION_DAYS_CEILING}"
|
|
)
|