nodebb-plugin-calendar-onekite 2.0.0 → 2.1.1

package/README.md

@@ -19,3 +19,10 @@ If you need offline / no-CDN, tell me and I will vendor the files under static/v
 - Pages: /calendar, /calendar/my-reservations
 - Admin: /admin/plugins/calendar-onekite, /admin/calendar/planning
 - API: available under /api/... and /api/v3/... (NodeBB v4 client helper uses /api/v3)
+
+
+## v2.1 inventory model
+- Global locations/inventory in ACP (locationsJson/inventoryJson)
+- Events select allowed inventory item IDs (bookingItemIds)
+- Availability is global per (itemId, locationId) across all events
+- Admin planning is graphical (FullCalendar) with filters

package/library.js

@@ -21,11 +21,28 @@ function getEventKey(eid) {
 
 function mountApiBoth(router, method, path, ...handlers) {
   const m = String(method).toLowerCase();
-  if (typeof router[m] !== 'function') throw new Error(`Unsupported router method: ${method}`);
   router[m]('/api' + path, ...handlers);
   router[m]('/api/v3' + path, ...handlers);
 }
 
+async function getParsedSettings() {
+  const s = (await Settings.get(SETTINGS_KEY)) || {};
+  const parseJson = (str, fallback) => {
+    try { return JSON.parse(str || ''); } catch { return fallback; }
+  };
+
+  const locations = parseJson(s.locationsJson, [
+    { id: 'arnaud', name: 'Chez Arnaud' },
+    { id: 'siege', name: 'Siège Onekite' },
+  ]);
+
+  const inventory = parseJson(s.inventoryJson, [
+    { id: 'wing', name: 'Aile Wing', price: 5, stockByLocation: { arnaud: 1, siege: 0 } },
+  ]);
+
+  return { ...s, locations, inventory };
+}
+
 async function nextReservationId() {
   const rid = await db.incrObjectField('global', 'nextCalendarRid');
   return String(rid);
@@ -50,7 +67,10 @@ async function createEvent(data, uid) {
   const now = Date.now();
   const startTs = Number(new Date(data.start).getTime()) || now;
   const endTs = Number(new Date(data.end).getTime()) || startTs;
-  const bookingItems = Array.isArray(data.bookingItems) ? data.bookingItems : [];
+
+  const bookingItemIds = Array.isArray(data.bookingItemIds)
+    ? data.bookingItemIds.map(String)
+    : [];
 
   const eventObj = {
     eid: String(eid),
@@ -71,7 +91,7 @@ async function createEvent(data, uid) {
     visibility: String(data.visibility || 'public'),
 
     bookingEnabled: data.bookingEnabled ? 1 : 0,
-    bookingItems: JSON.stringify(bookingItems),
+    bookingItems: JSON.stringify(bookingItemIds), // stores IDs only
     reservations: JSON.stringify([]),
   };
 
@@ -92,9 +112,18 @@ async function updateEvent(eid, data) {
   const startTs = data.start ? new Date(data.start).getTime() : new Date(existing.start).getTime();
   const endTs = data.end ? new Date(data.end).getTime() : new Date(existing.end).getTime();
 
-  const bookingItems = Array.isArray(data.bookingItems)
-    ? data.bookingItems
-    : JSON.parse(existing.bookingItems || '[]');
+  const existingIds = (() => {
+    try {
+      const arr = JSON.parse(existing.bookingItems || '[]');
+      return Array.isArray(arr) ? arr.map(String) : [];
+    } catch {
+      return [];
+    }
+  })();
+
+  const bookingItemIds = Array.isArray(data.bookingItemIds)
+    ? data.bookingItemIds.map(String)
+    : existingIds;
 
   const updated = {
     ...existing,
@@ -106,7 +135,7 @@ async function updateEvent(eid, data) {
     location: data.location !== undefined ? String(data.location) : existing.location,
     visibility: data.visibility !== undefined ? String(data.visibility) : existing.visibility,
     bookingEnabled: data.bookingEnabled !== undefined ? (data.bookingEnabled ? 1 : 0) : (existing.bookingEnabled || 0),
-    bookingItems: JSON.stringify(bookingItems),
+    bookingItems: JSON.stringify(bookingItemIds),
     updatedAt: String(Date.now()),
   };
 
@@ -125,13 +154,11 @@ async function getEventsBetween(start, end) {
   const endTs = new Date(end).getTime();
   const eids = await db.getSortedSetRangeByScore(EVENTS_SET_KEY, 0, -1, startTs, endTs);
   if (!eids || !eids.length) return [];
+
   const keys = eids.map(id => getEventKey(id));
   const events = await db.getObjects(keys);
 
-  return (events || []).filter(Boolean).map(ev => ({
-    ...ev,
-    bookingItems: JSON.parse(ev.bookingItems || '[]'),
-  }));
+  return (events || []).filter(Boolean);
 }
 
 async function getUpcomingEvents(limit = 5) {
@@ -212,47 +239,61 @@ async function setRsvp(eid, uid, status) {
   return updated;
 }
 
+/* ---------------- Reservations data helpers ---------------- */
+
+async function getAllReservations() {
+  const eids = await db.getSortedSetRange(EVENTS_SET_KEY, 0, -1);
+  const out = [];
+  for (const eid of eids) {
+    const ev = await getEvent(eid);
+    if (!ev) continue;
+    const resList = (() => {
+      try { return JSON.parse(ev.reservations || '[]'); } catch { return []; }
+    })();
+    for (const r of resList) {
+      out.push({ event: ev, reservation: r });
+    }
+  }
+  return out;
+}
+
 /* ---------------- Pricing ---------------- */
 
-function computePrice(event, reservation) {
-  const items = JSON.parse(event.bookingItems || '[]');
-  const item = items.find(i => i.id === reservation.itemId);
-  if (!item) return 0;
-  const unit = Number(item.price || 0);
+function computePrice(inventoryItem, reservation) {
+  const unit = Number(inventoryItem?.price || 0);
   const days = Number(reservation.days || 1);
   return unit * Number(reservation.quantity || 0) * days;
 }
 
 /* ---------------- Renderers ---------------- */
 
-function renderCalendarPage(req, res) {
-  res.render('calendar', { title: 'Calendrier' });
-}
-
-function renderMyReservationsPage(req, res) {
-  res.render('calendar-my-reservations', { title: 'Mes réservations' });
-}
-
-function renderPlanningPage(req, res) {
-  res.render('admin/calendar-planning', { title: 'Planning des réservations' });
-}
+function renderCalendarPage(req, res) { res.render('calendar', { title: 'Calendrier' }); }
+function renderMyReservationsPage(req, res) { res.render('calendar-my-reservations', { title: 'Mes réservations' }); }
+function renderPlanningPage(req, res) { res.render('admin/calendar-planning', { title: 'Planning' }); }
 
 async function renderAdminPage(req, res) {
   try {
     const settings = (await Settings.get(SETTINGS_KEY)) || {};
-    res.render('admin/plugins/calendar-onekite', {
-      title: 'Calendar OneKite',
-      settings,
-    });
-  } catch (err) {
-    if (req.path && req.path.startsWith('/api/')) {
-      return res.status(500).json({ error: err.message });
+    // Provide defaults JSON strings if empty
+    if (!settings.locationsJson) {
+      settings.locationsJson = JSON.stringify([
+        { id: 'arnaud', name: 'Chez Arnaud' },
+        { id: 'siege', name: 'Siège Onekite' },
+      ], null, 2);
     }
-    res.status(500).send(err.message);
+    if (!settings.inventoryJson) {
+      settings.inventoryJson = JSON.stringify([
+        { id: 'wing', name: 'Aile Wing', price: 5, stockByLocation: { arnaud: 1, siege: 0 } },
+      ], null, 2);
+    }
+
+    res.render('admin/plugins/calendar-onekite', { title: 'Calendar OneKite', settings });
+  } catch (err) {
+    res.status(500).json({ error: err.message });
   }
 }
 
-/* ---------------- Admin handlers ---------------- */
+/* ---------------- Admin APIs ---------------- */
 
 async function adminGetPending(req, res) {
   try {
@@ -271,37 +312,42 @@ async function adminGetPending(req, res) {
   }
 }
 
+async function adminSaveSettings(req, res) {
+  try {
+    await Settings.set(SETTINGS_KEY, req.body);
+    res.json({ status: 'ok' });
+  } catch (err) {
+    res.status(500).json({ error: err.message });
+  }
+}
+
 async function adminValidateReservation(req, res) {
   try {
     const rid = req.params.rid;
-    const eids = await db.getSortedSetRange(EVENTS_SET_KEY, 0, -1);
-
-    let targetEvent = null;
-    let reservation = null;
+    const all = await getAllReservations();
 
-    for (const eid of eids) {
-      const event = await getEvent(eid);
-      if (!event) continue;
-      const reservations = JSON.parse(event.reservations || '[]');
-      const r = reservations.find(rr => rr.rid === rid);
-      if (r) {
-        targetEvent = event;
-        reservation = r;
-        break;
-      }
+    let target = null;
+    for (const row of all) {
+      if (String(row.reservation.rid) === String(rid)) { target = row; break; }
     }
+    if (!target) return res.status(404).json({ error: 'Réservation introuvable' });
+
+    const { event } = target;
+    const reservation = target.reservation;
 
-    if (!reservation) return res.status(404).json({ error: 'Réservation introuvable' });
     if (reservation.status !== 'pending_admin') return res.status(400).json({ error: 'Réservation déjà traitée' });
 
     reservation.status = 'awaiting_payment';
-    const resList = JSON.parse(targetEvent.reservations || '[]');
-    const idx = resList.findIndex(r => r.rid === rid);
+
+    const resList = JSON.parse(event.reservations || '[]');
+    const idx = resList.findIndex(r => String(r.rid) === String(rid));
     resList[idx] = reservation;
-    targetEvent.reservations = JSON.stringify(resList);
-    await db.setObject(getEventKey(targetEvent.eid), targetEvent);
+    event.reservations = JSON.stringify(resList);
+    await db.setObject(getEventKey(event.eid), event);
 
-    const amount = computePrice(targetEvent, reservation);
+    const settings = await getParsedSettings();
+    const invItem = settings.inventory.find(i => String(i.id) === String(reservation.itemId));
+    const amount = computePrice(invItem, reservation);
 
     const checkoutUrl = await helloAsso.createHelloAssoCheckoutIntent({
       eid: reservation.eid,
@@ -315,11 +361,11 @@ async function adminValidateReservation(req, res) {
     try {
       await emailer.send('calendar-reservation-approved', reservation.uid, {
         subject: 'Votre réservation a été validée',
-        eventTitle: targetEvent.title,
-        itemName: reservation.itemId,
+        eventTitle: event.title,
+        itemName: invItem?.name || reservation.itemId,
         quantity: reservation.quantity,
         checkoutUrl,
-        pickupLocation: reservation.pickupLocation || 'Non précisé',
+        pickupLocation: reservation.pickupLocationName || reservation.locationId || 'Non précisé',
         dateStart: reservation.dateStart,
         dateEnd: reservation.dateEnd,
         days: reservation.days || 1,
@@ -338,14 +384,13 @@ async function adminCancelReservation(req, res) {
   try {
     const rid = req.params.rid;
     const eids = await db.getSortedSetRange(EVENTS_SET_KEY, 0, -1);
-
     let found = false;
+
     for (const eid of eids) {
       const event = await getEvent(eid);
       if (!event) continue;
-
       const reservations = JSON.parse(event.reservations || '[]');
-      const idx = reservations.findIndex(rr => rr.rid === rid);
+      const idx = reservations.findIndex(r => String(r.rid) === String(rid));
       if (idx !== -1) {
         reservations[idx].status = 'cancelled';
         event.reservations = JSON.stringify(reservations);
@@ -364,35 +409,34 @@ async function adminCancelReservation(req, res) {
 
 async function adminGetPlanning(req, res) {
   try {
-    const now = new Date();
-    const eids = await db.getSortedSetRangeByScore(EVENTS_SET_KEY, 0, -1, now.getTime(), '+inf');
-    const rows = [];
+    const settings = await getParsedSettings();
+    const locMap = new Map(settings.locations.map(l => [String(l.id), l.name || l.id]));
+    const invMap = new Map(settings.inventory.map(i => [String(i.id), i.name || i.id]));
 
-    for (const eid of eids) {
-      const event = await getEvent(eid);
-      if (!event) continue;
+    const all = await getAllReservations();
+    const rows = [];
 
-      const items = JSON.parse(event.bookingItems || '[]');
-      const reservations = JSON.parse(event.reservations || '[]');
+    for (const row of all) {
+      const event = row.event;
+      const r = row.reservation;
+      if (!r) continue;
+      if (!['pending_admin', 'awaiting_payment', 'paid'].includes(String(r.status))) continue;
 
-      reservations
-        .filter(r => r.status === 'pending_admin' || r.status === 'awaiting_payment' || r.status === 'paid')
-        .forEach(r => {
-          const item = items.find(i => i.id === r.itemId);
-          rows.push({
-            eid: event.eid,
-            eventTitle: event.title,
-            itemId: r.itemId,
-            itemName: item ? item.name : r.itemId,
-            uid: r.uid,
-            quantity: r.quantity,
-            dateStart: r.dateStart,
-            dateEnd: r.dateEnd,
-            days: r.days || daysBetween(r.dateStart, r.dateEnd),
-            status: r.status,
-            pickupLocation: r.pickupLocation || 'Non précisé',
-          });
-        });
+      rows.push({
+        rid: r.rid,
+        eid: event.eid,
+        eventTitle: event.title,
+        itemId: r.itemId,
+        itemName: invMap.get(String(r.itemId)) || r.itemId,
+        uid: r.uid,
+        quantity: r.quantity,
+        dateStart: r.dateStart,
+        dateEnd: r.dateEnd,
+        days: r.days || daysBetween(r.dateStart, r.dateEnd),
+        status: r.status,
+        locationId: r.locationId,
+        pickupLocation: r.pickupLocationName || locMap.get(String(r.locationId)) || 'Non précisé',
+      });
     }
 
     rows.sort((a, b) => new Date(a.dateStart) - new Date(b.dateStart));
@@ -402,22 +446,29 @@ async function adminGetPlanning(req, res) {
   }
 }
 
-async function adminSaveSettings(req, res) {
+/* ---------------- Public APIs ---------------- */
+
+async function inventoryApi(req, res) {
   try {
-    await Settings.set(SETTINGS_KEY, req.body);
-    res.json({ status: 'ok' });
+    const settings = await getParsedSettings();
+    res.json({
+      locations: settings.locations || [],
+      inventory: settings.inventory || [],
+    });
   } catch (err) {
     res.status(500).json({ error: err.message });
   }
 }
 
-/* ---------------- My reservations API ---------------- */
-
 async function myReservations(req, res) {
   try {
     const uid = String(req.user?.uid || 0);
     if (!uid || uid === '0') return res.status(403).json({ error: 'Non connecté' });
 
+    const settings = await getParsedSettings();
+    const locMap = new Map(settings.locations.map(l => [String(l.id), l.name || l.id]));
+    const invMap = new Map(settings.inventory.map(i => [String(i.id), i.name || i.id]));
+
     const eids = await db.getSortedSetRange(EVENTS_SET_KEY, 0, -1);
     const result = [];
 
@@ -425,19 +476,15 @@ async function myReservations(req, res) {
       const event = await getEvent(eid);
       if (!event) continue;
 
-      const items = JSON.parse(event.bookingItems || '[]');
       const reservations = JSON.parse(event.reservations || '[]');
-
       reservations
         .filter(r => String(r.uid) === uid)
         .forEach(r => {
-          const item = items.find(i => i.id === r.itemId);
           result.push({
             ...r,
             eventTitle: event.title,
-            eventStart: event.start,
-            eventEnd: event.end,
-            itemName: item ? item.name : r.itemId,
+            itemName: invMap.get(String(r.itemId)) || r.itemId,
+            pickupLocation: r.pickupLocationName || locMap.get(String(r.locationId)) || '',
           });
         });
     }
@@ -449,55 +496,72 @@ async function myReservations(req, res) {
   }
 }
 
-/* ---------------- Booking ---------------- */
-
 async function bookReservation(req, res) {
   try {
     const uid = req.user?.uid || 0;
     const eid = req.params.eid;
-    const { itemId, quantity, dateStart, dateEnd } = req.body;
+    const { itemId, quantity, dateStart, dateEnd, locationId } = req.body;
 
     if (!await userCanBook(uid)) {
       return res.status(403).json({ error: 'Vous n’êtes pas autorisé à réserver du matériel.' });
     }
-    if (!dateStart || !dateEnd) {
-      return res.status(400).json({ error: 'Dates de début et de fin obligatoires.' });
+    if (!dateStart || !dateEnd || !itemId || !locationId) {
+      return res.status(400).json({ error: 'itemId, locationId, dateStart, dateEnd obligatoires.' });
     }
     if (String(dateEnd) < String(dateStart)) {
       return res.status(400).json({ error: 'La date de fin doit être ≥ la date de début.' });
     }
 
-    const event = await getEvent(eid);
-    if (!event) return res.status(404).json({ error: 'Événement introuvable' });
-    if (!Number(event.bookingEnabled)) return res.status(400).json({ error: 'Réservation désactivée' });
+    const settings = await getParsedSettings();
+    const loc = settings.locations.find(l => String(l.id) === String(locationId));
+    if (!loc) return res.status(400).json({ error: 'Lieu invalide.' });
+
+    const invItem = settings.inventory.find(i => String(i.id) === String(itemId));
+    if (!invItem) return res.status(400).json({ error: 'Matériel invalide.' });
 
-    const items = JSON.parse(event.bookingItems || '[]');
-    const item = items.find(i => i.id === itemId);
-    if (!item) return res.status(400).json({ error: 'Matériel introuvable' });
+    const stockTotal = Number(invItem.stockByLocation?.[String(locationId)] || 0);
+    if (stockTotal <= 0) return res.status(400).json({ error: 'Stock indisponible sur ce lieu.' });
 
     const q = Number(quantity);
     if (!q || q <= 0) return res.status(400).json({ error: 'Quantité invalide' });
 
-    const allRes = JSON.parse(event.reservations || '[]');
-
-    const overlapping = allRes.filter(r => {
-      if (r.itemId !== itemId) return false;
-      if (r.status === 'cancelled') return false;
+    const event = await getEvent(eid);
+    if (!event) return res.status(404).json({ error: 'Événement introuvable' });
+    if (!Number(event.bookingEnabled)) return res.status(400).json({ error: 'Réservation désactivée' });
 
-      const startR = new Date(r.dateStart);
-      const endR = new Date(r.dateEnd);
-      const startN = new Date(dateStart);
-      const endN = new Date(dateEnd);
+    // Ensure item is allowed for this event
+    const allowedIds = (() => {
+      try {
+        const arr = JSON.parse(event.bookingItems || '[]');
+        return Array.isArray(arr) ? arr.map(String) : [];
+      } catch {
+        return [];
+      }
+    })();
+    if (!allowedIds.includes(String(itemId))) {
+      return res.status(400).json({ error: 'Ce matériel n’est pas autorisé pour cet événement.' });
+    }
 
-      return !(endN < startR || startN > endR);
-    });
+    // Global availability: check overlaps across all events reservations (same itemId + locationId)
+    const all = await getAllReservations();
+    const overlapping = all
+      .map(x => x.reservation)
+      .filter(r => r && String(r.itemId) === String(itemId))
+      .filter(r => String(r.locationId) === String(locationId))
+      .filter(r => String(r.status) !== 'cancelled')
+      .filter(r => {
+        const startR = new Date(r.dateStart);
+        const endR = new Date(r.dateEnd);
+        const startN = new Date(dateStart);
+        const endN = new Date(dateEnd);
+        return !(endN < startR || startN > endR);
+      });
 
     const used = overlapping.reduce((sum, r) => sum + Number(r.quantity || 0), 0);
-    const available = Number(item.total || 0) - used;
-    if (q > available) return res.status(400).json({ error: 'Matériel indisponible pour ces dates.' });
+    const available = stockTotal - used;
+    if (q > available) return res.status(400).json({ error: `Stock insuffisant sur ce lieu (dispo: ${available}).` });
 
     const rid = await nextReservationId();
-    const now = Date.now();
     const nbDays = daysBetween(dateStart, dateEnd);
 
     const reservation = {
@@ -505,31 +569,32 @@ async function bookReservation(req, res) {
       eid: String(eid),
       uid: String(uid),
       itemId: String(itemId),
+      locationId: String(locationId),
+      pickupLocationName: String(loc.name || loc.id),
       quantity: q,
       dateStart,
       dateEnd,
       days: nbDays,
       status: 'pending_admin',
       helloAssoOrderId: null,
-      createdAt: now,
-      pickupLocation: String(item.pickupLocation || ''),
+      createdAt: Date.now(),
     };
 
-    allRes.push(reservation);
-    event.reservations = JSON.stringify(allRes);
+    const resList = JSON.parse(event.reservations || '[]');
+    resList.push(reservation);
+    event.reservations = JSON.stringify(resList);
     await db.setObject(getEventKey(eid), event);
 
     try {
       await emailer.send('calendar-reservation-created', uid, {
         subject: 'Votre demande de réservation a été envoyée',
         eventTitle: event.title,
-        item: item.name,
+        item: invItem.name || invItem.id,
         quantity: reservation.quantity,
-        date: new Date().toLocaleString('fr-FR'),
         dateStart,
         dateEnd,
         days: nbDays,
-        pickupLocation: reservation.pickupLocation || 'Non précisé',
+        pickupLocation: reservation.pickupLocationName,
       });
     } catch (e) {
       console.warn('[calendar-onekite] email reservation-created error:', e.message);
@@ -545,7 +610,7 @@ async function bookReservation(req, res) {
   }
 }
 
-/* ---------------- Webhook ---------------- */
+/* ---------------- HelloAsso webhook ---------------- */
 
 async function helloAssoWebhook(req, res) {
   try {
@@ -565,7 +630,7 @@ async function helloAssoWebhook(req, res) {
     if (!event) throw new Error('Event not found');
 
     const reservations = JSON.parse(event.reservations || '[]');
-    const idx = reservations.findIndex(r => r.rid === rid);
+    const idx = reservations.findIndex(r => String(r.rid) === String(rid));
     if (idx === -1) throw new Error('Reservation not found');
 
     const reservation = reservations[idx];
@@ -578,13 +643,16 @@ async function helloAssoWebhook(req, res) {
     event.reservations = JSON.stringify(reservations);
     await db.setObject(getEventKey(eid), event);
 
+    const settings = await getParsedSettings();
+    const invItem = settings.inventory.find(i => String(i.id) === String(reservation.itemId));
+
     try {
       await emailer.send('calendar-payment-confirmed', reservation.uid, {
         subject: 'Votre paiement a été confirmé',
         eventTitle: event.title,
-        itemName: reservation.itemId,
+        itemName: invItem?.name || reservation.itemId,
         quantity: reservation.quantity,
-        pickupLocation: reservation.pickupLocation || 'Non précisé',
+        pickupLocation: reservation.pickupLocationName || reservation.locationId || 'Non précisé',
         dateStart: reservation.dateStart,
         dateEnd: reservation.dateEnd,
         days: reservation.days || 1,
@@ -644,13 +712,13 @@ Plugin.init = async function (params) {
   appRef = params.app;
 
   // Pages
-  router.get('/calendar', middleware.buildHeader, renderCalendarPage);
-  router.get('/calendar/my-reservations', middleware.buildHeader, renderMyReservationsPage);
+  router.get('/calendar', middleware.buildHeader, (req, res) => res.render('calendar', { title: 'Calendrier' }));
+  router.get('/calendar/my-reservations', middleware.buildHeader, (req, res) => res.render('calendar-my-reservations', { title: 'Mes réservations' }));
 
-  router.get('/admin/calendar/planning', middleware.admin.buildHeader, renderPlanningPage);
+  router.get('/admin/calendar/planning', middleware.admin.buildHeader, (req, res) => res.render('admin/calendar-planning', { title: 'Planning' }));
   router.get('/admin/plugins/calendar-onekite', middleware.admin.buildHeader, renderAdminPage);
 
-  // Ajaxify admin page under /api and /api/v3
+  // Admin page (ajaxify)
   mountApiBoth(router, 'get', '/admin/plugins/calendar-onekite', middleware.admin.checkPrivileges, renderAdminPage);
 
   // Settings save
@@ -662,12 +730,10 @@ Plugin.init = async function (params) {
   mountApiBoth(router, 'post', '/admin/calendar/reservation/:rid/cancel', middleware.admin.checkPrivileges, adminCancelReservation);
   mountApiBoth(router, 'get', '/admin/calendar/planning', middleware.admin.checkPrivileges, adminGetPlanning);
 
-  // Planning page ajaxify helper
-  router.get('/api/admin/calendar/planning/page', renderPlanningPage);
-  router.get('/api/v3/admin/calendar/planning/page', renderPlanningPage);
+  // Public inventory
+  mountApiBoth(router, 'get', '/calendar/inventory', inventoryApi);
 
-  // Public APIs + v3
-  // Events list (FullCalendar)
+  // Events list for FullCalendar
   mountApiBoth(router, 'get', '/calendar/events', async (req, res) => {
     try {
       const { start, end } = req.query;
@@ -713,13 +779,29 @@ Plugin.init = async function (params) {
     }
   });
 
+  // Event details: enrich with bookingItemIds + resolved items
   mountApiBoth(router, 'get', '/calendar/event/:eid', async (req, res) => {
     try {
+      const settings = await getParsedSettings();
+      const invMap = new Map(settings.inventory.map(i => [String(i.id), i]));
+
       const event = await getEvent(req.params.eid);
       if (!event) return res.status(404).json({ error: 'Événement introuvable' });
-      const items = JSON.parse(event.bookingItems || '[]');
-      const reservations = JSON.parse(event.reservations || '[]');
-      res.json({ ...event, bookingItems: items, reservations });
+
+      const bookingItemIds = (() => {
+        try {
+          const arr = JSON.parse(event.bookingItems || '[]');
+          return Array.isArray(arr) ? arr.map(String) : [];
+        } catch { return []; }
+      })();
+
+      const bookingItems = bookingItemIds.map(id => invMap.get(String(id))).filter(Boolean);
+
+      const reservations = (() => {
+        try { return JSON.parse(event.reservations || '[]'); } catch { return []; }
+      })();
+
+      res.json({ ...event, bookingItemIds, bookingItems, reservations });
     } catch (err) {
       res.status(500).json({ error: err.message });
     }
@@ -756,7 +838,7 @@ Plugin.init = async function (params) {
   // My reservations
   mountApiBoth(router, 'get', '/calendar/my-reservations', middleware.ensureLoggedIn, myReservations);
 
-  // HelloAsso webhook (keep non-v3 public path + v3 mirror if needed)
+  // HelloAsso webhook
   router.post('/api/calendar/helloasso/webhook', helloAssoWebhook);
   router.post('/api/v3/calendar/helloasso/webhook', helloAssoWebhook);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "description": "Calendar + equipment booking + admin approval + HelloAsso payments for NodeBB v4 (no-jQuery UI)",
   "main": "library.js",
   "license": "MIT",