Artiste : heure de passage ; vœux d'artistes pris en compte par le solveur

Artist gagne start_time/end_time (end <= start ⇒ finit le lendemain,
même convention que Shift/DayPart/Availability). Migration 0008.

Le solveur (app/solver/) résout maintenant les fenêtres de passage des
artistes que chaque bénévole veut voir (VolunteerArtist) et pénalise
toute suggestion qui chevaucherait un passage souhaité — le bénévole
raterait l'artiste. Comme le reste du scoring, c'est un terme de
l'objectif, pas un blocage : pour un créneau urgent sans autre
candidat, le solveur propose quand même, quitte à ce que ce soit un
pis-aller.

- SolverVolunteer.wished_artist_windows (fenêtres ShiftInfo précalculées
  par le loader depuis Artist + VolunteerArtist).
- Nouveau malus _ARTIST_CONFLICT_PENALTY dans engine.py.
- Tests : moteur (conflit détecté/ignoré hors chevauchement/toujours
  suggéré en dernier recours) + intégration API bout en bout.

176 tests, ruff et alembic check au vert. CLAUDE.md mis à jour (§2 et §4).

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-11 18:13:54 +02:00
co-authored by Claude Sonnet 5
parent e47c29d35b
commit fea9d37019
12 changed files with 212 additions and 35 deletions
+24 -20
View File
@@ -11,17 +11,24 @@ def _url(edition, suffix=""):
return f"/editions/{edition.id}/artists{suffix}"
def _payload(name: str, performance_date: str, **overrides) -> dict:
body = {
"name": name,
"performance_date": performance_date,
"start_time": "20:00",
"end_time": "21:00",
}
body.update(overrides)
return body
def test_create_and_list_ordered_by_date_then_name(client, edition):
client.post(
_url(edition), json={"name": "Ziak", "performance_date": "2026-07-11"}
)
client.post(
_url(edition), json={"name": "Aloïse Sauvage", "performance_date": "2026-07-11"}
)
r = client.post(
_url(edition), json={"name": "Chilla", "performance_date": "2026-07-10"}
)
client.post(_url(edition), json=_payload("Ziak", "2026-07-11"))
client.post(_url(edition), json=_payload("Aloïse Sauvage", "2026-07-11"))
r = client.post(_url(edition), json=_payload("Chilla", "2026-07-10"))
assert r.status_code == 201
assert r.json()["start_time"] == "20:00:00"
assert r.json()["end_time"] == "21:00:00"
body = client.get(_url(edition)).json()
assert [(a["name"], a["performance_date"]) for a in body] == [
@@ -32,24 +39,20 @@ def test_create_and_list_ordered_by_date_then_name(client, edition):
def test_blank_name_is_422(client, edition):
r = client.post(
_url(edition), json={"name": " ", "performance_date": "2026-07-10"}
)
r = client.post(_url(edition), json=_payload(" ", "2026-07-10"))
assert r.status_code == 422
assert r.json()["detail"]["code"] == "artist.name_required"
def test_duplicate_name_and_date_conflicts(client, edition):
payload = {"name": "Chilla", "performance_date": "2026-07-10"}
payload = _payload("Chilla", "2026-07-10")
assert client.post(_url(edition), json=payload).status_code == 201
r = client.post(_url(edition), json=payload)
assert r.status_code == 409
assert r.json()["detail"]["code"] == "artist.duplicate"
# Même nom, autre jour : autorisé.
r2 = client.post(
_url(edition), json={"name": "Chilla", "performance_date": "2026-07-11"}
)
r2 = client.post(_url(edition), json=_payload("Chilla", "2026-07-11"))
assert r2.status_code == 201
@@ -57,11 +60,14 @@ def test_update_artist(client, edition, session):
artist = make_artist(session, edition, name="Chila")
r = client.patch(
_url(edition, f"/{artist.id}"),
json={"name": "Chilla", "performance_date": "2026-07-12"},
json={"name": "Chilla", "performance_date": "2026-07-12", "start_time": "22:00"},
)
assert r.status_code == 200
assert r.json()["name"] == "Chilla"
assert r.json()["performance_date"] == "2026-07-12"
assert r.json()["start_time"] == "22:00:00"
# Non transmis : inchangé.
assert r.json()["end_time"] == "21:00:00"
def test_delete_artist_removes_volunteer_wishes(client, edition, session):
@@ -88,9 +94,7 @@ def test_unknown_edition_is_404(client):
def test_write_is_coordinator_only(edition, make_account, as_account):
lead = make_account(Role.LEAD, email="lead@e.fr")
api = as_account(lead)
resp = api.post(
_url(edition), json={"name": "X", "performance_date": "2026-07-10"}
)
resp = api.post(_url(edition), json=_payload("X", "2026-07-10"))
assert resp.status_code == 403
# La lecture reste ouverte à tout compte de l'édition.
assert api.get(_url(edition)).status_code == 200