Track preschool planning days, partner invites and real vacation forfeiture
Three strands of work that grew together across the same settings screen and
API client, so they land as one change.
Per-year preschool planning days ("studiedagar"): new table, repository
(SQLite + Postgres), service, router and migration 007, plus the hooks and
Settings UI to plan and record them per child and year. Allocation now
reserves the recorded figure for a year where one exists and only falls back
to the child-level estimate otherwise, marking that fallback as assumed.
Partner invitations: workspaces issue and list invitations, registration
accepts an invite token to join the inviter's workspace instead of creating a
personal one, and a /join/:token page plus the settings invite panel drive it.
Vacation forfeiture: tips and the dashboard now distinguish days a parent
genuinely loses from days that merely age, so the warning stops firing on
balances that were never at risk.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,10 +1,17 @@
|
||||
"""Tests for AuthService: register, login, token round-trip."""
|
||||
|
||||
from datetime import datetime
|
||||
from uuid import uuid4
|
||||
|
||||
import pytest
|
||||
|
||||
from app.entities.user import User
|
||||
from app.repositories_impl.sqlite.personal_data_repository import SQLitePersonalDataRepository
|
||||
from app.repositories_impl.sqlite.user_repository import SQLiteUserRepository
|
||||
from app.repositories_impl.sqlite.workspace_repository import SQLiteWorkspaceRepository
|
||||
from app.services.auth_service import AuthService
|
||||
from app.utils.errors import AuthError, ConflictError, UnauthorizedError
|
||||
from app.services.workspace_service import WorkspaceService
|
||||
from app.utils.errors import AuthError, ConflictError, InvitationError, UnauthorizedError
|
||||
|
||||
|
||||
class TestAuthServiceRegisterLogin:
|
||||
@@ -104,3 +111,126 @@ class TestAuthServiceTokens:
|
||||
|
||||
with pytest.raises(UnauthorizedError):
|
||||
await auth_service.get_user_from_token(token)
|
||||
|
||||
|
||||
class TestAuthServiceRegisterWithInviteToken:
|
||||
"""`register(..., invite_token=...)` lets a partner join straight from an
|
||||
invite link instead of first creating a throwaway solo workspace. Mirrors
|
||||
`WorkspaceService.redeem_invitation`'s claim logic -- see
|
||||
`test_workspace_service.py::TestInvitationScoping` for the service-level
|
||||
coverage of that logic; these tests cover the registration entry point.
|
||||
"""
|
||||
|
||||
async def test_claims_existing_placeholder(
|
||||
self,
|
||||
auth_service: AuthService,
|
||||
workspace_service: WorkspaceService,
|
||||
user_repo: SQLiteUserRepository,
|
||||
) -> None:
|
||||
ws = await workspace_service.create_workspace("Shared plan")
|
||||
owner_pd = await workspace_service.add_placeholder_parent(ws.id, "Owner")
|
||||
owner_user = await user_repo.create(
|
||||
User(
|
||||
id=uuid4(),
|
||||
personal_data_uuid=owner_pd.uuid,
|
||||
email="owner@example.com",
|
||||
hashed_password="not-a-real-hash",
|
||||
created_at=datetime.now(),
|
||||
)
|
||||
)
|
||||
placeholder = await workspace_service.add_placeholder_parent(ws.id, "Partner")
|
||||
token = await workspace_service.invite_partner(ws.id, owner_user.id)
|
||||
|
||||
user, pd = await auth_service.register(
|
||||
"partner@example.com", "password123", "Partner Real Name", invite_token=token
|
||||
)
|
||||
|
||||
assert pd.uuid == placeholder.uuid
|
||||
assert pd.name == "Partner Real Name"
|
||||
assert user.personal_data_uuid == placeholder.uuid
|
||||
|
||||
members = await workspace_service.list_members(ws.id)
|
||||
assert {m.name for m in members} == {"Owner", "Partner Real Name"}
|
||||
|
||||
async def test_joins_free_slot_when_no_placeholder_exists(
|
||||
self,
|
||||
auth_service: AuthService,
|
||||
workspace_service: WorkspaceService,
|
||||
user_repo: SQLiteUserRepository,
|
||||
) -> None:
|
||||
ws = await workspace_service.create_workspace("Shared plan")
|
||||
owner_pd = await workspace_service.add_placeholder_parent(ws.id, "Owner")
|
||||
owner_user = await user_repo.create(
|
||||
User(
|
||||
id=uuid4(),
|
||||
personal_data_uuid=owner_pd.uuid,
|
||||
email="owner2@example.com",
|
||||
hashed_password="not-a-real-hash",
|
||||
created_at=datetime.now(),
|
||||
)
|
||||
)
|
||||
token = await workspace_service.invite_partner(ws.id, owner_user.id)
|
||||
|
||||
user, pd = await auth_service.register(
|
||||
"joiner@example.com", "password123", "Joiner", invite_token=token
|
||||
)
|
||||
|
||||
assert pd.workspace_id == ws.id
|
||||
assert user.personal_data_uuid == pd.uuid
|
||||
members = await workspace_service.list_members(ws.id)
|
||||
assert {m.name for m in members} == {"Owner", "Joiner"}
|
||||
|
||||
async def test_invalid_token_raises_invitation_error(self, auth_service: AuthService) -> None:
|
||||
with pytest.raises(InvitationError, match="not found"):
|
||||
await auth_service.register(
|
||||
"nope@example.com", "password123", "Nope", invite_token="bogus-token"
|
||||
)
|
||||
|
||||
async def test_refuses_when_both_slots_have_real_logins(
|
||||
self,
|
||||
auth_service: AuthService,
|
||||
workspace_service: WorkspaceService,
|
||||
user_repo: SQLiteUserRepository,
|
||||
) -> None:
|
||||
ws = await workspace_service.create_workspace("Shared plan")
|
||||
owner_pd = await workspace_service.add_placeholder_parent(ws.id, "Owner")
|
||||
owner_user = await user_repo.create(
|
||||
User(
|
||||
id=uuid4(),
|
||||
personal_data_uuid=owner_pd.uuid,
|
||||
email="owner3@example.com",
|
||||
hashed_password="not-a-real-hash",
|
||||
created_at=datetime.now(),
|
||||
)
|
||||
)
|
||||
second_pd = await workspace_service.add_placeholder_parent(ws.id, "Partner")
|
||||
await user_repo.create(
|
||||
User(
|
||||
id=uuid4(),
|
||||
personal_data_uuid=second_pd.uuid,
|
||||
email="partner3@example.com",
|
||||
hashed_password="not-a-real-hash",
|
||||
created_at=datetime.now(),
|
||||
)
|
||||
)
|
||||
token = await workspace_service.invite_partner(ws.id, owner_user.id)
|
||||
|
||||
with pytest.raises(InvitationError, match="maximum number of members"):
|
||||
await auth_service.register(
|
||||
"late@example.com", "password123", "Late", invite_token=token
|
||||
)
|
||||
|
||||
async def test_raises_when_invitations_not_configured(
|
||||
self,
|
||||
user_repo: SQLiteUserRepository,
|
||||
personal_data_repo: SQLitePersonalDataRepository,
|
||||
workspace_repo: SQLiteWorkspaceRepository,
|
||||
) -> None:
|
||||
"""A direct-construction call site (e.g. a script) that never wires
|
||||
`inv_repo` gets a clear error rather than a crash if it's ever
|
||||
handed an invite token."""
|
||||
bare_auth_service = AuthService(user_repo, personal_data_repo, workspace_repo)
|
||||
with pytest.raises(InvitationError, match="not available"):
|
||||
await bare_auth_service.register(
|
||||
"x@example.com", "password123", "X", invite_token="whatever"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user