Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions backend/app/access/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,10 @@ class CommitteeAssignment:
committee_id: int # TODO: remove this to map out to committees/conferences
role: enums.SessionRoles
representation_id: int | None


@dataclass(frozen=True)
class AccessibleCommittee:
committee_id: int
role: str
representation_id: int | None
111 changes: 108 additions & 3 deletions backend/app/access/repository.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
from uuid import UUID

from sqlalchemy import text
from sqlalchemy import bindparam, text
from sqlalchemy.ext.asyncio import AsyncSession

from .models import CommitteeAssignment
from .models import AccessibleCommittee, CommitteeAssignment


# TODO: pass this to a conference/ domain
async def get_committee_assignment(
session: AsyncSession, user_id: UUID, committee_id: int
) -> CommitteeAssignment | None:
Expand Down Expand Up @@ -69,3 +68,109 @@ async def get_session_assignment(
role=row["role"],
representation_id=row["representation_id"],
)


async def has_conference_management_role(
session: AsyncSession,
*,
conference_id: int,
user_id: UUID,
roles: set[str],
) -> bool:
query = text("""
SELECT 1
FROM public.conferences c
LEFT JOIN public.conference_assignments ca
ON ca.conference_id = c.id
AND ca.user_id = :user_id
AND ca.role IN :roles
WHERE c.id = :conference_id
AND (
c.owner_id = :user_id
OR ca.user_id IS NOT NULL
)
LIMIT 1
""").bindparams(bindparam("roles", expanding=True))

result = await session.execute(
query,
{
"conference_id": conference_id,
"user_id": user_id,
"roles": list(roles),
},
)
return result.scalar_one_or_none() is not None


async def has_conference_assignment_for_session_access(
session: AsyncSession,
*,
conference_id: int,
committee_id: int,
user_id: UUID,
roles: set[str],
) -> bool:
query = text("""
SELECT 1
FROM public.committees cm
JOIN public.conference_assignments ca
ON ca.conference_id = cm.conference_id
AND ca.user_id = :user_id
AND ca.role IN :roles
AND (
ca.committee_id IS NULL
OR ca.committee_id = cm.id
)
WHERE cm.id = :committee_id
AND cm.conference_id = :conference_id
LIMIT 1
""").bindparams(bindparam("roles", expanding=True))

result = await session.execute(
query,
{
"conference_id": conference_id,
"committee_id": committee_id,
"user_id": user_id,
"roles": list(roles),
},
)
return result.scalar_one_or_none() is not None


async def list_accessible_conference_committees(
session: AsyncSession,
*,
conference_id: int,
user_id: UUID,
) -> list[AccessibleCommittee]:
query = text("""
SELECT
ca.committee_id,
ca.role,
ca.representation_id
FROM public.committee_assignments ca
JOIN public.committees cm
ON cm.id = ca.committee_id
WHERE cm.conference_id = :conference_id
AND ca.user_id = :user_id
ORDER BY cm.created_at DESC, cm.id DESC
""")

result = await session.execute(
query,
{
"conference_id": conference_id,
"user_id": user_id,
},
)

return [
AccessibleCommittee(
committee_id=row["committee_id"],
role=row["role"],
representation_id=row["representation_id"],
)
for row in result.mappings().all()
]
19 changes: 19 additions & 0 deletions backend/app/access/schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,22 @@
class SessionRepresentation(BaseModel):
role: enums.SessionRoles
representation_id: int | None


class CommitteeScopedConferenceRole(BaseModel):
committee_id: int
role: str


class AccessibleCommittee(BaseModel):
committee_id: int
role: str
representation_id: int | None


class ConferenceAccess(BaseModel):
conference_id: int
roles: list[str]
committee_roles: list[CommitteeScopedConferenceRole]
accessible_committees: list[AccessibleCommittee]
can_manage_conference: bool
124 changes: 123 additions & 1 deletion backend/app/access/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,34 @@
from sqlalchemy.ext.asyncio import AsyncSession

from app.access.models import CommitteeAssignment
from app.access.schemas import (
AccessibleCommittee,
CommitteeScopedConferenceRole,
ConferenceAccess,
)
from app.conference import repository as conference_repository
from app.conference.enums import ConferenceRole
from app.core.exceptions import AccessDeniedError

from .repository import get_committee_assignment, get_session_assignment
from .repository import (
get_committee_assignment,
get_session_assignment,
has_conference_assignment_for_session_access,
has_conference_management_role,
list_accessible_conference_committees,
)

CONFERENCE_MANAGEMENT_ROLES = {
"owner",
"secretary_general",
}

SESSION_ACCESS_GRANTING_CONFERENCE_ROLES = {
"owner",
"secretary_general",
"director",
"moderator",
}


async def resolve_committee_assignment(
Expand Down Expand Up @@ -62,3 +87,100 @@ async def verify_user_role(
)

return assignment


async def verify_can_manage_conference(
session: AsyncSession,
user_id: UUID,
conference_id: int,
) -> None:
# TODO: split conference/dashboard access from live-session access as this grows.
can_manage = await has_conference_management_role(
session=session,
conference_id=conference_id,
user_id=user_id,
roles=CONFERENCE_MANAGEMENT_ROLES,
)
if not can_manage:
raise AccessDeniedError("User cannot manage this conference")


async def get_my_conference_access(
session: AsyncSession,
user_id: UUID,
conference_id: int,
) -> ConferenceAccess:
conference = await conference_repository.get_user_conference(
session=session,
conference_id=conference_id,
user_id=user_id,
)
if conference is None:
raise AccessDeniedError("User has no access to this conference")

assignments = await conference_repository.list_user_conference_assignments(
session=session,
conference_id=conference_id,
user_id=user_id,
)

roles = sorted(
{
assignment.role
for assignment in assignments
if assignment.committee_id is None
}
)
if conference.owner_id == user_id and ConferenceRole.OWNER.value not in roles:
roles.append(ConferenceRole.OWNER.value)

committee_roles = [
CommitteeScopedConferenceRole(
committee_id=assignment.committee_id,
role=assignment.role,
)
for assignment in assignments
if assignment.committee_id is not None
]
accessible_committees = [
AccessibleCommittee(
committee_id=committee.committee_id,
role=committee.role,
representation_id=committee.representation_id,
)
for committee in await list_accessible_conference_committees(
session=session,
conference_id=conference_id,
user_id=user_id,
)
]

return ConferenceAccess(
conference_id=conference_id,
roles=roles,
committee_roles=committee_roles,
accessible_committees=accessible_committees,
can_manage_conference=any(
role in CONFERENCE_MANAGEMENT_ROLES for role in roles
),
)


async def verify_conference_assignment_can_grant_session_access(
session: AsyncSession,
user_id: UUID,
conference_id: int,
committee_id: int,
) -> None:
# TODO: keep role policy centralized here as conference/team access grows.
can_grant = await has_conference_assignment_for_session_access(
session=session,
conference_id=conference_id,
committee_id=committee_id,
user_id=user_id,
roles=SESSION_ACCESS_GRANTING_CONFERENCE_ROLES,
)
if not can_grant:
raise AccessDeniedError(
"Conference assignment cannot grant committee session access"
)
16 changes: 14 additions & 2 deletions backend/app/access/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
from app.auth.service import AuthUser
from app.core.database import get_db_session

from .schemas import SessionRepresentation
from .service import resolve_session_assignment
from .schemas import ConferenceAccess, SessionRepresentation
from .service import get_my_conference_access, resolve_session_assignment

router = APIRouter()

Expand All @@ -27,3 +27,15 @@ async def get_my_session_access(
return SessionRepresentation(
role=assignment.role, representation_id=assignment.representation_id
)


@router.get("/conferences/{conference_id}/me")
async def get_my_conference_access_endpoint(
conference_id: int,
db_session: Annotated[AsyncSession, Depends(get_db_session)],
current_user: Annotated[AuthUser, Depends(get_current_user)],
) -> ConferenceAccess:
"""Return the authenticated user's dashboard/team access for a conference."""
return await get_my_conference_access(
db_session, current_user.user_id, conference_id
)
1 change: 1 addition & 0 deletions backend/app/conference/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

20 changes: 20 additions & 0 deletions backend/app/conference/enums.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
from enum import StrEnum


class ConferenceRole(StrEnum):
OWNER = "owner"
SECRETARY_GENERAL = "secretary_general"
DIRECTOR = "director"
MODERATOR = "moderator"
RAPPORTEUR = "rapporteur"
CRISIS_STAFF = "crisis_staff"
PRESS = "press"
LOGISTICS = "logistics"
STAFF = "staff"
PARTICIPANT = "participant"


class CommitteeRole(StrEnum):
CHAIR = "chair"
DELEGATE = "delegate"
OBSERVER = "observer"
Loading
Loading