nodebb-plugin-equipment-calendar 0.8.2 → 0.8.6

package/library.js

@@ -207,38 +207,75 @@ function isCheckoutPaid(checkout) {
   return false;
 }
 
+
 async function fetchHelloAssoItems(settings) {
   const org = String(settings.ha_organizationSlug || '').trim();
   const formType = String(settings.ha_itemsFormType || '').trim();
   const formSlug = String(settings.ha_itemsFormSlug || '').trim();
   if (!org || !formType || !formSlug) return [];
 
+  const token = await getHelloAssoAccessToken(settings);
+  const base = (String(settings.ha_apiBaseUrl || '').trim() || 'https://api.helloasso.com').replace(/\/$/, '');
   const cacheKey = `equipmentCalendar:ha:items:${org}:${formType}:${formSlug}`;
-  const cache = await db.getObject(cacheKey);
+
+  // Cache 10 minutes
+  const cached = await db.getObject(cacheKey);
   const now = Date.now();
-  if (cache && cache.payload && cache.expiresAt && now < parseInt(cache.expiresAt, 10)) {
-    try {
-      return JSON.parse(cache.payload);
-    } catch (e) {}
+  if (cached && cached.itemsJson && cached.expMs && now < parseInt(cached.expMs, 10)) {
+    try { return JSON.parse(cached.itemsJson); } catch (e) {}
   }
 
-  const token = await getHelloAssoAccessToken(settings);
-  const url = `https://api.helloasso.com/v5/organizations/${encodeURIComponent(org)}/forms/${encodeURIComponent(formType)}/${encodeURIComponent(formSlug)}/items`;
-  const resp = await fetchFn(url, { headers: { authorization: `Bearer ${token}` } });
+  // IMPORTANT:
+  // - /forms/.../items = "articles vendus" (liés aux commandes) => peut renvoyer 0 si aucune commande
+  // - /forms/.../public = données publiques détaillées => contient la structure (tiers / products) du formulaire
+  const publicUrl = `${base}/v5/organizations/${encodeURIComponent(org)}/forms/${encodeURIComponent(formType)}/${encodeURIComponent(formSlug)}/public`;
+  const resp = await fetchFn(publicUrl, { headers: { authorization: `Bearer ${token}`, accept: 'application/json' } });
   if (!resp.ok) {
     const t = await resp.text();
-    throw new Error(`HelloAsso items error: ${resp.status} ${t}`);
+    throw new Error(`HelloAsso public form error: ${resp.status} ${t}`);
+  }
+  const data = await resp.json();
+
+  // Extract catalog items:
+  // structure differs by formType; common pattern: data.tiers[] or data.tiers[].products[] / items[]
+  const out = [];
+  const tiers = (data && (data.tiers || data.tiersList || data.prices || data.priceCategories)) || [];
+  const tierArr = Array.isArray(tiers) ? tiers : [];
+
+  function pushItem(it, tierName) {
+    if (!it) return;
+    const id = String(it.id || it.itemId || it.reference || it.slug || it.code || it.name || '').trim();
+    const name = String(it.name || it.label || it.title || '').trim() || (tierName ? String(tierName) : id);
+    if (!id || !name) return;
+    const amount = it.amount || it.price || it.unitPrice || it.totalAmount || it.initialAmount;
+    const priceCents = (typeof amount === 'number' ? amount : parseInt(amount, 10)) || 0;
+    out.push({ id, name, priceCents: String(priceCents), location: '' });
   }
-  const json = await resp.json();
-  // API responses are usually { data: [...] } but keep it flexible
-  const list = Array.isArray(json) ? json : (Array.isArray(json.data) ? json.data : []);
 
-  // cache 15 minutes
-  try {
-    await db.setObject(cacheKey, { payload: JSON.stringify(list), expiresAt: String(now + 15 * 60 * 1000) });
-  } catch (e) {}
+  // Try a few known layouts
+  for (const t of tierArr) {
+    const tierName = t && (t.name || t.label || t.title);
+    const products = (t && (t.items || t.products || t.prices || t.options)) || [];
+    const arr = Array.isArray(products) ? products : [];
+    if (arr.length) {
+      arr.forEach(p => pushItem(p, tierName));
+    } else {
+      // sometimes tier itself is the product
+      pushItem(t, tierName);
+    }
+  }
+
+  // Fallback: some forms expose items directly
+  if (!out.length && data && Array.isArray(data.items)) {
+    data.items.forEach(p => pushItem(p, ''));
+  }
+
+  await db.setObject(cacheKey, {
+    itemsJson: JSON.stringify(out),
+    expMs: String(Date.now() + 10 * 60 * 1000),
+  });
 
-  return list;
+  return out;
 }
 
 function parseItems(itemsJson) {
@@ -794,6 +831,8 @@ async function handleHelloAssoTest(req, res) {
   if (!isAdmin) return helpers.notAllowed(req, res);
 
   const settings = await getSettings();
+  let sampleItems = [];
+  let hasSampleItems = false;
   let ok = false;
   let message = '';
   let count = 0;
@@ -807,13 +846,14 @@ async function handleHelloAssoTest(req, res) {
     const items = await fetchHelloAssoItems(settings);
     const list = Array.isArray(items) ? items : (Array.isArray(items.data) ? items.data : []);
     count = list.length;
-    const sampleItems = list.slice(0, 10).map(it => ({
+    sampleItems = list.slice(0, 10).map(it => ({
       id: String(it.id || it.itemId || it.reference || it.slug || it.name || '').trim(),
       name: String(it.name || it.label || it.title || '').trim(),
       rawName: String(it.name || it.label || it.title || it.id || '').trim(),
     }));
+    hasSampleItems = sampleItems && sampleItems.length > 0;
     ok = true;
-    message = `OK: token valide. Items récupérés: ${count}.`;
+    message = `OK: token valide. Catalogue récupéré via /public : ${count} item(s).`;
   } catch (e) {
     ok = false;
     message = (e && e.message) ? e.message : String(e);
@@ -826,6 +866,7 @@ async function handleHelloAssoTest(req, res) {
     count,
     settings,
     sampleItems,
+    hasSampleItems,
     hasSampleItems: sampleItems && sampleItems.length > 0,
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "0.8.2",
+  "version": "0.8.6",
   "description": "Equipment reservation calendar for NodeBB (FullCalendar, approvals, HelloAsso payments)",
   "main": "library.js",
   "scripts": {

package/plugin.json

@@ -25,6 +25,6 @@
   "scripts": [
     "public/js/client.js"
   ],
-  "version": "0.4.8",
+  "version": "0.5.0",
   "minver": "4.7.1"
 }