Retrait des disponibilités et des limites de temps dans la journée

Disponibilités déclarées supprimées (table `availability`, migration 0022, API, éditeur de la fiche bénévole, badge de couverture du panneau d'affectation, colonnes des statistiques) ainsi que les règles OUTSIDE_AVAILABILITY, DAILY_HOURS_EXCEEDED et INSUFFICIENT_REST, les malus de disponibilité et de repos du solveur et le filtre « Surchargés » de la vue bénévoles. Seul le chevauchement reste contrôlé. La case « je suis disponible » du formulaire public est conservée. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-05 21:29:58 +02:00
parent f671bb85bf
commit d722a81a87
40 changed files with 213 additions and 1845 deletions
@@ -1,4 +1,4 @@
-import { dayBoundaryFromDayParts, festivalDay, uncoveredMinutes } from '@/lib/planning';
+import { dayBoundaryFromDayParts, festivalDay } from '@/lib/planning';
 import { hoursBetween, naiveMinutes } from '@/lib/time';

 import type {
@@ -8,8 +8,6 @@ import type {
  ArtistUpdate,
  AssignmentRead,
  AssignmentValidateResult,
-  AvailabilityRead,
-  AvailabilitySet,
  BadgeFieldRead,
  BadgeFieldsSet,
  BadgeGenerateRequest,
@@ -54,7 +52,6 @@ import { buildMockState, type MockPendingSubmission, type MockState } from './da
 // comportement (chargements, invalidations) proche du back-end réel.

 const LATENCY_MS = 120;
-const EIGHT_HOURS_MIN = 8 * 60;
 const MAGIC_LINK_TTL_MS = 15 * 60 * 1000;

 let state: MockState = buildMockState();
@@ -199,14 +196,6 @@ const slugCode = (label: string): string =>
 /** « HH:MM » ou « HH:MM:SS » -> « HH:MM:SS ». */
 const hms = (time: string): string => (time.length === 5 ? `${time}:00` : time);

-const sortWindows = (ws: AvailabilityRead[]): AvailabilityRead[] =>
-  [...ws].sort(
-    (a, b) =>
-      a.volunteer_id.localeCompare(b.volunteer_id) ||
-      a.date.localeCompare(b.date) ||
-      a.start_time.localeCompare(b.start_time),
-  );
-
 /** Vœux du bénévole : dé-doublonne, ordre conservé ; 422 si un id est étranger. */
 function resolveWishes<T extends { id: string }>(
  pool: T[],
@@ -260,7 +249,6 @@ function promotePending(pending: MockPendingSubmission): VolunteerRead {
  };
  if (pending.photo) state.photos.set(volunteer.id, pending.photo);
  state.volunteers.push(volunteer);
-  state.availability.set(volunteer.id, []);

  pending.promotedVolunteerId = volunteer.id;
  pending.status = 'PAID';
@@ -471,63 +459,6 @@ function runValidation(volunteerId: string, candidate: ShiftRead, excludeAssignm
    }
  }

-  // OUTSIDE_AVAILABILITY (avertissement) — créneau non couvert par l'union des
-  // fenêtres de disponibilité déclarées.
-  const gapMin = uncoveredMinutes(
-    state.availability.get(volunteerId) ?? [],
-    candidate.starts_at,
-    candidate.ends_at,
-  );
-  if (gapMin > 0) {
-    violations.push({
-      code: 'OUTSIDE_AVAILABILITY',
-      severity: 'WARNING',
-      params: {
-        date: candidate.starts_at.slice(0, 10),
-        uncovered_minutes: gapMin,
-      },
-    });
-  }
-
-  // DAILY_HOURS_EXCEEDED (avertissement) — journée = date de début du créneau.
-  const dayKey = candidate.starts_at.slice(0, 10);
-  let totalMin = (naiveMinutes(candidate.ends_at) - naiveMinutes(candidate.starts_at));
-  for (const other of existing) {
-    if (other.starts_at.slice(0, 10) === dayKey) {
-      totalMin += naiveMinutes(other.ends_at) - naiveMinutes(other.starts_at);
-    }
-  }
-  if (totalMin > EIGHT_HOURS_MIN) {
-    violations.push({
-      code: 'DAILY_HOURS_EXCEEDED',
-      severity: 'WARNING',
-      params: { date: dayKey, total_minutes: totalMin },
-    });
-  }
-
-  // INSUFFICIENT_REST (avertissement) — < 8 h entre deux créneaux (strict).
-  for (const other of existing) {
-    if (overlaps(candidate, other)) continue;
-    let gap: number;
-    let direction: 'BEFORE' | 'AFTER';
-    if (naiveMinutes(other.ends_at) <= naiveMinutes(candidate.starts_at)) {
-      gap = naiveMinutes(candidate.starts_at) - naiveMinutes(other.ends_at);
-      direction = 'BEFORE';
-    } else if (naiveMinutes(candidate.ends_at) <= naiveMinutes(other.starts_at)) {
-      gap = naiveMinutes(other.starts_at) - naiveMinutes(candidate.ends_at);
-      direction = 'AFTER';
-    } else {
-      continue;
-    }
-    if (gap < EIGHT_HOURS_MIN) {
-      violations.push({
-        code: 'INSUFFICIENT_REST',
-        severity: 'WARNING',
-        params: { other_shift_id: other.id, direction, gap_minutes: gap },
-      });
-    }
-  }
-
  return violations;
 }

@@ -567,10 +498,10 @@ function buildStats(): EditionStats {
  const sum = (list: VolunteerRead[]) => round(list.reduce((t, v) => t + (v.fee_amount ?? 0), 0));

  const boundary = dayBoundaryFromDayParts(state.dayParts);
-  type Row = { shifts: number; min: number; ideal: number; avail: number; who: Set<string>; assigned: number };
+  type Row = { shifts: number; min: number; ideal: number; assigned: number };
  const rows = new Map<string, Row>();
  const row = (d: string) => {
-    if (!rows.has(d)) rows.set(d, { shifts: 0, min: 0, ideal: 0, avail: 0, who: new Set(), assigned: 0 });
+    if (!rows.has(d)) rows.set(d, { shifts: 0, min: 0, ideal: 0, assigned: 0 });
    return rows.get(d) as Row;
  };
  const shiftsById = new Map(state.shifts.map((s) => [s.id, s]));
@@ -585,17 +516,6 @@ function buildStats(): EditionStats {
    const s = shiftsById.get(a.shift_id);
    if (s) row(festivalDay(s.starts_at, boundary)).assigned += hoursBetween(s.starts_at, s.ends_at);
  }
-  const withAvailability = new Set<string>();
-  for (const [vid, windows] of state.availability) {
-    for (const w of windows) {
-      const start = `${w.date}T${w.start_time.slice(0, 5)}:00`;
-      const endDate = w.end_time > w.start_time ? w.date : addDay(w.date);
-      const r = row(festivalDay(start, boundary));
-      r.avail += hoursBetween(start, `${endDate}T${w.end_time.slice(0, 5)}:00`);
-      r.who.add(vid);
-      withAvailability.add(vid);
-    }
-  }
  const assignedByShift = new Map<string, number>();
  for (const a of state.assignments) assignedByShift.set(a.shift_id, (assignedByShift.get(a.shift_id) ?? 0) + 1);

@@ -650,8 +570,6 @@ function buildStats(): EditionStats {
          shifts: r.shifts,
          min_hours: round(r.min),
          ideal_hours: round(r.ideal),
-          available_hours: round(r.avail),
-          available_volunteers: r.who.size,
          assigned_hours: round(r.assigned),
        })),
      by_position: [...state.positions]
@@ -669,7 +587,6 @@ function buildStats(): EditionStats {
            wishes: vols.filter((v) => v.wished_position_ids.includes(p.id)).length,
          };
        }),
-      volunteers_with_availability: withAvailability.size,
      volunteers_with_assignment: new Set(state.assignments.map((a) => a.volunteer_id)).size,
    },
  };
@@ -714,8 +631,6 @@ function buildMatrix(): MatrixResponse {
 const SOLVER_URGENT_BASE = 1000;
 const SOLVER_NORMAL_BASE = 20;
 const SOLVER_WISH_BONUS = 30;
-const SOLVER_AVAIL_PENALTY_PER_HALF_HOUR = 5;
-const SOLVER_REST_PENALTY = 60;
 const SOLVER_ARTIST_CONFLICT_PENALTY = 80;
 const SOLVER_FAIRNESS_PENALTY_PER_HOUR = 2;
 // Le bénévole a déjà tenu le créneau immédiatement précédent (même jour,
@@ -829,24 +744,6 @@ function solverScore(
  }
  score += SOLVER_COMPANION_BONUS_PER_MATCH * companionsPresent;

-  const windows = state.availability.get(volunteer.id) ?? [];
-  const missed = uncoveredMinutes(windows, shift.starts_at, shift.ends_at);
-  score -= Math.floor(missed / 30) * SOLVER_AVAIL_PENALTY_PER_HALF_HOUR;
-
-  for (const other of existing) {
-    if (overlaps(shift, other)) continue;
-    let gap: number | null = null;
-    if (naiveMinutes(other.ends_at) <= naiveMinutes(shift.starts_at)) {
-      gap = naiveMinutes(shift.starts_at) - naiveMinutes(other.ends_at);
-    } else if (naiveMinutes(shift.ends_at) <= naiveMinutes(other.starts_at)) {
-      gap = naiveMinutes(other.starts_at) - naiveMinutes(shift.ends_at);
-    }
-    if (gap !== null && gap < EIGHT_HOURS_MIN) {
-      score -= SOLVER_REST_PENALTY;
-      break;
-    }
-  }
-
  const existingMinutes = existing.reduce(
    (sum, s) => sum + (naiveMinutes(s.ends_at) - naiveMinutes(s.starts_at)),
    0,
@@ -1112,7 +1009,6 @@ export function createMockApi(): PlanningApi {
          updated_at: now,
        };
        state.volunteers.push(volunteer);
-        state.availability.set(volunteer.id, []);
        return delay(volunteer);
      },
      update: (_edition, id, body) => {
@@ -1154,7 +1050,6 @@ export function createMockApi(): PlanningApi {
      remove: (_edition, id) => {
        state.volunteers = state.volunteers.filter((x) => x.id !== id);
        state.assignments = state.assignments.filter((a) => a.volunteer_id !== id);
-        state.availability.delete(id);
        state.photos.delete(id);
        // RGPD : effacement complet, y compris le compte de connexion éventuel
        // et les vœux de compagnon dont il était la cible.
@@ -1256,50 +1151,6 @@ export function createMockApi(): PlanningApi {
      },
    },

-    availability: {
-      list: (_edition, volunteerId) => {
-        if (!state.volunteers.some((v) => v.id === volunteerId)) return notFound();
-        return delay(sortWindows(state.availability.get(volunteerId) ?? []));
-      },
-      listEdition: () =>
-        delay(
-          sortWindows(
-            [...state.availability.values()].flat().filter((w) =>
-              state.volunteers.some((v) => v.id === w.volunteer_id),
-            ),
-          ),
-        ),
-      replace: (_edition, volunteerId, body: AvailabilitySet) => {
-        if (!state.volunteers.some((v) => v.id === volunteerId)) return notFound();
-        const seen = new Set<string>();
-        const windows: AvailabilityRead[] = [];
-        for (const w of body.windows) {
-          if (w.date < state.edition.start_date || w.date > state.edition.end_date) {
-            throw new ApiError(422, 'availability.date_outside_edition');
-          }
-          const start = hms(w.start_time);
-          const end = hms(w.end_time);
-          if (start === end) throw new ApiError(422, 'availability.empty_window');
-          const key = `${w.date}|${start}|${end}`;
-          if (seen.has(key)) continue;
-          seen.add(key);
-          const now = touch();
-          windows.push({
-            id: `av${state.seq++}`,
-            edition_id: state.edition.id,
-            volunteer_id: volunteerId,
-            date: w.date,
-            start_time: start,
-            end_time: end,
-            created_at: now,
-            updated_at: now,
-          });
-        }
-        state.availability.set(volunteerId, windows);
-        return delay(sortWindows(windows));
-      },
-    },
-
    imports: {
      analyze: async (_edition, file: File) => {
        const { headers, rows } = await readImportTable(file);
@@ -1480,9 +1331,6 @@ export function createMockApi(): PlanningApi {

        if (!mapping.dry_run) {
          state.volunteers = working;
-          for (const v of working) {
-            if (!state.availability.has(v.id)) state.availability.set(v.id, []);
-          }
        }
        return delay(report);
      },
@@ -1935,7 +1783,6 @@ export function createMockApi(): PlanningApi {
          };
          if (photo) state.photos.set(volunteer.id, photo);
          state.volunteers.push(volunteer);
-          state.availability.set(volunteer.id, []);
          return delay<FormSubmissionResult>({
            volunteer_id: volunteer.id,
            pending_token: null,