nodebb-plugin-calendar-onekite 1.3.8 → 1.4.0

package/library.js

@@ -1,5 +1,27 @@
 'use strict';
 
+/**
+ * NodeBB v4 plugin: Calendar OneKite
+ * - Events + booking items (with pickupLocation per item)
+ * - Multi-day reservations
+ * - Admin validation -> HelloAsso checkout link -> payment webhook -> mark paid
+ * - Admin planning view + "My reservations" page
+ * - Settings:
+ *   - Settings key: "calendar-onekite"
+ *   - Admin page: /admin/plugins/calendar-onekite
+ *   - Admin API:  /api/admin/plugins/calendar-onekite
+ *
+ * Templates expected:
+ * - templates/calendar.tpl
+ * - templates/calendar-my-reservations.tpl
+ * - templates/admin/plugins/calendar-onekite.tpl
+ * - templates/admin/calendar-planning.tpl
+ * - templates/widgets/calendar-upcoming.tpl
+ * - templates/emails/calendar-reservation-created.tpl
+ * - templates/emails/calendar-reservation-approved.tpl
+ * - templates/emails/calendar-payment-confirmed.tpl
+ */
+
 const db = require.main.require('./src/database');
 const user = require.main.require('./src/user');
 const meta = require.main.require('./src/meta');
@@ -11,6 +33,7 @@ const helloAsso = require('./helloasso');
 const Plugin = {};
 let appRef = null;
 
+const SETTINGS_KEY = 'calendar-onekite';
 const EVENTS_SET_KEY = 'calendar:events:start';
 const EVENT_KEY_PREFIX = 'calendar:event:';
 
@@ -23,18 +46,21 @@ async function nextReservationId() {
   return String(rid);
 }
 
-// nombre de jours entre deux dates (inclus)
+// number of days between two yyyy-mm-dd dates (inclusive)
 function daysBetween(start, end) {
   const d1 = new Date(start);
   const d2 = new Date(end);
   if (isNaN(d1.getTime()) || isNaN(d2.getTime())) return 1;
+
   const t1 = Date.UTC(d1.getFullYear(), d1.getMonth(), d1.getDate());
   const t2 = Date.UTC(d2.getFullYear(), d2.getMonth(), d2.getDate());
   const diff = Math.round((t2 - t1) / (1000 * 60 * 60 * 24));
   return Math.max(1, diff + 1);
 }
 
-/* ********* EVENTS ********* */
+/* -----------------------------
+ * Events
+ * ---------------------------- */
 
 async function createEvent(data, uid) {
   const eid = await db.incrObjectField('global', 'nextCalendarEid');
@@ -99,8 +125,7 @@ async function updateEvent(eid, data) {
     allDay: data.allDay !== undefined ? (data.allDay ? 1 : 0) : existing.allDay,
     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),
+    bookingEnabled: data.bookingEnabled !== undefined ? (data.bookingEnabled ? 1 : 0) : (existing.bookingEnabled || 0),
     bookingItems: JSON.stringify(bookingItems),
     updatedAt: String(Date.now()),
   };
@@ -120,8 +145,10 @@ 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(eid => getEventKey(eid));
   const events = await db.getObjects(keys);
+
   return (events || []).filter(Boolean).map(ev => ({
     ...ev,
     bookingItems: JSON.parse(ev.bookingItems || '[]'),
@@ -132,16 +159,20 @@ async function getUpcomingEvents(limit = 5) {
   const now = Date.now();
   const eids = await db.getSortedSetRangeByScore(EVENTS_SET_KEY, 0, limit - 1, now, '+inf');
   if (!eids || !eids.length) return [];
+
   const keys = eids.map(eid => getEventKey(eid));
   const events = await db.getObjects(keys);
   return (events || []).filter(Boolean);
 }
 
-/* ********* PERMISSIONS ********* */
+/* -----------------------------
+ * Permissions
+ * ---------------------------- */
 
 async function userCanCreate(uid) {
   if (!uid || uid === 0) return false;
-  const settings = await Settings.get('calendar-onekite');
+
+  const settings = await Settings.get(SETTINGS_KEY);
   if (!settings || !settings.allowedGroups) return false;
 
   const allowedSet = new Set(
@@ -153,15 +184,16 @@ async function userCanCreate(uid) {
   if (!allowedSet.size) return false;
 
   const userGroupsArr = await user.getUserGroups([uid]);
-  const groups = (userGroupsArr[0] || []).map(g => g.name.toLowerCase());
+  const groups = (userGroupsArr[0] || []).map(g => (g.name || '').toLowerCase());
+
   return groups.some(g => allowedSet.has(g));
 }
 
 async function userCanBook(uid) {
   if (!uid || uid === 0) return false;
 
-  const settings = await Settings.get('calendar-onekite');
-  // Si pas configuré, on permet à tout le monde connecté
+  const settings = await Settings.get(SETTINGS_KEY);
+  // if not configured -> allow any logged-in user
   if (!settings || !settings.allowedBookingGroups) return true;
 
   const allowedSet = new Set(
@@ -173,11 +205,14 @@ async function userCanBook(uid) {
   if (!allowedSet.size) return true;
 
   const userGroupsArr = await user.getUserGroups([uid]);
-  const groups = (userGroupsArr[0] || []).map(g => g.name.toLowerCase());
+  const groups = (userGroupsArr[0] || []).map(g => (g.name || '').toLowerCase());
+
   return groups.some(g => allowedSet.has(g));
 }
 
-/* ********* RSVP ********* */
+/* -----------------------------
+ * RSVP
+ * ---------------------------- */
 
 async function setRsvp(eid, uid, status) {
   const key = getEventKey(eid);
@@ -213,7 +248,9 @@ async function setRsvp(eid, uid, status) {
   return updated;
 }
 
-/* ********* PRIX ********* */
+/* -----------------------------
+ * Pricing
+ * ---------------------------- */
 
 function computePrice(event, reservation) {
   const items = JSON.parse(event.bookingItems || '[]');
@@ -221,15 +258,29 @@ function computePrice(event, reservation) {
   if (!item) return 0;
 
   const unit = Number(item.price || 0);
-  const days = reservation.days || 1;
-  return unit * reservation.quantity * days;
+  const days = Number(reservation.days || 1);
+  return unit * Number(reservation.quantity || 0) * days;
 }
 
-/* ********* ADMIN PAGE (AJOUTÉ) ********* */
+/* -----------------------------
+ * Renderers (pages)
+ * ---------------------------- */
+
+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' });
+}
 
 async function renderAdminPage(req, res) {
   try {
-    const settings = (await Settings.get('calendar-onekite')) || {};
+    const settings = (await Settings.get(SETTINGS_KEY)) || {};
     res.render('admin/plugins/calendar-onekite', {
       title: 'Calendar OneKite',
       settings,
@@ -242,25 +293,28 @@ async function renderAdminPage(req, res) {
   }
 }
 
-/* ********* INIT ********* */
+/* -----------------------------
+ * Plugin init
+ * ---------------------------- */
 
 Plugin.init = async function (params) {
   const { router, middleware } = params;
   appRef = params.app;
 
-  /* PAGES */
-
+  // Public pages
   router.get('/calendar', middleware.buildHeader, renderCalendarPage);
   router.get('/api/calendar', renderCalendarPage);
 
   router.get('/calendar/my-reservations', middleware.buildHeader, renderMyReservationsPage);
   router.get('/api/calendar/my-reservations/page', renderMyReservationsPage);
 
-  // admin planning
+  // Admin planning page
   router.get('/admin/calendar/planning', middleware.admin.buildHeader, renderPlanningPage);
   router.get('/api/admin/calendar/planning/page', renderPlanningPage);
 
-  /* API EVENTS */
+  /* -----------------------------
+   * Events API
+   * ---------------------------- */
 
   router.get('/api/calendar/events', async (req, res) => {
     try {
@@ -321,7 +375,9 @@ Plugin.init = async function (params) {
     }
   });
 
-  /* RSVP */
+  /* -----------------------------
+   * RSVP
+   * ---------------------------- */
 
   router.post('/api/calendar/event/:eid/rsvp', middleware.ensureLoggedIn, async (req, res) => {
     try {
@@ -335,7 +391,9 @@ Plugin.init = async function (params) {
     }
   });
 
-  /* PERMISSIONS CLIENT */
+  /* -----------------------------
+   * Client permissions endpoints
+   * ---------------------------- */
 
   router.get('/api/calendar/permissions/create', async (req, res) => {
     const uid = req.user?.uid || 0;
@@ -349,7 +407,9 @@ Plugin.init = async function (params) {
     res.json({ allow });
   });
 
-  /* RÉSERVATION MULTI-JOURS */
+  /* -----------------------------
+   * Multi-day reservation request
+   * ---------------------------- */
 
   router.post('/api/calendar/event/:eid/book', middleware.ensureLoggedIn, async (req, res) => {
     try {
@@ -360,10 +420,12 @@ Plugin.init = async function (params) {
       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 (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' });
@@ -378,18 +440,21 @@ Plugin.init = async function (params) {
 
       const allRes = JSON.parse(event.reservations || '[]');
 
+      // Stock check: sum overlapping reservations (pending_admin/awaiting_payment/paid) for the same item
       const overlapping = allRes.filter(r => {
         if (r.itemId !== itemId) return false;
         if (r.status === 'cancelled') return false;
+
         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 + r.quantity, 0);
-      const available = item.total - used;
+      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 rid = await nextReservationId();
@@ -408,7 +473,7 @@ Plugin.init = async function (params) {
         status: 'pending_admin',
         helloAssoOrderId: null,
         createdAt: now,
-        pickupLocation: item.pickupLocation || '',
+        pickupLocation: String(item.pickupLocation || ''),
       };
 
       allRes.push(reservation);
@@ -417,6 +482,7 @@ Plugin.init = async function (params) {
 
       await db.setObject(getEventKey(eid), event);
 
+      // Email: request created
       try {
         await emailer.send('calendar-reservation-created', uid, {
           subject: 'Votre demande de réservation a été envoyée',
@@ -443,37 +509,46 @@ Plugin.init = async function (params) {
     }
   });
 
-  /* ADMIN : LISTE PENDING */
+  /* -----------------------------
+   * Admin: pending list
+   * ---------------------------- */
 
   router.get('/api/admin/calendar/pending', middleware.admin.checkPrivileges, async (req, res) => {
     try {
       const result = [];
       const eids = await db.getSortedSetRange(EVENTS_SET_KEY, 0, -1);
+
       for (const eid of eids) {
         const event = await getEvent(eid);
         if (!event) continue;
+
         const reservations = JSON.parse(event.reservations || '[]');
         const pending = reservations.filter(r => r.status === 'pending_admin');
         if (pending.length) result.push({ event, reservations: pending });
       }
+
       res.json(result);
     } catch (err) {
       res.status(500).json({ error: err.message });
     }
   });
 
-  /* ADMIN : VALIDATION */
+  /* -----------------------------
+   * Admin: validate reservation -> awaiting_payment + HelloAsso checkout
+   * ---------------------------- */
 
   router.post('/api/admin/calendar/reservation/:rid/validate', middleware.admin.checkPrivileges, async (req, res) => {
     try {
       const rid = req.params.rid;
       const eids = await db.getSortedSetRange(EVENTS_SET_KEY, 0, -1);
+
       let targetEvent = null;
       let reservation = null;
 
       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) {
@@ -487,6 +562,7 @@ Plugin.init = async function (params) {
       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);
       resList[idx] = reservation;
@@ -526,49 +602,57 @@ Plugin.init = async function (params) {
     }
   });
 
-  /* ADMIN : ANNULATION */
+  /* -----------------------------
+   * Admin: cancel reservation
+   * ---------------------------- */
 
   router.post('/api/admin/calendar/reservation/:rid/cancel', middleware.admin.checkPrivileges, async (req, res) => {
     try {
       const rid = req.params.rid;
       const eids = await db.getSortedSetRange(EVENTS_SET_KEY, 0, -1);
-      let reservation = null;
+
+      let found = false;
 
       for (const eid of eids) {
         const event = await getEvent(eid);
         if (!event) continue;
+
         const reservations = JSON.parse(event.reservations || '[]');
         const rIndex = reservations.findIndex(rr => rr.rid === rid);
         if (rIndex !== -1) {
-          reservation = reservations[rIndex];
-          reservation.status = 'cancelled';
-          reservations[rIndex] = reservation;
+          reservations[rIndex].status = 'cancelled';
           event.reservations = JSON.stringify(reservations);
           await db.setObject(getEventKey(event.eid), event);
+          found = true;
           break;
         }
       }
 
-      if (!reservation) return res.status(404).json({ error: 'Réservation introuvable' });
+      if (!found) return res.status(404).json({ error: 'Réservation introuvable' });
       res.json({ success: true });
     } catch (err) {
       res.status(500).json({ error: err.message });
     }
   });
 
-  /* WEBHOOK HELLOASSO */
+  /* -----------------------------
+   * HelloAsso webhook (marks reservation paid)
+   * ---------------------------- */
 
   router.post('/api/calendar/helloasso/webhook', async (req, res) => {
     try {
       const payload = req.body;
       const order = payload.order || payload;
-      const orderId = String(order.id);
+
+      const orderId = String(order.id || '');
       const state = order.state || order.status || '';
       if (state !== 'Paid') return res.json({ ignored: true });
 
       const custom = order.customFields || {};
-      const eid = String(custom.eid);
-      const rid = String(custom.rid);
+      const eid = String(custom.eid || '');
+      const rid = String(custom.rid || '');
+
+      if (!eid || !rid) return res.status(400).json({ error: 'Missing eid/rid in customFields' });
 
       const event = await getEvent(eid);
       if (!event) throw new Error('Event not found');
@@ -580,12 +664,13 @@ Plugin.init = async function (params) {
       const reservation = reservations[rIndex];
       if (reservation.status === 'paid') return res.json({ ok: true });
 
+      // Update optional aggregate reserved count
       const items = JSON.parse(event.bookingItems || '[]');
       const itemIndex = items.findIndex(i => i.id === reservation.itemId);
       if (itemIndex !== -1) {
-        const item = items[itemIndex];
-        item.reserved = (item.reserved || 0) + reservation.quantity;
-        items[itemIndex] = item;
+        const it = items[itemIndex];
+        it.reserved = (Number(it.reserved || 0) + Number(reservation.quantity || 0));
+        items[itemIndex] = it;
       }
 
       reservation.status = 'paid';
@@ -619,21 +704,26 @@ Plugin.init = async function (params) {
     }
   });
 
-  /* PAGE ADMIN PLUGIN (CORRIGÉ) */
+  /* -----------------------------
+   * Admin plugin page + settings API
+   * IMPORTANT: keep these routes EXACTLY aligned with your admin.js
+   * ---------------------------- */
 
   router.get('/admin/plugins/calendar-onekite', middleware.admin.buildHeader, renderAdminPage);
   router.get('/api/admin/plugins/calendar-onekite', renderAdminPage);
 
   router.put('/api/admin/plugins/calendar-onekite', middleware.admin.checkPrivileges, async (req, res) => {
     try {
-      await Settings.set('calendar-onekite', req.body);
+      await Settings.set(SETTINGS_KEY, req.body);
       res.json({ status: 'ok' });
     } catch (err) {
       res.status(500).json({ error: err.message });
     }
   });
 
-  /* PAGE "MES RÉSERVATIONS" */
+  /* -----------------------------
+   * My reservations API
+   * ---------------------------- */
 
   router.get('/api/calendar/my-reservations', middleware.ensureLoggedIn, async (req, res) => {
     try {
@@ -646,10 +736,12 @@ Plugin.init = async function (params) {
       for (const eid of eids) {
         const event = await getEvent(eid);
         if (!event) continue;
+
         const items = JSON.parse(event.bookingItems || '[]');
         const reservations = JSON.parse(event.reservations || '[]');
+
         reservations
-          .filter(r => r.uid === uid)
+          .filter(r => String(r.uid) === uid)
           .forEach(r => {
             const item = items.find(i => i.id === r.itemId);
             result.push({
@@ -663,14 +755,15 @@ Plugin.init = async function (params) {
       }
 
       result.sort((a, b) => new Date(a.dateStart) - new Date(b.dateStart));
-
       res.json(result);
     } catch (err) {
       res.status(500).json({ error: err.message });
     }
   });
 
-  /* PAGE ADMIN PLANNING : liste toutes les résas futures */
+  /* -----------------------------
+   * Admin planning API (future reservations)
+   * ---------------------------- */
 
   router.get('/api/admin/calendar/planning', middleware.admin.checkPrivileges, async (req, res) => {
     try {
@@ -681,8 +774,10 @@ Plugin.init = async function (params) {
       for (const eid of eids) {
         const event = await getEvent(eid);
         if (!event) continue;
+
         const items = JSON.parse(event.bookingItems || '[]');
         const reservations = JSON.parse(event.reservations || '[]');
+
         reservations
           .filter(r => r.status === 'pending_admin' || r.status === 'awaiting_payment' || r.status === 'paid')
           .forEach(r => {
@@ -711,20 +806,13 @@ Plugin.init = async function (params) {
   });
 };
 
-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' });
-}
+/* -----------------------------
+ * ACP nav entry
+ * ---------------------------- */
 
 Plugin.addAdminNavigation = function (header) {
   header.plugins.push({
+    // NodeBB ACP will resolve this under /admin
     route: '/plugins/calendar-onekite',
     icon: 'fa fa-calendar',
     name: 'Calendar OneKite',
@@ -732,6 +820,10 @@ Plugin.addAdminNavigation = function (header) {
   return header;
 };
 
+/* -----------------------------
+ * Widget
+ * ---------------------------- */
+
 Plugin.defineWidgets = async function (widgets) {
   widgets.push({
     widget: 'calendarUpcoming',
@@ -744,7 +836,7 @@ Plugin.defineWidgets = async function (widgets) {
 
 Plugin.renderUpcomingWidget = async function (widget, callback) {
   try {
-    const settings = (await Settings.get('calendar-onekite')) || {};
+    const settings = (await Settings.get(SETTINGS_KEY)) || {};
     const limit = Number(widget.data.limit || settings.limit || 5);
     const events = await getUpcomingEvents(limit);
     const html = await appRef.renderAsync('widgets/calendar-upcoming', { events });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "1.3.8",
+  "version": "1.4.0",
   "description": "",
   "repository": {
     "type": "git",

package/plugin.json

@@ -3,7 +3,7 @@
   "name": "Calendar Onekite",
   "description": "Calendrier + réservation de matériel + validation admin + paiement HelloAsso pour NodeBB v4",
   "url": "",
-  "version": "1.3.8",
+  "version": "1.4.0",
   "library": "./library.js",
   "staticDirs": {
     "static": "static"

package/templates/admin/plugins/calendar-onekite.tpl

@@ -1,5 +1,5 @@
 <div id="calendar-onekite-admin">
-  <h2>Calendar Lite – Administration</h2>
+  <h2>Calendar Onekite – Administration</h2>
 
   <h3>Réservations en attente</h3>
   <div id="pending-reservations"></div>

package/templates/admin/plugins/calendar-planning.tpl

@@ -2,8 +2,8 @@
   <h2>Planning des réservations de matériel</h2>
 
   <p>
-    <a href="/admin/plugins/calendar-lite" class="btn btn-default btn-sm">
-      ← Retour au plugin Calendar Lite
+    <a href="/admin/plugins/calendar-onekite" class="btn btn-default btn-sm">
+      ← Retour au plugin Calendar Onekite
     </a>
   </p>
 
@@ -27,4 +27,4 @@
   </table>
 </div>
 
-<script src="/plugins/nodebb-plugin-calendar-lite/static/js/admin.js"></script>
+<script src="/plugins/nodebb-plugin-calendar-onekite/static/js/admin.js"></script>