-
${escapeHtml(rehearsalStatusLabel(r))}
+
${escapeHtml(rehearsalStatusLabel(r))}
${formatDatetime(r.startsAt)} – ${formatTime(r.endsAt)}
${r.location ? `${escapeHtml(r.location)} · ` : ''}Proposée par ${escapeHtml(r.proposedByName)}
${rehearsalAcceptedByHtml(r)}
diff --git a/src/db/migrations/020_rehearsal_host.sql b/src/db/migrations/020_rehearsal_host.sql
deleted file mode 100644
index 476bf7d..0000000
--- a/src/db/migrations/020_rehearsal_host.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE calendar_settings
- ADD COLUMN IF NOT EXISTS rehearsal_host_user_id INTEGER REFERENCES users(id) ON DELETE SET NULL;
diff --git a/src/lib/icsFeed.js b/src/lib/icsFeed.js
index bafc5b1..0420071 100644
--- a/src/lib/icsFeed.js
+++ b/src/lib/icsFeed.js
@@ -40,11 +40,8 @@ function foldLine(line) {
return chunks.map((chunk, i) => (i === 0 ? chunk : ` ${chunk}`)).join('\r\n');
}
-// Returns null for a rejected rehearsal — those are dropped entirely from the
-// shared feed (see buildRehearsalsFeed) rather than shown as tentative/cancelled.
-function rehearsalToEvent(rehearsal, { threshold, hostUserId, baseUrl, allUsers }) {
- const status = computeRehearsalStatus(rehearsal.votes, threshold, hostUserId);
- if (status === 'rejected') return null;
+function rehearsalToEvent(rehearsal, { threshold, baseUrl, allUsers }) {
+ const status = computeRehearsalStatus(rehearsal.votes, threshold);
const icsStatus = status === 'confirmed' ? 'CONFIRMED' : 'TENTATIVE';
const summary = status === 'confirmed' ? 'Répétition' : 'Répétition (proposition)';
const voteUrl = `${baseUrl}/calendar.html?rehearsalId=${rehearsal.id}`;
@@ -77,7 +74,7 @@ function rehearsalToEvent(rehearsal, { threshold, hostUserId, baseUrl, allUsers
return lines;
}
-function buildRehearsalsFeed(rehearsals, { threshold, hostUserId, baseUrl, allUsers }) {
+function buildRehearsalsFeed(rehearsals, { threshold, baseUrl, allUsers }) {
const lines = [
'BEGIN:VCALENDAR',
'VERSION:2.0',
@@ -85,10 +82,7 @@ function buildRehearsalsFeed(rehearsals, { threshold, hostUserId, baseUrl, allUs
'CALSCALE:GREGORIAN',
'METHOD:PUBLISH',
'X-WR-CALNAME:Répétitions Octane',
- ...rehearsals
- .map((r) => rehearsalToEvent(r, { threshold, hostUserId, baseUrl, allUsers }))
- .filter(Boolean)
- .flat(),
+ ...rehearsals.flatMap((r) => rehearsalToEvent(r, { threshold, baseUrl, allUsers })),
'END:VCALENDAR',
];
return lines.map(foldLine).join('\r\n');
diff --git a/src/lib/rehearsalStatus.js b/src/lib/rehearsalStatus.js
index bb1ac91..4f908e1 100644
--- a/src/lib/rehearsalStatus.js
+++ b/src/lib/rehearsalStatus.js
@@ -1,22 +1,8 @@
// Shared between the API (rehearsals list) and the ICS feed so both agree on
-// when a proposed rehearsal counts as confirmed, rejected, or still a
-// suggestion. When a host is configured, their acceptance is mandatory:
-// without the host there is nowhere to play, so an explicit host refusal (or
-// too many "reject" votes) kills the rehearsal outright rather than leaving
-// it as a pending suggestion.
-function computeRehearsalStatus(votes, threshold, hostUserId) {
+// when a proposed rehearsal counts as confirmed.
+function computeRehearsalStatus(votes, threshold) {
const acceptCount = votes.filter((v) => v.vote === 'accept').length;
- const rejectCount = votes.filter((v) => v.vote === 'reject').length;
- const hostVote = hostUserId ? votes.find((v) => v.userId === hostUserId) : null;
-
- if ((hostVote && hostVote.vote === 'reject') || rejectCount >= threshold) {
- return 'rejected';
- }
- if (acceptCount < threshold) return 'suggested';
- if (hostUserId && !(hostVote && hostVote.vote === 'accept')) {
- return 'suggested';
- }
- return 'confirmed';
+ return acceptCount >= threshold ? 'confirmed' : 'suggested';
}
module.exports = { computeRehearsalStatus };
diff --git a/src/repositories/calendarRepo.js b/src/repositories/calendarRepo.js
index 2ebef4e..8d5f9ef 100644
--- a/src/repositories/calendarRepo.js
+++ b/src/repositories/calendarRepo.js
@@ -205,12 +205,7 @@ function parseTime(hhmmss) {
async function getSlotSettings() {
const { rows } = await pool.query(
- `SELECT s.weekday_start, s.weekday_end, s.weekend_start, s.weekend_end, s.margin_minutes,
- s.concert_start, s.concert_end, s.rehearsal_confirm_threshold, s.rehearsal_host_user_id,
- h.name AS rehearsal_host_name
- FROM calendar_settings s
- LEFT JOIN users h ON h.id = s.rehearsal_host_user_id
- WHERE s.id = 1`
+ 'SELECT weekday_start, weekday_end, weekend_start, weekend_end, margin_minutes, concert_start, concert_end, rehearsal_confirm_threshold FROM calendar_settings WHERE id = 1'
);
const row = rows[0];
const weekdayStart = parseTime(row.weekday_start);
@@ -225,19 +220,17 @@ async function getSlotSettings() {
marginMinutes: row.margin_minutes,
concert: { startHour: concertStart.hour, startMinute: concertStart.minute, endHour: concertEnd.hour, endMinute: concertEnd.minute },
rehearsalConfirmThreshold: row.rehearsal_confirm_threshold,
- rehearsalHostUserId: row.rehearsal_host_user_id,
- rehearsalHostName: row.rehearsal_host_name,
};
}
-async function updateSlotSettings({ weekdayStart, weekdayEnd, weekendStart, weekendEnd, marginMinutes, concertStart, concertEnd, rehearsalConfirmThreshold, rehearsalHostUserId }) {
+async function updateSlotSettings({ weekdayStart, weekdayEnd, weekendStart, weekendEnd, marginMinutes, concertStart, concertEnd, rehearsalConfirmThreshold }) {
const { rows } = await pool.query(
`UPDATE calendar_settings
SET weekday_start = $1, weekday_end = $2, weekend_start = $3, weekend_end = $4, margin_minutes = $5,
- concert_start = $6, concert_end = $7, rehearsal_confirm_threshold = $8, rehearsal_host_user_id = $9
+ concert_start = $6, concert_end = $7, rehearsal_confirm_threshold = $8
WHERE id = 1
- RETURNING weekday_start, weekday_end, weekend_start, weekend_end, margin_minutes, concert_start, concert_end, rehearsal_confirm_threshold, rehearsal_host_user_id`,
- [weekdayStart, weekdayEnd, weekendStart, weekendEnd, marginMinutes, concertStart, concertEnd, rehearsalConfirmThreshold, rehearsalHostUserId || null]
+ RETURNING weekday_start, weekday_end, weekend_start, weekend_end, margin_minutes, concert_start, concert_end, rehearsal_confirm_threshold`,
+ [weekdayStart, weekdayEnd, weekendStart, weekendEnd, marginMinutes, concertStart, concertEnd, rehearsalConfirmThreshold]
);
return rows[0];
}
diff --git a/src/routes/calendar.js b/src/routes/calendar.js
index 071b160..d2ddca8 100644
--- a/src/routes/calendar.js
+++ b/src/routes/calendar.js
@@ -188,8 +188,6 @@ router.get(
concertStart: formatTime(settings.concert.startHour, settings.concert.startMinute),
concertEnd: formatTime(settings.concert.endHour, settings.concert.endMinute),
rehearsalConfirmThreshold: settings.rehearsalConfirmThreshold,
- rehearsalHostUserId: settings.rehearsalHostUserId,
- rehearsalHostName: settings.rehearsalHostName,
});
})
);
@@ -216,7 +214,7 @@ router.patch(
'/settings',
requireAdmin,
asyncHandler(async (req, res) => {
- const { weekdayStart, weekdayEnd, weekendStart, weekendEnd, marginMinutes, concertStart, concertEnd, rehearsalConfirmThreshold, rehearsalHostUserId } = req.body || {};
+ const { weekdayStart, weekdayEnd, weekendStart, weekendEnd, marginMinutes, concertStart, concertEnd, rehearsalConfirmThreshold } = req.body || {};
const times = { weekdayStart, weekdayEnd, weekendStart, weekendEnd, concertStart, concertEnd };
for (const [key, value] of Object.entries(times)) {
if (!TIME_RE.test(value || '')) {
@@ -241,19 +239,7 @@ router.patch(
return res.status(400).json({ error: 'invalid_rehearsal_confirm_threshold' });
}
- let hostUserId = null;
- if (rehearsalHostUserId !== null && rehearsalHostUserId !== undefined && rehearsalHostUserId !== '') {
- hostUserId = Number(rehearsalHostUserId);
- if (!Number.isInteger(hostUserId)) {
- return res.status(400).json({ error: 'invalid_rehearsal_host_user_id' });
- }
- const host = await usersRepo.findById(hostUserId);
- if (!host) {
- return res.status(400).json({ error: 'rehearsal_host_user_not_found' });
- }
- }
-
- const values = { ...times, marginMinutes: margin, rehearsalConfirmThreshold: threshold, rehearsalHostUserId: hostUserId };
+ const values = { ...times, marginMinutes: margin, rehearsalConfirmThreshold: threshold };
await calendarRepo.updateSlotSettings(values);
res.json(values);
})
diff --git a/src/routes/calendarFeed.js b/src/routes/calendarFeed.js
index a3daf42..98ad226 100644
--- a/src/routes/calendarFeed.js
+++ b/src/routes/calendarFeed.js
@@ -26,12 +26,7 @@ router.get(
const baseUrl = `${req.protocol}://${req.get('host')}`;
res
.type('text/calendar; charset=utf-8')
- .send(buildRehearsalsFeed(rehearsals, {
- threshold: settings.rehearsalConfirmThreshold,
- hostUserId: settings.rehearsalHostUserId,
- baseUrl,
- allUsers,
- }));
+ .send(buildRehearsalsFeed(rehearsals, { threshold: settings.rehearsalConfirmThreshold, baseUrl, allUsers }));
})
);
diff --git a/src/routes/rehearsals.js b/src/routes/rehearsals.js
index 8255789..7d58d7a 100644
--- a/src/routes/rehearsals.js
+++ b/src/routes/rehearsals.js
@@ -12,7 +12,6 @@ router.get(
asyncHandler(async (req, res) => {
const [rehearsals, settings] = await Promise.all([rehearsalsRepo.findUpcoming(), calendarRepo.getSlotSettings()]);
const threshold = settings.rehearsalConfirmThreshold;
- const hostUserId = settings.rehearsalHostUserId;
res.json(
rehearsals.map((r) => ({
id: r.id,
@@ -22,10 +21,8 @@ router.get(
proposedBy: r.proposed_by,
proposedByName: r.proposed_by_name,
votes: r.votes,
- status: computeRehearsalStatus(r.votes, threshold, hostUserId),
+ status: computeRehearsalStatus(r.votes, threshold),
confirmThreshold: threshold,
- hostUserId,
- hostName: settings.rehearsalHostName,
}))
);
})