Compétences supprimées de bout en bout :
- tables `skill`, `volunteer_skill`, `shift_required_skill` ;
- `Volunteer.skill_codes`, `Shift.required_skill_codes`, colonne `skills`
de l'import, règle de validation `MISSING_REQUIRED_SKILL`, jeu de démo.
Disponibilités repensées : `Availability` passe de (`day_part_id`,
`status` tri-état) à une **fenêtre horaire libre** (`date`, `start_time`,
`end_time` ; `end <= start` ⇒ passe minuit), plusieurs par jour.
- Nouveaux endpoints `GET`/`PUT /editions/{id}/volunteers/{vid}/availability`
(PUT = remplacement complet, COORDINATION) et
`GET /editions/{id}/availability` (toute l'édition, pour la grille).
- `OUTSIDE_AVAILABILITY` (toujours WARNING) : compare le créneau à l'union
des fenêtres du bénévole ce jour-là ; renvoie `date` + `uncovered_minutes`.
`DayPart` ne sert plus qu'à la borne de « journée » du cumul 8 h.
- L'import ne gère plus les disponibilités (fenêtres saisies dans l'app) :
`values.py` supprimé, mapping réduit à nom/email/téléphone/commentaire.
Migration 0007 (recrée `availability`). `AvailabilityStatus` supprimé.
158 tests, `alembic check` et `ruff` au vert. Front à suivre.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017uUsRg7XzopkCPWimwg9ZM
170 lines
5.9 KiB
Python
170 lines
5.9 KiB
Python
"""Moteur de validation des affectations — cœur du produit.
|
|
|
|
Fonction pure : une `ValidationInput` en entrée, une liste de `Violation` en
|
|
sortie. Règles et sémantique figées : voir CLAUDE.md § 3.
|
|
"""
|
|
|
|
import datetime as dt
|
|
|
|
from app.validation.models import (
|
|
AvailabilityWindow,
|
|
Severity,
|
|
ShiftInfo,
|
|
ValidationInput,
|
|
Violation,
|
|
ViolationCode,
|
|
)
|
|
|
|
_EIGHT_HOURS = dt.timedelta(hours=8)
|
|
|
|
|
|
def validate(data: ValidationInput) -> list[Violation]:
|
|
violations: list[Violation] = []
|
|
violations.extend(_check_overlap(data))
|
|
violations.extend(_check_outside_availability(data))
|
|
violations.extend(_check_daily_hours(data))
|
|
violations.extend(_check_insufficient_rest(data))
|
|
return violations
|
|
|
|
|
|
def has_blocking(violations: list[Violation]) -> bool:
|
|
return any(v.severity is Severity.BLOCKING for v in violations)
|
|
|
|
|
|
# --------------------------------------------------------------------------- #
|
|
# SHIFT_OVERLAP (bloquante) #
|
|
# --------------------------------------------------------------------------- #
|
|
def _overlaps(a: ShiftInfo, b: ShiftInfo) -> bool:
|
|
# Bornes strictes : deux créneaux jointifs (fin == début) ne se chevauchent
|
|
# pas.
|
|
return a.starts_at < b.ends_at and b.starts_at < a.ends_at
|
|
|
|
|
|
def _check_overlap(data: ValidationInput) -> list[Violation]:
|
|
candidate = data.candidate_shift
|
|
return [
|
|
Violation.of(
|
|
ViolationCode.SHIFT_OVERLAP,
|
|
other_shift_id=other.id,
|
|
other_starts_at=other.starts_at.isoformat(),
|
|
other_ends_at=other.ends_at.isoformat(),
|
|
)
|
|
for other in data.existing_shifts
|
|
if _overlaps(candidate, other)
|
|
]
|
|
|
|
|
|
# --------------------------------------------------------------------------- #
|
|
# OUTSIDE_AVAILABILITY (avertissement) #
|
|
# --------------------------------------------------------------------------- #
|
|
def _window_interval(w: AvailabilityWindow) -> tuple[dt.datetime, dt.datetime]:
|
|
start = dt.datetime.combine(w.date, w.start_time)
|
|
end_day = w.date if w.end_time > w.start_time else w.date + dt.timedelta(days=1)
|
|
return start, dt.datetime.combine(end_day, w.end_time)
|
|
|
|
|
|
def uncovered_minutes(
|
|
shift: ShiftInfo, windows: tuple[AvailabilityWindow, ...]
|
|
) -> int:
|
|
"""Minutes du créneau qui ne tombent dans aucune fenêtre de disponibilité.
|
|
|
|
Le bénévole peut déclarer plusieurs fenêtres ; on regarde leur union.
|
|
"""
|
|
cursor = shift.starts_at
|
|
intervals = sorted(
|
|
(iv for iv in map(_window_interval, windows) if iv[1] > iv[0]),
|
|
key=lambda iv: iv[0],
|
|
)
|
|
gap = dt.timedelta()
|
|
for start, end in intervals:
|
|
if end <= cursor:
|
|
continue
|
|
if start > shift.ends_at:
|
|
break
|
|
if start > cursor:
|
|
gap += min(start, shift.ends_at) - cursor
|
|
cursor = max(cursor, end)
|
|
if cursor >= shift.ends_at:
|
|
return int(gap.total_seconds() // 60)
|
|
if cursor < shift.ends_at:
|
|
gap += shift.ends_at - cursor
|
|
return int(gap.total_seconds() // 60)
|
|
|
|
|
|
def _check_outside_availability(data: ValidationInput) -> list[Violation]:
|
|
missing = uncovered_minutes(data.candidate_shift, data.availabilities)
|
|
if missing == 0:
|
|
return []
|
|
return [
|
|
Violation.of(
|
|
ViolationCode.OUTSIDE_AVAILABILITY,
|
|
date=data.candidate_shift.starts_at.date().isoformat(),
|
|
uncovered_minutes=missing,
|
|
)
|
|
]
|
|
|
|
|
|
# --------------------------------------------------------------------------- #
|
|
# DAILY_HOURS_EXCEEDED (avertissement) #
|
|
# --------------------------------------------------------------------------- #
|
|
def _day_boundary(day_parts: tuple) -> dt.time:
|
|
if not day_parts:
|
|
return dt.time(0, 0)
|
|
return min(day_parts, key=lambda part: part.order).start_time
|
|
|
|
|
|
def _day_key(moment: dt.datetime, boundary: dt.time) -> dt.date:
|
|
if moment.time() >= boundary:
|
|
return moment.date()
|
|
return moment.date() - dt.timedelta(days=1)
|
|
|
|
|
|
def _check_daily_hours(data: ValidationInput) -> list[Violation]:
|
|
boundary = _day_boundary(data.day_parts)
|
|
candidate = data.candidate_shift
|
|
key = _day_key(candidate.starts_at, boundary)
|
|
|
|
total = candidate.ends_at - candidate.starts_at
|
|
for other in data.existing_shifts:
|
|
if _day_key(other.starts_at, boundary) == key:
|
|
total += other.ends_at - other.starts_at
|
|
|
|
if total > _EIGHT_HOURS:
|
|
return [
|
|
Violation.of(
|
|
ViolationCode.DAILY_HOURS_EXCEEDED,
|
|
date=key.isoformat(),
|
|
total_minutes=int(total.total_seconds() // 60),
|
|
)
|
|
]
|
|
return []
|
|
|
|
|
|
# --------------------------------------------------------------------------- #
|
|
# INSUFFICIENT_REST (avertissement) #
|
|
# --------------------------------------------------------------------------- #
|
|
def _check_insufficient_rest(data: ValidationInput) -> list[Violation]:
|
|
candidate = data.candidate_shift
|
|
out: list[Violation] = []
|
|
for other in data.existing_shifts:
|
|
if _overlaps(candidate, other):
|
|
continue
|
|
if other.ends_at <= candidate.starts_at:
|
|
gap = candidate.starts_at - other.ends_at
|
|
direction = "BEFORE"
|
|
elif candidate.ends_at <= other.starts_at:
|
|
gap = other.starts_at - candidate.ends_at
|
|
direction = "AFTER"
|
|
else: # pragma: no cover - inatteignable : non-chevauchement ⇒ avant ou après
|
|
continue
|
|
if gap < _EIGHT_HOURS:
|
|
out.append(
|
|
Violation.of(
|
|
ViolationCode.INSUFFICIENT_REST,
|
|
other_shift_id=other.id,
|
|
direction=direction,
|
|
gap_minutes=int(gap.total_seconds() // 60),
|
|
)
|
|
)
|
|
return out
|