diff --git a/src/organisation/router.py b/src/organisation/router.py index cd1cdb8..8b09544 100644 --- a/src/organisation/router.py +++ b/src/organisation/router.py @@ -265,7 +265,7 @@ async def get_users(org_model: org_model_root_claim_query_dependency): Returns a list of the email addresses of all users of the organisation. """ return { - "users": [user.email for user in org_model.user_rel], + "users": [{"email": user.email, "id": user.id} for user in org_model.user_rel], "organisation": org_model, } diff --git a/src/organisation/schemas.py b/src/organisation/schemas.py index c474544..2d8c1b9 100644 --- a/src/organisation/schemas.py +++ b/src/organisation/schemas.py @@ -92,7 +92,7 @@ class OrgPatchRootResponse(CustomBaseModel): class OrgGetUserResponse(CustomBaseModel): - users: list[str] + users: list[dict[str, str | int]] organisation: OrgSchema diff --git a/test/test_organisation.py b/test/test_organisation.py index 03271dc..8155f5c 100644 --- a/test/test_organisation.py +++ b/test/test_organisation.py @@ -208,10 +208,15 @@ async def test_get_org_users_success(default_client: AsyncClient): data = resp.json() assert resp.status_code == 200 + assert "users" in data assert isinstance(data["users"], list) assert len(data["users"]) == 1 - assert data["users"][0] == "admin@test.com" + + user = data["users"][0] + assert isinstance(user, dict) + assert user["email"] == "admin@test.com" + assert user["id"] == 1 assert "organisation" in data assert data["organisation"]["name"] == "Test Org"