@tricoteuses/senat 2.20.25 → 2.20.27

package/lib/utils/reunion_odj_building.js

@@ -73,6 +73,8 @@ 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
+    const cleanCode = (code) => code.replace(/-SEANCE$/, "");
     const lecture = detectLecture(ev.objet ?? "");
     const organe = ev.organe ?? "";
     const nature = organe.toLowerCase().includes("commission")
@@ -82,7 +84,7 @@ function computeCodeEtape(ev, dossier) {
             : "";
     const evDate = ev.date.split("T")[0];
     const flat = buildFlatActes(dossier);
-    // 1) Match strict : même date + nature (COM / DEBATS si connue)
+    // 1) Strict matching : same date + nature
     let candidates = flat.filter((a) => {
         if (a.date !== evDate)
             return false;
@@ -90,50 +92,48 @@ function computeCodeEtape(ev, dossier) {
             return false;
         return true;
     });
-    // console.log(`  → candidats STRICT (date==${evDate} & nature=${nature || "ANY"}): ${candidates.length}`)
-    // candidates.forEach((c) => console.log(`    STRICT MATCH: ${c.codeActe} (date=${c.date}, lecture=${c.ordreLecture})`))
-    // Si lecture détectée → on filtre si ça garde des candidats
+    // If lecture is specified, filter by it
     if (lecture !== undefined && candidates.length > 0) {
         const withLecture = candidates.filter((c) => c.ordreLecture === lecture);
         if (withLecture.length > 0) {
-            // console.log(`  → filtre lecture=${lecture} : ${withLecture.length} candidats`)
             candidates = withLecture;
         }
     }
     // Multiple candidates : we take the longest ?
     if (candidates.length > 0) {
         candidates.sort((a, b) => b.codeActe.length - a.codeActe.length);
-        // console.log(`  ✔ match FINAL (intervalle) : ${candidates[0].codeActe}`)
-        return candidates[0].codeActe;
+        return cleanCode(candidates[0].codeActe);
     }
-    // 2) fallback COM : dernier acte COM avant la date
+    // 2) fallback COM
     if (nature === "COM") {
         let comActs = flat.filter((a) => a.codeActe.includes("COM") && a.date <= evDate);
-        // console.log(`  → fallback COM: actes COM <= date : ${comActs.length}`)
         if (lecture !== undefined) {
             const byLecture = comActs.filter((a) => a.ordreLecture === lecture);
             if (byLecture.length > 0) {
                 comActs = byLecture;
-                // console.log(`  → filtrés lecture=${lecture}: ${comActs.length}`)
             }
         }
         if (comActs.length > 0) {
             comActs.sort((a, b) => b.date.localeCompare(a.date) || b.codeActe.length - a.codeActe.length);
-            // console.log(`  ✔ match FINAL (fallback COM): ${comActs[0].codeActe}`)
-            return comActs[0].codeActe;
+            return cleanCode(comActs[0].codeActe);
         }
     }
-    // 3) Fallback lecture générale (SN1, SN2…) depuis la structure d’origine
+    // 3) Fallback lecture générale
     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") {
-            // console.log(`  ✔ FALLBACK LECTURE: ${rootCode}`)
-            return rootCode;
+            return cleanCode(rootCode);
         }
     }
-    console.log(`  ✖ aucun code d’étape trouvé pour ev=${ev.id}`);
+    console.log(`✖ Échec pour ev=${ev.id}`, {
+        evDate,
+        nature,
+        lecture,
+        nbCandidatesInitial: flat.length,
+        firstFlatDate: flat[0]?.date,
+    });
     return null;
 }
 function buildFlatActes(dossier) {

package/package.json

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