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

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
+29 -53
View File
@@ -1,5 +1,6 @@
"""CRUD des affectations. Toute écriture passe par le moteur de validation :
une violation bloquante interdit l'enregistrement, les avertissements sont
"""CRUD des affectations. Une affectation est valide dès sa création (pas
d'étape de confirmation). La création passe par le moteur de validation : une
violation bloquante interdit l'enregistrement, les avertissements sont
renvoyés."""
import uuid
@@ -23,15 +24,7 @@ from app.auth.deps import (
require_staff,
)
from app.db import get_session
from app.models import (
ACTIVE_ASSIGNMENT_STATUSES,
Account,
Assignment,
Edition,
Role,
Shift,
Volunteer,
)
from app.models import Account, Assignment, Edition, Role, Shift, Volunteer
from app.validation import has_blocking, validate
from app.validation.loader import build_validation_input
@@ -114,32 +107,27 @@ def create_assignment(
status_code=409, detail={"code": "assignment.duplicate"}
)
# La validation ne s'applique qu'aux affectations actives : créer
# directement une affectation DECLINEE ou ANNULEE n'a rien à valider.
violations: list = []
if payload.status in ACTIVE_ASSIGNMENT_STATUSES:
violations = validate(
build_validation_input(
session=session,
edition=edition,
volunteer=volunteer,
shift=shift,
)
violations = validate(
build_validation_input(
session=session,
edition=edition,
volunteer=volunteer,
shift=shift,
)
)
if has_blocking(violations):
raise HTTPException(
status_code=422,
detail={
"code": "error.validation_failed",
"violations": [v.model_dump() for v in violations],
},
)
if has_blocking(violations):
raise HTTPException(
status_code=422,
detail={
"code": "error.validation_failed",
"violations": [v.model_dump() for v in violations],
},
)
assignment = Assignment(
edition_id=edition.id,
volunteer_id=volunteer.id,
shift_id=shift.id,
status=payload.status,
source=payload.source,
locked=payload.locked,
)
@@ -202,29 +190,17 @@ def update_assignment(
for field, value in changes.items():
setattr(assignment, field, value)
warnings: list = []
if assignment.status in ACTIVE_ASSIGNMENT_STATUSES:
volunteer = session.get(Volunteer, assignment.volunteer_id)
shift = session.get(Shift, assignment.shift_id)
warnings = validate(
build_validation_input(
session=session,
edition=edition,
volunteer=volunteer,
shift=shift,
exclude_assignment_id=assignment.id,
)
# `source` / `locked` ne changent pas le résultat de validation ; on le
# rejoue seulement pour renvoyer les avertissements courants.
warnings = validate(
build_validation_input(
session=session,
edition=edition,
volunteer=session.get(Volunteer, assignment.volunteer_id),
shift=session.get(Shift, assignment.shift_id),
exclude_assignment_id=assignment.id,
)
if has_blocking(warnings):
session.rollback()
raise HTTPException(
status_code=422,
detail={
"code": "error.validation_failed",
"violations": [v.model_dump() for v in warnings],
},
)
)
session.commit()
session.refresh(assignment)
return AssignmentWriteResult(assignment=assignment, warnings=warnings)
+6 -20
View File
@@ -8,14 +8,7 @@ from app.api.deps import get_edition
from app.api.schemas import MatrixPosition, MatrixResponse, MatrixShift
from app.auth.deps import require_staff
from app.db import get_session
from app.models import (
Account,
Assignment,
AssignmentStatus,
Edition,
Position,
Shift,
)
from app.models import Account, Assignment, Edition, Position, Shift
router = APIRouter(prefix="/editions/{edition_id}/matrix", tags=["matrix"])
@@ -41,13 +34,11 @@ def get_matrix(
)
)
counts = {
(shift_id, status): total
for shift_id, status, total in session.exec(
select(
Assignment.shift_id, Assignment.status, func.count()
)
shift_id: total
for shift_id, total in session.exec(
select(Assignment.shift_id, func.count())
.where(Assignment.edition_id == edition.id)
.group_by(Assignment.shift_id, Assignment.status)
.group_by(Assignment.shift_id)
)
}
@@ -60,12 +51,7 @@ def get_matrix(
ends_at=shift.ends_at,
min_staff=shift.min_staff,
ideal_staff=shift.ideal_staff,
confirmed=counts.get(
(shift.id, AssignmentStatus.CONFIRMED), 0
),
proposed=counts.get(
(shift.id, AssignmentStatus.PROPOSED), 0
),
assigned=counts.get(shift.id, 0),
)
)
+1 -6
View File
@@ -7,7 +7,6 @@ from pydantic import BaseModel, ConfigDict, Field
from app.models import (
AssignmentSource,
AssignmentStatus,
PositionCategory,
Role,
TshirtSize,
@@ -129,13 +128,11 @@ class ShiftRead(ApiModel):
class AssignmentCreate(ApiModel):
volunteer_id: uuid.UUID
shift_id: uuid.UUID
status: AssignmentStatus = AssignmentStatus.PROPOSED
source: AssignmentSource = AssignmentSource.MANUAL
locked: bool = False
class AssignmentUpdate(ApiModel):
status: AssignmentStatus | None = None
source: AssignmentSource | None = None
locked: bool | None = None
@@ -145,7 +142,6 @@ class AssignmentRead(ApiModel):
edition_id: uuid.UUID
volunteer_id: uuid.UUID
shift_id: uuid.UUID
status: AssignmentStatus
source: AssignmentSource
locked: bool
created_at: dt.datetime
@@ -176,8 +172,7 @@ class MatrixShift(ApiModel):
ends_at: dt.datetime
min_staff: int
ideal_staff: int
confirmed: int
proposed: int
assigned: int
class MatrixPosition(ApiModel):