É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:
co-authored by
Claude Sonnet 5
parent
8a879ca5c3
commit
464635656a
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user