@tricoteuses/senat 2.20.28 → 2.20.29

package/lib/utils/reunion_odj_building.js

@@ -73,7 +73,7 @@ function detectLecture(objet) {
     return undefined;
 }
 function computeCodeEtape(ev, dossier) {
-    // In order to match with etape, we need to remove the '-SEANCE' suffix from the codeActe
+    // In order to match with stage, we need to remove the '-SEANCE' suffix from the codeActe
     const cleanCode = (code) => code.replace(/-SEANCE$/, "");
     const lecture = detectLecture(ev.objet ?? "");
     const organe = ev.organe ?? "";
@@ -84,7 +84,7 @@ function computeCodeEtape(ev, dossier) {
             : "";
     const evDate = ev.date.split("T")[0];
     const flat = buildFlatActes(dossier);
-    // 1) Strict matching : same date + nature
+    // 1) Strict matching: same date + same nature
     let candidates = flat.filter((a) => {
         if (a.date !== evDate)
             return false;
@@ -92,67 +92,63 @@ function computeCodeEtape(ev, dossier) {
             return false;
         return true;
     });
-    // If lecture is specified, filter by it
+    // If a specific lecture is detected in the agenda event, refine the candidates
     if (lecture !== undefined && candidates.length > 0) {
         const withLecture = candidates.filter((c) => c.ordreLecture === lecture);
         if (withLecture.length > 0) {
             candidates = withLecture;
         }
     }
-    // Multiple candidates : we take the longest ?
     if (candidates.length > 0) {
+        // Multiple candidates: pick the most specific one (longest code string)
         candidates.sort((a, b) => b.codeActe.length - a.codeActe.length);
         return cleanCode(candidates[0].codeActe);
     }
-    // 2) fallback COM
+    // 2) Fallback COM: If no exact date match for a commission event,
+    // take the latest commission act for this lecture on or before the event date.
     if (nature === "COM") {
         let comActs = flat.filter((a) => a.codeActe.includes("COM") && a.date <= evDate);
         if (lecture !== undefined) {
             const byLecture = comActs.filter((a) => a.ordreLecture === lecture);
-            if (byLecture.length > 0) {
+            if (byLecture.length > 0)
                 comActs = byLecture;
-            }
         }
         if (comActs.length > 0) {
             comActs.sort((a, b) => b.date.localeCompare(a.date) || b.codeActe.length - a.codeActe.length);
             return cleanCode(comActs[0].codeActe);
         }
     }
-    // 3) Fallback lecture générale
+    // 3) Fallback general lecture: if nothing else worked but a lecture is identified,
+    // find any act belonging to that lecture (e.g., SN1-DEPOT).
     if (lecture !== undefined) {
-        const lectures = dossier["actes_legislatifs"] ?? [];
-        const lectureNode = lectures.find((l) => l.ordre_lecture === lecture);
-        const rootCode = lectureNode?.code_acte;
-        if (rootCode && typeof rootCode === "string") {
-            return cleanCode(rootCode);
+        const genericActe = flat.find((a) => a.ordreLecture === lecture);
+        if (genericActe) {
+            return cleanCode(genericActe.codeActe);
         }
     }
-    console.log(`Détails technique pour ev=${ev.id}:`, {
-        nbLectures: dossier["actes_legislatifs"]?.length || 0,
-        clesDossier: Object.keys(dossier).slice(0, 10),
-        structurePremierActe: dossier["actes_legislatifs"]?.[0]
-            ? JSON.stringify(dossier["actes_legislatifs"][0]).substring(0, 200)
-            : "AUCUN_ACTE",
+    console.log(`✖ No stage code found for ev=${ev.id} (Date: ${evDate}, Nature: ${nature}, Lecture: ${lecture})`, {
+        totalActsInDossier: dossier["actes_legislatifs"]?.length || 0,
+        firstActDate: flat[0]?.date,
     });
     return null;
 }
 function buildFlatActes(dossier) {
-    const lectures = dossier["actes_legislatifs"] ?? [];
+    const actes = dossier["actes_legislatifs"] ?? [];
     const res = [];
-    for (const lectureActe of lectures) {
-        const assemblee = lectureActe["assemblee"] || "";
-        if (!assemblee.toLowerCase().includes("sénat") && !assemblee.toLowerCase().includes("senat"))
+    for (const acte of actes) {
+        if (acte["chambre"] !== "SN")
             continue;
-        const ordreLecture = lectureActe.ordre_lecture;
-        const sub = lectureActe.actes_legislatifs;
-        const actes = Array.isArray(sub) && sub.length > 0 ? sub : [lectureActe];
-        for (const acte of actes) {
-            const codeActe = acte.code_acte;
-            const dateActe = acte.date?.split("T")[0];
-            if (!codeActe || !dateActe)
-                continue;
-            res.push({ codeActe, ordreLecture, date: dateActe });
-        }
+        const codeActe = acte.code_acte;
+        const dateActe = acte.date?.split("T")[0];
+        if (!codeActe || !dateActe)
+            continue;
+        const match = codeActe.match(/^(?:SN|AN)(\d+)/);
+        const ordreLecture = match ? parseInt(match[1], 10) : undefined;
+        res.push({
+            codeActe,
+            date: dateActe,
+            ordreLecture,
+        });
     }
     return res;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tricoteuses/senat",
-  "version": "2.20.28",
+  "version": "2.20.29",
   "description": "Handle French Sénat's open data",
   "keywords": [
     "France",