nodebb-plugin-onekite-calendar 2.0.30 → 2.0.32

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog – calendar-onekite
 
+## 1.3.27
+- Refactor : ajout d'un module `lib/utils.js` (format dates FR, lecture settings ACP, helpers listes/UIDs) pour supprimer les duplications.
+- Cleanup : suppression d'un doublon de fonctions dans `helloassoWebhook.js` (formatFR + getReservationIdFromPayload).
+- Perf : scheduler optimisé (chargement **batch** des réservations via `getReservations()` au lieu d'un `getReservation()` par id).
+
 ## 1.3.26
 - Scheduler : garde "send-once" rendue **atomique** en multi-instance (priorité à `db.incrObjectField(key, rid)`), pour garantir qu'au moins une instance envoie les emails/Discord avant suppression.
 - Scheduler : en cas d'erreur DB sur la garde, on **privilégie l'envoi** plutôt que "expire sans email" (dernier recours : autoriser l'envoi même si la garde échoue).

package/lib/admin.js

@@ -3,20 +3,7 @@
 const meta = require.main.require('./src/meta');
 const user = require.main.require('./src/user');
 const emailer = require.main.require('./src/emailer');
-const nconf = require.main.require('nconf');
-
-function forumBaseUrl() {
-  const base = String(nconf.get('url') || '').trim().replace(/\/$/, '');
-  return base;
-}
-
-function formatFR(tsOrIso) {
-  const d = new Date(typeof tsOrIso === 'string' && /^[0-9]+$/.test(tsOrIso) ? parseInt(tsOrIso, 10) : tsOrIso);
-  const dd = String(d.getDate()).padStart(2, '0');
-  const mm = String(d.getMonth() + 1).padStart(2, '0');
-  const yyyy = d.getFullYear();
-  return `${dd}/${mm}/${yyyy}`;
-}
+const { forumBaseUrl, formatFR } = require('./utils');
 
 function buildHelloAssoItemName(baseLabel, itemNames, start, end) {
   const base = String(baseLabel || 'Réservation matériel Onekite').trim();

package/lib/api.js

@@ -11,6 +11,7 @@ const db = require.main.require('./src/database');
 const logger = require.main.require('./src/logger');
 
 const dbLayer = require('./db');
+const { formatFR } = require('./utils');
 
 // Resolve group identifiers from ACP.
 // Admins may enter a group *name* ("Test") or a *slug* ("onekite-ffvl-2026").
@@ -177,14 +178,6 @@ function overlap(aStart, aEnd, bStart, bEnd) {
 }
 
 
-function formatFR(tsOrIso) {
-  const d = new Date(typeof tsOrIso === 'string' && /^[0-9]+$/.test(tsOrIso) ? parseInt(tsOrIso, 10) : tsOrIso);
-  const dd = String(d.getDate()).padStart(2, '0');
-  const mm = String(d.getMonth() + 1).padStart(2, '0');
-  const yyyy = d.getFullYear();
-  return `${dd}/${mm}/${yyyy}`;
-}
-
 function buildHelloAssoItemName(baseLabel, itemNames, start, end) {
   const base = String(baseLabel || '').trim();
   const items = Array.isArray(itemNames) ? itemNames.map((s) => String(s || '').trim()).filter(Boolean) : [];

package/lib/helloassoWebhook.js

@@ -10,6 +10,7 @@ const dbLayer = require('./db');
 const helloasso = require('./helloasso');
 const discord = require('./discord');
 const realtime = require('./realtime');
+const { formatFR } = require('./utils');
 
 async function auditLog(action, actorUid, payload) {
   try {
@@ -49,14 +50,6 @@ async function sendEmail(template, uid, subject, data) {
   }
 }
 
-function formatFR(tsOrIso) {
-  const d = new Date(tsOrIso);
-  const dd = String(d.getDate()).padStart(2, '0');
-  const mm = String(d.getMonth() + 1).padStart(2, '0');
-  const yyyy = d.getFullYear();
-  return `${dd}/${mm}/${yyyy}`;
-}
-
 function getReservationIdFromPayload(payload) {
   try {
     const data = payload && payload.data ? payload.data : null;
@@ -186,27 +179,6 @@ function isConfirmedPayment(payload) {
   }
 }
 
-function formatFR(tsOrIso) {
-  const d = new Date(tsOrIso);
-  const dd = String(d.getDate()).padStart(2, '0');
-  const mm = String(d.getMonth() + 1).padStart(2, '0');
-  const yyyy = d.getFullYear();
-  return `${dd}/${mm}/${yyyy}`;
-}
-
-function getReservationIdFromPayload(payload) {
-  try {
-    const m = payload && payload.data ? payload.data.meta : null;
-    if (!m) return null;
-    if (typeof m === 'object' && m.reservationId) return String(m.reservationId);
-    if (typeof m === 'object' && m.reservationID) return String(m.reservationID);
-    return null;
-  } catch (e) {
-    return null;
-  }
-}
-
-
 function getCheckoutIntentIdFromPayload(payload) {
   try {
     const data = payload && payload.data ? payload.data : null;

package/lib/scheduler.js

@@ -7,6 +7,7 @@ const discord = require('./discord');
 const realtime = require('./realtime');
 const nconf = require.main.require('nconf');
 const groups = require.main.require('./src/groups');
+const utils = require('./utils');
 
 let timer = null;
 
@@ -51,25 +52,7 @@ async function addOnce(key, value) {
   }
 }
 
-function getSetting(settings, key, fallback) {
-  const v = settings && Object.prototype.hasOwnProperty.call(settings, key) ? settings[key] : undefined;
-  if (v == null || v === '') return fallback;
-  if (typeof v === 'object' && v && typeof v.value !== 'undefined') return v.value;
-  return v;
-}
-
-function formatFR(ts) {
-  const d = new Date(ts);
-  const dd = String(d.getDate()).padStart(2, '0');
-  const mm = String(d.getMonth() + 1).padStart(2, '0');
-  const yyyy = d.getFullYear();
-  return `${dd}/${mm}/${yyyy}`;
-}
-
-function forumBaseUrl() {
-  const base = String(nconf.get('url') || '').trim().replace(/\/$/, '');
-  return base;
-}
+const { getSetting, formatFR, forumBaseUrl, normalizeAllowedGroups, normalizeUids, arrayifyNames } = utils;
 
 // Resolve group identifiers from ACP (name or slug) and return UIDs.
 async function getMembersByGroupIdentifier(groupIdentifier) {
@@ -111,30 +94,7 @@ async function getMembersByGroupIdentifier(groupIdentifier) {
   return Array.isArray(members) ? members : [];
 }
 
-function normalizeUids(members) {
-  if (!Array.isArray(members)) return [];
-  const out = [];
-  for (const m of members) {
-    if (Number.isInteger(m)) { out.push(m); continue; }
-    if (typeof m === 'string' && m.trim() && !Number.isNaN(parseInt(m, 10))) { out.push(parseInt(m, 10)); continue; }
-    if (m && typeof m === 'object' && (Number.isInteger(m.uid) || (typeof m.uid === 'string' && m.uid.trim()))) {
-      const u = Number.isInteger(m.uid) ? m.uid : parseInt(m.uid, 10);
-      if (!Number.isNaN(u)) out.push(u);
-    }
-  }
-  return Array.from(new Set(out)).filter((u) => Number.isInteger(u) && u > 0);
-}
-
-function normalizeAllowedGroups(raw) {
-  if (!raw) return [];
-  if (Array.isArray(raw)) {
-    return raw.map((s) => String(s || '').trim()).filter(Boolean);
-  }
-  return String(raw)
-    .split(',')
-    .map((s) => String(s || '').trim())
-    .filter(Boolean);
-}
+// normalizeUids/normalizeAllowedGroups are provided by utils
 
 async function getValidatorUids(settings) {
   const out = new Set();
@@ -189,12 +149,14 @@ async function expirePending() {
   const validatorUids = validatorReminderMins > 0 ? await getValidatorUids(settings) : [];
 
   const ids = await dbLayer.listAllReservationIds(5000);
-  if (!ids || !ids.length) {
-    return;
-  }
+  if (!ids || !ids.length) return;
 
-  for (const rid of ids) {
-    const resv = await dbLayer.getReservation(rid);
+  // Batch load to avoid N+1 queries on Mongo/Redis adapters.
+  const reservations = await dbLayer.getReservations(ids);
+
+  for (let i = 0; i < ids.length; i += 1) {
+    const rid = ids[i];
+    const resv = reservations[i];
     if (!resv || resv.status !== 'pending') {
       continue;
     }
@@ -213,7 +175,7 @@ async function expirePending() {
           await sendEmail('calendar-onekite_validator_reminder', vuid, 'Location matériel - Demande en attente', {
             rid,
             requesterUsername,
-            itemNames: (Array.isArray(resv.itemNames) ? resv.itemNames : (resv.itemName ? [resv.itemName] : [])).filter(Boolean),
+            itemNames: arrayifyNames(resv),
             dateRange: `Du ${formatFR(resv.start)} au ${formatFR(resv.end)}`,
             adminUrl,
             kind: 'pending',
@@ -238,7 +200,7 @@ async function expirePending() {
         await sendEmail('calendar-onekite_expired', requesterUid, 'Location matériel - Demande expirée', {
           uid: requesterUid,
           username: requesterUsername,
-          itemNames: (Array.isArray(resv.itemNames) ? resv.itemNames : (resv.itemName ? [resv.itemName] : [])).filter(Boolean),
+          itemNames: arrayifyNames(resv),
           dateRange: `Du ${formatFR(resv.start)} au ${formatFR(resv.end)}`,
           delayMinutes: holdMins,
           reason,
@@ -252,7 +214,7 @@ async function expirePending() {
           await sendEmail('calendar-onekite_validator_expired', vuid, 'Location matériel - Demande expirée', {
             rid,
             requesterUsername,
-            itemNames: (Array.isArray(resv.itemNames) ? resv.itemNames : (resv.itemName ? [resv.itemName] : [])).filter(Boolean),
+            itemNames: arrayifyNames(resv),
             dateRange: `Du ${formatFR(resv.start)} au ${formatFR(resv.end)}`,
             adminUrl,
             reason,
@@ -308,21 +270,16 @@ async function processAwaitingPayment() {
     }
   }
 
-  function formatFR(ts) {
-    const d = new Date(ts);
-    const dd = String(d.getDate()).padStart(2, '0');
-    const mm = String(d.getMonth() + 1).padStart(2, '0');
-    const yyyy = d.getFullYear();
-    return `${dd}/${mm}/${yyyy}`;
-  }
-
   const adminUrl = (() => {
     const base = forumBaseUrl();
     return base ? `${base}/admin/plugins/calendar-onekite` : '/admin/plugins/calendar-onekite';
   })();
 
-  for (const rid of ids) {
-    const r = await dbLayer.getReservation(rid);
+  const reservations = await dbLayer.getReservations(ids);
+
+  for (let i = 0; i < ids.length; i += 1) {
+    const rid = ids[i];
+    const r = reservations[i];
     if (!r || r.status !== 'awaiting_payment') continue;
 
     const approvedAt = parseInt(r.approvedAt || r.validatedAt || 0, 10) || 0;
@@ -349,8 +306,8 @@ async function processAwaitingPayment() {
         await sendEmail('calendar-onekite_reminder', toUid, 'Location matériel - Rappel', {
           uid: toUid,
           username: (u && u.username) ? u.username : '',
-          itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
-          itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
+          itemName: arrayifyNames(r).join(', '),
+          itemNames: arrayifyNames(r),
           dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
           paymentUrl: r.paymentUrl || '',
           delayMinutes: holdMins,
@@ -383,8 +340,8 @@ async function processAwaitingPayment() {
         await sendEmail('calendar-onekite_expired', toUid, 'Location matériel - Demande expirée', {
           uid: toUid,
           username: (u && u.username) ? u.username : '',
-          itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
-          itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
+          itemName: arrayifyNames(r).join(', '),
+          itemNames: arrayifyNames(r),
           dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
           delayMinutes: holdMins,
           reason: 'Paiement non reçu dans le temps imparti.',
@@ -398,7 +355,7 @@ async function processAwaitingPayment() {
           await sendEmail('calendar-onekite_validator_expired', vuid, 'Location matériel - Demande expirée', {
             rid: r.rid || rid,
             requesterUsername: (u && u.username) ? u.username : (r.username || ''),
-            itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])).filter(Boolean),
+            itemNames: arrayifyNames(r),
             dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
             adminUrl,
             reason: 'Paiement non reçu dans le temps imparti.',

package/lib/utils.js

@@ -0,0 +1,70 @@
+'use strict';
+
+const nconf = require.main.require('nconf');
+
+function getSetting(settings, key, fallback) {
+  const v = settings && Object.prototype.hasOwnProperty.call(settings, key) ? settings[key] : undefined;
+  if (v == null || v === '') return fallback;
+  if (typeof v === 'object' && v && typeof v.value !== 'undefined') return v.value;
+  return v;
+}
+
+function formatFR(tsOrIso) {
+  const ts = (typeof tsOrIso === 'string' && tsOrIso.includes('-')) ? Date.parse(tsOrIso) : Number(tsOrIso);
+  const d = new Date(Number.isFinite(ts) ? ts : tsOrIso);
+  const dd = String(d.getDate()).padStart(2, '0');
+  const mm = String(d.getMonth() + 1).padStart(2, '0');
+  const yyyy = d.getFullYear();
+  return `${dd}/${mm}/${yyyy}`;
+}
+
+function formatFRShort(tsOrIso) {
+  const ts = (typeof tsOrIso === 'string' && tsOrIso.includes('-')) ? Date.parse(tsOrIso) : Number(tsOrIso);
+  const d = new Date(Number.isFinite(ts) ? ts : tsOrIso);
+  const dd = String(d.getDate()).padStart(2, '0');
+  const mm = String(d.getMonth() + 1).padStart(2, '0');
+  return `${dd}/${mm}`;
+}
+
+function forumBaseUrl() {
+  return String(nconf.get('url') || '').trim().replace(/\/$/, '');
+}
+
+function normalizeAllowedGroups(raw) {
+  if (!raw) return [];
+  if (Array.isArray(raw)) {
+    return raw.map((s) => String(s || '').trim()).filter(Boolean);
+  }
+  return String(raw)
+    .split(',')
+    .map((s) => String(s || '').trim())
+    .filter(Boolean);
+}
+
+function normalizeUids(members) {
+  if (!Array.isArray(members)) return [];
+  const out = [];
+  for (const m of members) {
+    if (Number.isInteger(m)) { out.push(m); continue; }
+    if (typeof m === 'string' && m.trim() && !Number.isNaN(parseInt(m, 10))) { out.push(parseInt(m, 10)); continue; }
+    if (m && typeof m === 'object' && (Number.isInteger(m.uid) || (typeof m.uid === 'string' && m.uid.trim()))) {
+      const u = Number.isInteger(m.uid) ? m.uid : parseInt(m.uid, 10);
+      if (!Number.isNaN(u)) out.push(u);
+    }
+  }
+  return Array.from(new Set(out)).filter((u) => Number.isInteger(u) && u > 0);
+}
+
+function arrayifyNames(obj) {
+  return (Array.isArray(obj && obj.itemNames) ? obj.itemNames : (obj && obj.itemName ? [obj.itemName] : [])).filter(Boolean);
+}
+
+module.exports = {
+  getSetting,
+  formatFR,
+  formatFRShort,
+  forumBaseUrl,
+  normalizeAllowedGroups,
+  normalizeUids,
+  arrayifyNames,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-onekite-calendar",
-  "version": "2.0.30",
+  "version": "2.0.32",
   "description": "FullCalendar-based equipment reservation workflow with admin approval & HelloAsso payment for NodeBB",
   "main": "library.js",
   "license": "MIT",

package/plugin.json

@@ -39,5 +39,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "2.0.30"
+  "version": "2.0.32"
 }