justin
58400ffdf7
The person page fetched the entire tree on every open — all persons (to build a
name map + power the relative pickers) and all events (to find partnership
events). On a 2k-person tree that's a ~230KB person list + ~600KB event list per
view. Now it loads only what the page shows:
Frontend:
- The relationship & spouse pickers use the backend's fuzzy pg_trgm search
(debounced, typo-tolerant) instead of substring-filtering a preloaded array —
better search, and no need to preload every person. PersonCombobox gained an
`onSearch` server mode (client `people` mode still works).
- The page drops the all-persons and all-events fetches; it resolves just this
person's relatives' names via GET /persons?ids=..., and reads partnership
events from the per-person events endpoint.
Backend:
- GET /trees/{id}/persons?ids=a,b,c — batch by id (privacy-filtered, names
batched), for relative-name display.
- list_events_for_person (member path) now also returns the person's partnership
events, so the page needn't scan every event in the tree.
Adversarial review (frontend logic + backend/privacy) found no issues. Suite 105
passing.
Signed-off-by: Justin Paul <justin@jpaul.me>
124 lines
4.3 KiB
Python
124 lines
4.3 KiB
Python
import uuid
|
|
|
|
from fastapi import APIRouter, HTTPException, status
|
|
|
|
from app.api.deps import CurrentUser, SessionDep
|
|
from app.schemas.person import PersonCreate, PersonRead, PersonUpdate
|
|
from app.services import person_service, tree_service
|
|
|
|
# Persons are nested under their tree (the tenant boundary).
|
|
router = APIRouter(prefix="/trees", tags=["persons"])
|
|
|
|
|
|
@router.post(
|
|
"/{tree_id}/persons",
|
|
response_model=PersonRead,
|
|
status_code=status.HTTP_201_CREATED,
|
|
)
|
|
async def create_person(
|
|
tree_id: uuid.UUID, data: PersonCreate, session: SessionDep, current: CurrentUser
|
|
) -> PersonRead:
|
|
# get_tree enforces existence + view access; create_person enforces edit rights.
|
|
tree = await tree_service.get_tree(session, viewer_id=current.id, tree_id=tree_id)
|
|
person = await person_service.create_person(
|
|
session,
|
|
actor=current,
|
|
tree=tree,
|
|
given=data.given,
|
|
surname=data.surname,
|
|
gender=data.gender,
|
|
is_living=data.is_living,
|
|
privacy_setting=data.privacy,
|
|
notes=data.notes,
|
|
)
|
|
return PersonRead.model_validate(person)
|
|
|
|
|
|
@router.get("/{tree_id}/persons", response_model=list[PersonRead])
|
|
async def list_persons(
|
|
tree_id: uuid.UUID,
|
|
session: SessionDep,
|
|
current: CurrentUser,
|
|
deleted: bool = False,
|
|
q: str | None = None,
|
|
ids: str | None = None,
|
|
) -> list[PersonRead]:
|
|
tree = await tree_service.get_tree(session, viewer_id=current.id, tree_id=tree_id)
|
|
if ids is not None:
|
|
try:
|
|
id_list = [uuid.UUID(x) for x in ids.split(",") if x.strip()]
|
|
except ValueError as exc:
|
|
raise HTTPException(status.HTTP_422_UNPROCESSABLE_ENTITY, "invalid ids") from exc
|
|
persons = await person_service.list_persons_by_ids(
|
|
session, viewer_id=current.id, tree=tree, ids=id_list
|
|
)
|
|
elif q:
|
|
persons = await person_service.search_persons(
|
|
session, viewer_id=current.id, tree=tree, query=q
|
|
)
|
|
elif deleted:
|
|
persons = await person_service.list_deleted_persons(
|
|
session, viewer_id=current.id, tree=tree
|
|
)
|
|
else:
|
|
persons = await person_service.list_persons(session, viewer_id=current.id, tree=tree)
|
|
return [PersonRead.model_validate(p) for p in persons]
|
|
|
|
|
|
@router.patch("/{tree_id}/persons/{person_id}", response_model=PersonRead)
|
|
async def update_person(
|
|
tree_id: uuid.UUID,
|
|
person_id: uuid.UUID,
|
|
data: PersonUpdate,
|
|
session: SessionDep,
|
|
current: CurrentUser,
|
|
) -> PersonRead:
|
|
tree = await tree_service.get_tree(session, viewer_id=current.id, tree_id=tree_id)
|
|
person = await person_service.update_person(
|
|
session,
|
|
actor=current,
|
|
tree=tree,
|
|
person_id=person_id,
|
|
changes=data.model_dump(exclude_unset=True),
|
|
)
|
|
return PersonRead.model_validate(person)
|
|
|
|
|
|
@router.delete("/{tree_id}/persons/{person_id}")
|
|
async def delete_person(
|
|
tree_id: uuid.UUID,
|
|
person_id: uuid.UUID,
|
|
session: SessionDep,
|
|
current: CurrentUser,
|
|
cascade: bool = False,
|
|
) -> dict[str, int]:
|
|
"""Delete a person. ``cascade=true`` also deletes all descendants. Returns
|
|
the number of persons deleted (1 unless cascading)."""
|
|
tree = await tree_service.get_tree(session, viewer_id=current.id, tree_id=tree_id)
|
|
deleted = await person_service.delete_person(
|
|
session, actor=current, tree=tree, person_id=person_id, cascade=cascade
|
|
)
|
|
return {"deleted": deleted}
|
|
|
|
|
|
@router.post("/{tree_id}/persons/{person_id}/restore", response_model=PersonRead)
|
|
async def restore_person(
|
|
tree_id: uuid.UUID, person_id: uuid.UUID, session: SessionDep, current: CurrentUser
|
|
) -> PersonRead:
|
|
tree = await tree_service.get_tree(session, viewer_id=current.id, tree_id=tree_id)
|
|
person = await person_service.restore_person(
|
|
session, actor=current, tree=tree, person_id=person_id
|
|
)
|
|
return PersonRead.model_validate(person)
|
|
|
|
|
|
@router.get("/{tree_id}/persons/{person_id}", response_model=PersonRead)
|
|
async def get_person(
|
|
tree_id: uuid.UUID, person_id: uuid.UUID, session: SessionDep, current: CurrentUser
|
|
) -> PersonRead:
|
|
tree = await tree_service.get_tree(session, viewer_id=current.id, tree_id=tree_id)
|
|
person = await person_service.get_person(
|
|
session, viewer_id=current.id, tree=tree, person_id=person_id
|
|
)
|
|
return PersonRead.model_validate(person)
|