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
161 lines
5.0 KiB
Python
161 lines
5.0 KiB
Python
"""HTTP routes for workspace, members, and invitations."""
|
|
|
|
from uuid import UUID
|
|
|
|
from fastapi import APIRouter, HTTPException, status
|
|
|
|
from app.dependencies import CurrentUserDep, WorkspaceServiceDep
|
|
from app.models.workspace import (
|
|
InvitationResponse,
|
|
InviteResponse,
|
|
PersonalDataCreate,
|
|
PersonalDataResponse,
|
|
RedeemInviteRequest,
|
|
WorkspaceCreate,
|
|
WorkspaceResponse,
|
|
WorkspaceUpdate,
|
|
)
|
|
from app.utils.errors import InvitationError, NotFoundError, ValidationError
|
|
|
|
router = APIRouter(prefix="/api/workspace", tags=["workspace"])
|
|
|
|
|
|
@router.post("", response_model=WorkspaceResponse, status_code=status.HTTP_201_CREATED)
|
|
async def create_workspace(
|
|
payload: WorkspaceCreate,
|
|
service: WorkspaceServiceDep,
|
|
_current_user: CurrentUserDep,
|
|
) -> WorkspaceResponse:
|
|
ws = await service.create_workspace(payload.name)
|
|
return WorkspaceResponse.from_entity(ws)
|
|
|
|
|
|
@router.get("/{workspace_id}", response_model=WorkspaceResponse)
|
|
async def get_workspace(
|
|
workspace_id: UUID,
|
|
service: WorkspaceServiceDep,
|
|
_current_user: CurrentUserDep,
|
|
) -> WorkspaceResponse:
|
|
try:
|
|
ws = await service.get_workspace(workspace_id)
|
|
except NotFoundError as exc:
|
|
raise HTTPException(status.HTTP_404_NOT_FOUND, str(exc)) from exc
|
|
return WorkspaceResponse.from_entity(ws)
|
|
|
|
|
|
@router.put("/{workspace_id}", response_model=WorkspaceResponse)
|
|
async def update_workspace(
|
|
workspace_id: UUID,
|
|
payload: WorkspaceUpdate,
|
|
service: WorkspaceServiceDep,
|
|
_current_user: CurrentUserDep,
|
|
) -> WorkspaceResponse:
|
|
try:
|
|
ws = await service.update_workspace(
|
|
workspace_id, payload.name, payload.planning_goal, payload.planning_mode
|
|
)
|
|
except (NotFoundError, ValidationError) as exc:
|
|
code = (
|
|
status.HTTP_404_NOT_FOUND
|
|
if isinstance(exc, NotFoundError)
|
|
else status.HTTP_422_UNPROCESSABLE_ENTITY
|
|
)
|
|
raise HTTPException(code, str(exc)) from exc
|
|
return WorkspaceResponse.from_entity(ws)
|
|
|
|
|
|
@router.get("/{workspace_id}/members", response_model=list[PersonalDataResponse])
|
|
async def list_members(
|
|
workspace_id: UUID,
|
|
service: WorkspaceServiceDep,
|
|
_current_user: CurrentUserDep,
|
|
) -> list[PersonalDataResponse]:
|
|
members = await service.list_members(workspace_id)
|
|
return [
|
|
PersonalDataResponse(
|
|
uuid=m.uuid,
|
|
workspace_id=m.workspace_id,
|
|
name=m.name,
|
|
salary_type=m.salary_type,
|
|
employment_status=m.employment_status,
|
|
created_at=m.created_at,
|
|
)
|
|
for m in members
|
|
]
|
|
|
|
|
|
@router.post(
|
|
"/{workspace_id}/parents",
|
|
response_model=PersonalDataResponse,
|
|
status_code=status.HTTP_201_CREATED,
|
|
)
|
|
async def add_placeholder_parent(
|
|
workspace_id: UUID,
|
|
payload: PersonalDataCreate,
|
|
service: WorkspaceServiceDep,
|
|
_current_user: CurrentUserDep,
|
|
) -> PersonalDataResponse:
|
|
try:
|
|
pd = await service.add_placeholder_parent(workspace_id, payload.display_name)
|
|
except NotFoundError as exc:
|
|
raise HTTPException(status.HTTP_404_NOT_FOUND, str(exc)) from exc
|
|
return PersonalDataResponse(
|
|
uuid=pd.uuid,
|
|
workspace_id=pd.workspace_id,
|
|
name=pd.name,
|
|
salary_type=pd.salary_type,
|
|
employment_status=pd.employment_status,
|
|
created_at=pd.created_at,
|
|
)
|
|
|
|
|
|
@router.post(
|
|
"/{workspace_id}/invitations",
|
|
response_model=InviteResponse,
|
|
status_code=status.HTTP_201_CREATED,
|
|
)
|
|
async def create_invitation(
|
|
workspace_id: UUID,
|
|
service: WorkspaceServiceDep,
|
|
current_user: CurrentUserDep,
|
|
) -> InviteResponse:
|
|
try:
|
|
raw_token = await service.invite_partner(workspace_id, current_user.id)
|
|
except NotFoundError as exc:
|
|
raise HTTPException(status.HTTP_404_NOT_FOUND, str(exc)) from exc
|
|
return InviteResponse(token=raw_token)
|
|
|
|
|
|
# Invitation redemption is workspace-agnostic (token carries workspace info).
|
|
_inv_router = APIRouter(prefix="/api/invitations", tags=["invitations"])
|
|
|
|
|
|
@_inv_router.post("/redeem", response_model=InvitationResponse)
|
|
async def redeem_invitation(
|
|
payload: RedeemInviteRequest,
|
|
service: WorkspaceServiceDep,
|
|
current_user: CurrentUserDep,
|
|
) -> InvitationResponse:
|
|
try:
|
|
inv = await service.redeem_invitation(payload.token, current_user.personal_data_uuid)
|
|
except (InvitationError, NotFoundError) as exc:
|
|
raise HTTPException(status.HTTP_400_BAD_REQUEST, str(exc)) from exc
|
|
return InvitationResponse.from_entity(inv)
|
|
|
|
|
|
@_inv_router.delete("/{invitation_id}", status_code=status.HTTP_204_NO_CONTENT)
|
|
async def revoke_invitation(
|
|
invitation_id: UUID,
|
|
service: WorkspaceServiceDep,
|
|
_current_user: CurrentUserDep,
|
|
) -> None:
|
|
try:
|
|
await service.revoke_invitation(invitation_id)
|
|
except (NotFoundError, ValidationError) as exc:
|
|
code = (
|
|
status.HTTP_404_NOT_FOUND
|
|
if isinstance(exc, NotFoundError)
|
|
else status.HTTP_422_UNPROCESSABLE_ENTITY
|
|
)
|
|
raise HTTPException(code, str(exc)) from exc
|