Vue bénévole mobile : responsable, téléphone et repère « maintenant »
La vue bénévole reprenait les infos essentielles (poste, jour, horaire,
lieu) mais affichait un badge de validation factice (« TU ES ATTENDU
SUR CE CRÉNEAU ») sans plus-value, sans jamais donner le nom ni le
téléphone du référent du poste à contacter — pourtant déjà modélisés
(`Position.lead_account_id`) depuis la gestion des référents.
Un compte VOLUNTEER n'a pas accès à `positions`/`shifts` (403, cf. § 2
matrice des accès) : ces infos ne pouvaient donc pas être jointes côté
front à partir des listes existantes. Nouvel endpoint dédié et
minimal, réservé à la lecture du planning propre du bénévole :
GET /editions/{id}/volunteers/{vid}/planning
Renvoie, par affectation : poste, lieu, et référent (nom + téléphone,
`null` si le poste n'a pas de référent ou si son compte n'est pas
rattaché à une fiche bénévole) — sans exposer la liste complète des
postes/créneaux de l'édition. Tests : accès (soi-même / autre
bénévole 403 / COORD+LEAD), présence/absence du référent, tri par
heure de début.
Front : retrait du badge de validation, ajout des lignes responsable/
téléphone par créneau, et un repère horizontal « MAINTENANT » qui se
positionne dans la liste triée des créneaux selon l'heure réelle (juste
avant le prochain créneau à venir) pour situer le bénévole dans son
planning.
Non inclus dans ce commit (édités en parallèle par l'utilisateur,
laissés en l'état) : backend/app/seed.py, frontend/tailwind.config.js.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017uUsRg7XzopkCPWimwg9ZM
This commit is contained in:
co-authored by
Claude Sonnet 5
parent
8fcc22115f
commit
a78aad58e2
@@ -84,6 +84,24 @@ class VolunteerRead(ApiModel):
|
||||
updated_at: dt.datetime
|
||||
|
||||
|
||||
class VolunteerPlanningEntry(ApiModel):
|
||||
"""Un créneau affecté, enrichi (poste, lieu, référent à contacter) — pour
|
||||
l'écran bénévole (`GET .../volunteers/{id}/planning`), sans jamais
|
||||
exposer la liste complète des postes/créneaux de l'édition à un compte
|
||||
VOLUNTEER (lecture restreinte à sa propre fiche, cf. § 2 matrice)."""
|
||||
|
||||
assignment_id: uuid.UUID
|
||||
shift_id: uuid.UUID
|
||||
starts_at: dt.datetime
|
||||
ends_at: dt.datetime
|
||||
position_name: str
|
||||
position_location: str | None
|
||||
# None si le poste n'a pas (encore) de référent, ou si son compte n'est
|
||||
# pas rattaché à une fiche bénévole (pas de téléphone à donner alors).
|
||||
referent_name: str | None
|
||||
referent_phone: str | None
|
||||
|
||||
|
||||
# --------------------------------------------------------------------------- #
|
||||
# Artist (programmation) #
|
||||
# --------------------------------------------------------------------------- #
|
||||
|
||||
@@ -6,11 +6,17 @@ L'email n'est pas unique : plusieurs bénévoles peuvent en partager un même
|
||||
import uuid
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, Response, status
|
||||
from sqlalchemy.orm import aliased
|
||||
from sqlmodel import Session, select
|
||||
|
||||
from app.api._common import owned_or_404, replace_links
|
||||
from app.api.deps import get_edition
|
||||
from app.api.schemas import VolunteerCreate, VolunteerRead, VolunteerUpdate
|
||||
from app.api.schemas import (
|
||||
VolunteerCreate,
|
||||
VolunteerPlanningEntry,
|
||||
VolunteerRead,
|
||||
VolunteerUpdate,
|
||||
)
|
||||
from app.auth.deps import (
|
||||
current_account_in_edition,
|
||||
require_coordinator,
|
||||
@@ -20,9 +26,11 @@ from app.db import get_session
|
||||
from app.models import (
|
||||
Account,
|
||||
Artist,
|
||||
Assignment,
|
||||
Edition,
|
||||
Position,
|
||||
Role,
|
||||
Shift,
|
||||
Volunteer,
|
||||
VolunteerArtist,
|
||||
VolunteerCompanionWish,
|
||||
@@ -177,6 +185,8 @@ def create_volunteer(
|
||||
_guard: Account = Depends(require_coordinator),
|
||||
session: Session = Depends(get_session),
|
||||
) -> VolunteerRead:
|
||||
payload.first_name = payload.first_name.title()
|
||||
payload.last_name = payload.last_name.title()
|
||||
volunteer = Volunteer(
|
||||
edition_id=edition.id,
|
||||
**payload.model_dump(
|
||||
@@ -219,6 +229,49 @@ def get_volunteer(
|
||||
return _read(session, volunteer)
|
||||
|
||||
|
||||
@router.get("/{volunteer_id}/planning", response_model=list[VolunteerPlanningEntry])
|
||||
def get_volunteer_planning(
|
||||
volunteer_id: uuid.UUID,
|
||||
edition: Edition = Depends(get_edition),
|
||||
account: Account = Depends(current_account_in_edition),
|
||||
session: Session = Depends(get_session),
|
||||
) -> list[VolunteerPlanningEntry]:
|
||||
"""Planning enrichi (poste, lieu, référent + téléphone à contacter) d'un
|
||||
bénévole — permet à l'écran bénévole (`/mobile-benevole`) d'afficher ces
|
||||
infos sans jamais donner à un compte VOLUNTEER un accès en lecture aux
|
||||
postes/créneaux de toute l'édition (réservé à COORDINATOR/LEAD)."""
|
||||
_ensure_can_read(account, volunteer_id)
|
||||
owned_or_404(session.get(Volunteer, volunteer_id), edition.id)
|
||||
|
||||
Referent = aliased(Volunteer)
|
||||
rows = session.exec(
|
||||
select(Assignment, Shift, Position, Referent)
|
||||
.join(Shift, Shift.id == Assignment.shift_id)
|
||||
.join(Position, Position.id == Shift.position_id)
|
||||
.join(Account, Account.id == Position.lead_account_id, isouter=True)
|
||||
.join(Referent, Referent.id == Account.volunteer_id, isouter=True)
|
||||
.where(
|
||||
Assignment.volunteer_id == volunteer_id,
|
||||
Assignment.edition_id == edition.id,
|
||||
)
|
||||
.order_by(Shift.starts_at)
|
||||
).all()
|
||||
|
||||
return [
|
||||
VolunteerPlanningEntry(
|
||||
assignment_id=a.id,
|
||||
shift_id=s.id,
|
||||
starts_at=s.starts_at,
|
||||
ends_at=s.ends_at,
|
||||
position_name=p.name,
|
||||
position_location=p.location,
|
||||
referent_name=f"{r.first_name} {r.last_name}" if r else None,
|
||||
referent_phone=r.phone if r else None,
|
||||
)
|
||||
for a, s, p, r in rows
|
||||
]
|
||||
|
||||
|
||||
@router.patch("/{volunteer_id}", response_model=VolunteerRead)
|
||||
def update_volunteer(
|
||||
volunteer_id: uuid.UUID,
|
||||
|
||||
@@ -3,7 +3,7 @@ import uuid
|
||||
|
||||
from sqlmodel import select
|
||||
|
||||
from app.models import Assignment, Availability, Volunteer
|
||||
from app.models import Assignment, Availability, Role, Volunteer
|
||||
from tests.factories import (
|
||||
dt_at,
|
||||
make_artist,
|
||||
@@ -232,3 +232,160 @@ def test_delete_is_a_full_cascade(client, edition, session):
|
||||
from app.models import Shift
|
||||
|
||||
assert session.get(Shift, shift.id) is not None
|
||||
|
||||
|
||||
# --------------------------------------------------------------------------- #
|
||||
# Planning enrichi (poste, lieu, référent) — écran bénévole #
|
||||
# --------------------------------------------------------------------------- #
|
||||
def test_planning_is_empty_without_assignment(client, edition, session):
|
||||
volunteer = make_volunteer(session, edition, email="v@ex.fr")
|
||||
resp = client.get(_url(edition, f"/{volunteer.id}/planning"))
|
||||
assert resp.status_code == 200
|
||||
assert resp.json() == []
|
||||
|
||||
|
||||
def test_planning_includes_position_and_referent(client, edition, session):
|
||||
from app.models import Account
|
||||
|
||||
volunteer = make_volunteer(session, edition, email="v@ex.fr")
|
||||
referent_volunteer = make_volunteer(
|
||||
session, edition, first_name="Rita", last_name="Referente", email="r@ex.fr"
|
||||
)
|
||||
referent_volunteer.phone = "0600000000"
|
||||
session.add(referent_volunteer)
|
||||
referent_account = Account(
|
||||
edition_id=edition.id,
|
||||
email="rita@ex.fr",
|
||||
role=Role.LEAD,
|
||||
volunteer_id=referent_volunteer.id,
|
||||
)
|
||||
session.add(referent_account)
|
||||
session.commit()
|
||||
session.refresh(referent_account)
|
||||
|
||||
position = make_position(session, edition, name="Bar central")
|
||||
position.location = "Chapiteau"
|
||||
position.lead_account_id = referent_account.id
|
||||
session.add(position)
|
||||
session.commit()
|
||||
|
||||
shift = make_shift(
|
||||
session, edition, position, start=dt_at(10, 9), end=dt_at(10, 12)
|
||||
)
|
||||
session.add(
|
||||
Assignment(edition_id=edition.id, volunteer_id=volunteer.id, shift_id=shift.id)
|
||||
)
|
||||
session.commit()
|
||||
|
||||
resp = client.get(_url(edition, f"/{volunteer.id}/planning"))
|
||||
assert resp.status_code == 200
|
||||
body = resp.json()
|
||||
assert len(body) == 1
|
||||
entry = body[0]
|
||||
assert entry["shift_id"] == str(shift.id)
|
||||
assert entry["position_name"] == "Bar central"
|
||||
assert entry["position_location"] == "Chapiteau"
|
||||
assert entry["referent_name"] == "Rita Referente"
|
||||
assert entry["referent_phone"] == "0600000000"
|
||||
|
||||
|
||||
def test_planning_referent_fields_are_none_without_referent(
|
||||
client, edition, session
|
||||
):
|
||||
volunteer = make_volunteer(session, edition, email="v@ex.fr")
|
||||
position = make_position(session, edition)
|
||||
shift = make_shift(
|
||||
session, edition, position, start=dt_at(10, 9), end=dt_at(10, 12)
|
||||
)
|
||||
session.add(
|
||||
Assignment(edition_id=edition.id, volunteer_id=volunteer.id, shift_id=shift.id)
|
||||
)
|
||||
session.commit()
|
||||
|
||||
resp = client.get(_url(edition, f"/{volunteer.id}/planning"))
|
||||
entry = resp.json()[0]
|
||||
assert entry["referent_name"] is None
|
||||
assert entry["referent_phone"] is None
|
||||
|
||||
|
||||
def test_planning_referent_fields_are_none_when_lead_has_no_volunteer_record(
|
||||
client, edition, session
|
||||
):
|
||||
"""Un référent peut être un compte LEAD sans fiche bénévole associée :
|
||||
pas de nom/téléphone à afficher dans ce cas."""
|
||||
from app.models import Account
|
||||
|
||||
volunteer = make_volunteer(session, edition, email="v@ex.fr")
|
||||
referent_account = Account(
|
||||
edition_id=edition.id, email="lead@ex.fr", role=Role.LEAD
|
||||
)
|
||||
session.add(referent_account)
|
||||
session.commit()
|
||||
session.refresh(referent_account)
|
||||
|
||||
position = make_position(session, edition)
|
||||
position.lead_account_id = referent_account.id
|
||||
session.add(position)
|
||||
session.commit()
|
||||
|
||||
shift = make_shift(
|
||||
session, edition, position, start=dt_at(10, 9), end=dt_at(10, 12)
|
||||
)
|
||||
session.add(
|
||||
Assignment(edition_id=edition.id, volunteer_id=volunteer.id, shift_id=shift.id)
|
||||
)
|
||||
session.commit()
|
||||
|
||||
resp = client.get(_url(edition, f"/{volunteer.id}/planning"))
|
||||
entry = resp.json()[0]
|
||||
assert entry["referent_name"] is None
|
||||
assert entry["referent_phone"] is None
|
||||
|
||||
|
||||
def test_planning_is_ordered_by_start_time(client, edition, session):
|
||||
volunteer = make_volunteer(session, edition, email="v@ex.fr")
|
||||
position = make_position(session, edition)
|
||||
late = make_shift(
|
||||
session, edition, position, start=dt_at(11, 14), end=dt_at(11, 18)
|
||||
)
|
||||
early = make_shift(
|
||||
session, edition, position, start=dt_at(10, 9), end=dt_at(10, 12)
|
||||
)
|
||||
session.add_all(
|
||||
[
|
||||
Assignment(edition_id=edition.id, volunteer_id=volunteer.id, shift_id=late.id),
|
||||
Assignment(edition_id=edition.id, volunteer_id=volunteer.id, shift_id=early.id),
|
||||
]
|
||||
)
|
||||
session.commit()
|
||||
|
||||
resp = client.get(_url(edition, f"/{volunteer.id}/planning"))
|
||||
body = resp.json()
|
||||
assert [e["shift_id"] for e in body] == [str(early.id), str(late.id)]
|
||||
|
||||
|
||||
def test_planning_is_404_for_unknown_volunteer(client, edition):
|
||||
resp = client.get(_url(edition, f"/{uuid.uuid4()}/planning"))
|
||||
assert resp.status_code == 404
|
||||
|
||||
|
||||
def test_volunteer_can_read_own_planning_but_not_anothers(
|
||||
session, edition, make_account, as_account
|
||||
):
|
||||
me = make_volunteer(session, edition, email="me@e.fr")
|
||||
other = make_volunteer(session, edition, email="other@e.fr")
|
||||
account = make_account(Role.VOLUNTEER, volunteer_id=me.id, email="me@e.fr")
|
||||
client = as_account(account)
|
||||
|
||||
assert client.get(_url(edition, f"/{me.id}/planning")).status_code == 200
|
||||
assert client.get(_url(edition, f"/{other.id}/planning")).status_code == 403
|
||||
|
||||
|
||||
def test_lead_can_read_any_volunteers_planning(
|
||||
session, edition, make_account, as_account
|
||||
):
|
||||
other = make_volunteer(session, edition, email="other@e.fr")
|
||||
lead_account = make_account(Role.LEAD)
|
||||
client = as_account(lead_account)
|
||||
|
||||
assert client.get(_url(edition, f"/{other.id}/planning")).status_code == 200
|
||||
|
||||
Reference in New Issue
Block a user