[US-9.1 / OBT-216] Include team_size in project data

app/api/projects/core.py

@@ -28,7 +28,7 @@ async def list_projects(
     projects = await project_service.list_projects_for_user(
         db, user, str(organization_id) if organization_id else None, language_id
     )
-    return [ProjectResponse.model_validate(p) for p in projects]
+    return await project_service.serialize_projects(db, projects)
 
 
 @router.post("", response_model=ProjectResponse, status_code=status.HTTP_201_CREATED)
@@ -47,7 +47,7 @@ async def create_project(
         location_display_name=payload.location_display_name,
         creator_user_id=str(user.id),
     )
-    return ProjectResponse.model_validate(project)
+    return await project_service.serialize_project(db, project)
 
 
 @router.get("/{project_id}", response_model=ProjectResponse)
@@ -58,7 +58,7 @@ async def get_project(
 ) -> ProjectResponse:
     project = await project_service.get_project_or_404(db, project_id)
     await assert_project_access(db, user, project_id)
-    return ProjectResponse.model_validate(project)
+    return await project_service.serialize_project(db, project)
 
 
 @router.patch("/{project_id}", response_model=ProjectResponse)
@@ -76,7 +76,7 @@ async def update_project(
         description=payload.description,
         language_id=payload.language_id,
     )
-    return ProjectResponse.model_validate(project)
+    return await project_service.serialize_project(db, project)
 
 
 @router.patch("/{project_id}/location", response_model=ProjectResponse)
@@ -94,4 +94,4 @@ async def update_project_location(
         longitude=payload.longitude,
         location_display_name=payload.location_display_name,
     )
-    return ProjectResponse.model_validate(project)
+    return await project_service.serialize_project(db, project)

app/models/project.py

@@ -23,6 +23,7 @@ class ProjectResponse(BaseModel):
     location_display_name: str | None
     created_at: datetime
     updated_at: datetime
+    team_size: int = 0
 
     model_config = {"from_attributes": True}
 

app/services/project/__init__.py

@@ -1,4 +1,5 @@
 from app.services.project.can_access_project import can_access_project
+from app.services.project.count_project_team_sizes import count_project_team_sizes
 from app.services.project.create_project import create_project
 from app.services.project.get_project_by_id import get_project_by_id
 from app.services.project.get_project_or_404 import get_project_or_404
@@ -19,12 +20,17 @@
 from app.services.project.list_user_project_roles import list_user_project_roles
 from app.services.project.revoke_organization_access import revoke_organization_access
 from app.services.project.revoke_user_access import revoke_user_access
+from app.services.project.serialize_project_responses import (
+    serialize_project,
+    serialize_projects,
+)
 from app.services.project.update_project import update_project
 from app.services.project.update_project_location import update_project_location
 from app.services.project.update_user_access_role import update_user_access_role
 
 __all__ = [
     "can_access_project",
+    "count_project_team_sizes",
     "create_project",
     "get_project_by_id",
     "get_project_or_404",
@@ -39,6 +45,8 @@
     "list_user_project_roles",
     "revoke_organization_access",
     "revoke_user_access",
+    "serialize_project",
+    "serialize_projects",
     "update_project",
     "update_project_location",
     "update_user_access_role",

app/services/project/count_project_team_sizes.py

@@ -0,0 +1,20 @@
+from sqlalchemy import distinct, func, select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.db.models.project import ProjectUserAccess
+
+
+async def count_project_team_sizes(db: AsyncSession, project_ids: list[str]) -> dict[str, int]:
+    if not project_ids:
+        return {}
+    stmt = (
+        select(
+            ProjectUserAccess.project_id,
+            func.count(distinct(ProjectUserAccess.user_id)),
+        )
+        .where(ProjectUserAccess.project_id.in_(project_ids))
+        .group_by(ProjectUserAccess.project_id)
+    )
+    result = await db.execute(stmt)
+    counts: dict[str, int] = {row[0]: row[1] for row in result.all()}
+    return {project_id: counts.get(project_id, 0) for project_id in project_ids}

app/services/project/serialize_project_responses.py

@@ -0,0 +1,18 @@
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.db.models.project import Project
+from app.models.project import ProjectResponse
+from app.services.project.count_project_team_sizes import count_project_team_sizes
+
+
+async def serialize_projects(db: AsyncSession, projects: list[Project]) -> list[ProjectResponse]:
+    team_sizes = await count_project_team_sizes(db, [p.id for p in projects])
+    return [
+        ProjectResponse.model_validate(p).model_copy(update={"team_size": team_sizes.get(p.id, 0)})
+        for p in projects
+    ]
+
+
+async def serialize_project(db: AsyncSession, project: Project) -> ProjectResponse:
+    (response,) = await serialize_projects(db, [project])
+    return response

tests/test_project_team_size.py

@@ -0,0 +1,51 @@
+import pytest
+
+from app.services import project_service
+from tests.baker import (
+    make_language,
+    make_project,
+    make_project_user_access,
+    make_user,
+)
+
+
+@pytest.mark.asyncio
+async def test_count_team_sizes_counts_distinct_users(db_session) -> None:
+    lang = await make_language(db_session, code="tsa")
+    project = await make_project(db_session, language_id=lang.id)
+    u1 = await make_user(db_session, email="[email protected]")
+    u2 = await make_user(db_session, email="[email protected]")
+    await make_project_user_access(db_session, project.id, u1.id)
+    await make_project_user_access(db_session, project.id, u2.id)
+
+    sizes = await project_service.count_project_team_sizes(db_session, [project.id])
+    assert sizes == {project.id: 2}
+
+
+@pytest.mark.asyncio
+async def test_count_team_sizes_zero_for_project_without_access(db_session) -> None:
+    lang = await make_language(db_session, code="tsb")
+    project = await make_project(db_session, language_id=lang.id)
+
+    sizes = await project_service.count_project_team_sizes(db_session, [project.id])
+    assert sizes == {project.id: 0}
+
+
+@pytest.mark.asyncio
+async def test_count_team_sizes_isolates_projects(db_session) -> None:
+    lang = await make_language(db_session, code="tsc")
+    p1 = await make_project(db_session, language_id=lang.id, name="P1")
+    p2 = await make_project(db_session, language_id=lang.id, name="P2")
+    u1 = await make_user(db_session, email="[email protected]")
+    u2 = await make_user(db_session, email="[email protected]")
+    await make_project_user_access(db_session, p1.id, u1.id)
+    await make_project_user_access(db_session, p1.id, u2.id)
+    await make_project_user_access(db_session, p2.id, u1.id)
+
+    sizes = await project_service.count_project_team_sizes(db_session, [p1.id, p2.id])
+    assert sizes == {p1.id: 2, p2.id: 1}
+
+
+@pytest.mark.asyncio
+async def test_count_team_sizes_empty_input(db_session) -> None:
+    assert await project_service.count_project_team_sizes(db_session, []) == {}