adam/benevoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Étape 9 : suppression du statut d'affectation (plus de confirmation)

Browse Source 
Une affectation est valide dès sa création ; la retirer = supprimer la ligne.

- Modèle : suppression de AssignmentStatus, ACTIVE_ASSIGNMENT_STATUSES et de
  Assignment.status ; migration 0003 (drop_column, alembic check vert)
- Loader de validation : toutes les affectations du bénévole comptent, plus de
  filtre par statut
- API : AssignmentCreate/Update/Read sans status ; création → validation
  toujours exécutée (blocage si violation bloquante) ; PATCH ne porte plus que
  source/locked
- Matrice : MatrixShift.{confirmed, proposed} → {assigned} (compte unique)
- Seed : affectations sans statut, résumé « Affectations » (260)
- Tests mis à jour (matrice, loader, modèle, API) ; 128 tests au total
- CLAUDE.md : glossaire, modèle, sémantique de validation, périmètre

Frontend : les références au statut (propositions, badges confirmé/proposé,
écran de confirmation mobile, mock, schema.ts) restent à retirer séparément.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017uUsRg7XzopkCPWimwg9ZM
This commit is contained in:
AdamThomas
2026-09-10 07:36:06 +02:00
co-authored by Claude Sonnet 5
parent 8a879ca5c3
commit 464635656a
15 changed files with 109 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/tests/test_api_assignments.py
+4 -37
View File
@@ -35,8 +35,8 @@ def test_create_assignment_clean(client, edition, session, day_parts):
assert resp.status_code == 201
body = resp.json()
assert body["warnings"] == []
assert body["assignment"]["status"] == "PROPOSED"
assert body["assignment"]["source"] == "MANUAL"
assert body["assignment"]["locked"] is False
def test_create_assignment_returns_warnings(client, edition, session, day_parts):
@@ -135,7 +135,7 @@ def test_validate_endpoint_does_not_persist(client, edition, session, day_parts)
assert client.get(_url(edition)).json() == []
def test_update_status_revalidates_and_returns_warnings(
def test_patch_locked_keeps_assignment_and_returns_warnings(
client, edition, session, day_parts
):
volunteer, shift = _setup(session, edition, day_parts, available=False)
@@ -144,47 +144,14 @@ def test_update_status_revalidates_and_returns_warnings(
json={"volunteer_id": str(volunteer.id), "shift_id": str(shift.id)},
).json()["assignment"]["id"]
resp = client.patch(
_url(edition, f"/{aid}"), json={"status": "CONFIRMED"}
)
resp = client.patch(_url(edition, f"/{aid}"), json={"locked": True})
assert resp.status_code == 200
assert resp.json()["assignment"]["status"] == "CONFIRMED"
assert resp.json()["assignment"]["locked"] is True
assert any(
w["code"] == "OUTSIDE_AVAILABILITY" for w in resp.json()["warnings"]
)
def test_cancelling_an_assignment_skips_validation(
client, edition, session, day_parts
):
volunteer, shift = _setup(session, edition, day_parts)
first = client.post(
_url(edition),
json={"volunteer_id": str(volunteer.id), "shift_id": str(shift.id)},
).json()["assignment"]["id"]
# Un second créneau qui chevauche, mais l'affectation est directement DECLINEE.
position = make_position(session, edition, name="X")
overlapping = make_shift(
session, edition, position, start=dt_at(10, 16), end=dt_at(10, 20)
)
created = client.post(
_url(edition),
json={
"volunteer_id": str(volunteer.id),
"shift_id": str(overlapping.id),
"status": "DECLINED",
},
)
assert created.status_code == 201
patched = client.patch(
_url(edition, f"/{first}"), json={"locked": True}
)
assert patched.status_code == 200
assert patched.json()["assignment"]["locked"] is True
def test_delete_assignment(client, edition, session, day_parts):
volunteer, shift = _setup(session, edition, day_parts)
aid = client.post(
backend/tests/test_api_matrix.py
+5 -15
View File
@@ -1,5 +1,4 @@
from app.models import Assignment, AssignmentStatus
from app.models import Assignment
from tests.factories import dt_at, make_position, make_shift, make_volunteer
@@ -18,14 +17,7 @@ def test_matrix_shape_and_counts(client, edition, session):
session, edition, parking, start=dt_at(10, 8), end=dt_at(10, 12)
)
for i, status in enumerate(
[
AssignmentStatus.CONFIRMED,
AssignmentStatus.CONFIRMED,
AssignmentStatus.PROPOSED,
AssignmentStatus.DECLINED,
]
):
for i in range(3):
volunteer = make_volunteer(
session, edition, first_name=f"V{i}", last_name="X", email=f"v{i}@ex.fr"
)
@@ -34,7 +26,6 @@ def test_matrix_shape_and_counts(client, edition, session):
edition_id=edition.id,
volunteer_id=volunteer.id,
shift_id=shift_a.id,
status=status,
)
)
session.commit()
@@ -47,13 +38,12 @@ def test_matrix_shape_and_counts(client, edition, session):
assert [s["shift_id"] for s in bar_shifts] == [str(shift_a.id), str(shift_b.id)]
first = bar_shifts[0]
assert first["confirmed"] == 2
assert first["proposed"] == 1 # la DECLINEE n'est pas comptée
assert first["assigned"] == 3
assert first["min_staff"] == 2
assert first["ideal_staff"] == 5
assert bar_shifts[1]["confirmed"] == 0
assert body["positions"][1]["shifts"][0]["proposed"] == 0
assert bar_shifts[1]["assigned"] == 0
assert body["positions"][1]["shifts"][0]["assigned"] == 0
def test_matrix_unknown_edition_is_404(client):
backend/tests/test_models.py
-2
View File
@@ -7,7 +7,6 @@ from sqlalchemy.exc import IntegrityError
from app.models import (
Assignment,
AssignmentSource,
AssignmentStatus,
Availability,
AvailabilityStatus,
DayPart,
@@ -98,7 +97,6 @@ def test_create_core_graph(session):
session.refresh(assignment)
# Valeurs par défaut appliquées.
assert assignment.status == AssignmentStatus.PROPOSED
assert assignment.source == AssignmentSource.MANUAL
assert assignment.locked is False
# Relations.
backend/tests/test_validation_loader.py
+10 -19
View File
@@ -1,6 +1,6 @@
import datetime as dt
from app.models import Assignment, AssignmentStatus, AvailabilityStatus
from app.models import Assignment, AvailabilityStatus
from app.validation import AvailabilityDeclaration
from app.validation.loader import build_validation_input
from tests.factories import (
@@ -18,12 +18,9 @@ def test_build_input_gathers_everything_from_db(client, edition, session, day_pa
session, edition, position, start=dt_at(10, 14), end=dt_at(10, 18),
skills=["SST"],
)
active_shift = make_shift(
other_shift = make_shift(
session, edition, position, start=dt_at(11, 9), end=dt_at(11, 12)
)
declined_shift = make_shift(
session, edition, position, start=dt_at(12, 9), end=dt_at(12, 12)
)
volunteer = make_volunteer(
session, edition, email="v@ex.fr", skills=["SST", "PERMIS_B"]
)
@@ -31,17 +28,11 @@ def test_build_input_gathers_everything_from_db(client, edition, session, day_pa
session, edition, volunteer, day_parts["AFTERNOON"],
date=dt.date(2026, 7, 10), status=AvailabilityStatus.IF_NEEDED,
)
session.add_all(
[
Assignment(
edition_id=edition.id, volunteer_id=volunteer.id,
shift_id=active_shift.id, status=AssignmentStatus.CONFIRMED,
),
Assignment(
edition_id=edition.id, volunteer_id=volunteer.id,
shift_id=declined_shift.id, status=AssignmentStatus.DECLINED,
),
]
session.add(
Assignment(
edition_id=edition.id, volunteer_id=volunteer.id,
shift_id=other_shift.id,
)
)
session.commit()
@@ -52,8 +43,8 @@ def test_build_input_gathers_everything_from_db(client, edition, session, day_pa
assert data.candidate_shift.id == str(candidate.id)
assert data.candidate_shift.required_skill_codes == frozenset({"SST"})
assert data.volunteer_skill_codes == frozenset({"SST", "PERMIS_B"})
# Seul le créneau de l'affectation active, ni le candidat ni la DECLINEE.
assert [s.id for s in data.existing_shifts] == [str(active_shift.id)]
# Toute affectation existante compte, sauf le créneau candidat lui-même.
assert [s.id for s in data.existing_shifts] == [str(other_shift.id)]
assert len(data.day_parts) == 3
assert data.availabilities == (
AvailabilityDeclaration(
@@ -73,7 +64,7 @@ def test_exclude_assignment_id_is_honoured(client, edition, session, day_parts):
volunteer = make_volunteer(session, edition, email="v@ex.fr")
own = Assignment(
edition_id=edition.id, volunteer_id=volunteer.id,
shift_id=other_shift.id, status=AssignmentStatus.PROPOSED,
shift_id=other_shift.id,
)
session.add(own)
session.commit()