@tricoteuses/senat 3.1.17 → 3.1.19

package/lib/src/model/dosleg.js

@@ -1,277 +1,123 @@
-import { streamUnsafeQuery } from "../databases_postgres.js";
-function stripTrailingHashesSql(expr) {
-    return `regexp_replace(${expr}, '#+$', '')`;
+import { sql } from "kysely";
+import { jsonArrayFrom } from "kysely/helpers/postgres";
+import { dbSenat } from "../databases";
+import { concat, rtrim, toDateString } from "./util";
+import { textes, rapports } from "./documents";
+function datesSeances(lectureAssembleeId) {
+    return jsonArrayFrom(dbSenat
+        .withSchema("dosleg")
+        .selectFrom("dosleg.date_seance")
+        .where("dosleg.date_seance.lecidt", "=", lectureAssembleeId)
+        .select(({ ref }) => [toDateString(ref("dosleg.date_seance.date_s")).as("date")]));
 }
-function buildAuteursTexteSql(texteIdSql) {
-    return `
-    (
-      select coalesce(json_agg(author_rows order by author_rows.ordre_num nulls last), '[]'::json)
-      from (
-        select
-          auteur.prenom as prenom,
-          auteur.nomuse as nom_usuel,
-          auteur.autmat as matricule,
-          ecr.ecrnumtri::text as ordre,
-          ecr.ecrnumtri as ordre_num,
-          rolsig.rolsiglib as role,
-          ecr.ecrqua as qualite
-        from senat.dosleg_auteur as auteur
-        left join senat.dosleg_ecr as ecr on ecr.autcod = auteur.autcod
-        left join senat.dosleg_rolsig as rolsig on rolsig.signataire = ecr.signataire
-        where ecr.texcod = ${texteIdSql}
-      ) as author_rows
-    )
-  `;
+function lecturesAssemblee(lectureId) {
+    return jsonArrayFrom(dbSenat
+        .withSchema("dosleg")
+        .selectFrom("lecass")
+        .where("lecass.lecidt", "=", lectureId)
+        .leftJoin("ass", "ass.codass", "lecass.codass")
+        .leftJoin("org", "org.orgcod", "lecass.orgcod")
+        .leftJoin("orippr", "orippr.oripprcod", "lecass.orippr")
+        .select(({ ref }) => [
+        rtrim(ref("ass.libass")).as("assemblee"),
+        "org.orgnom as libelle_organisme",
+        "org.senorgcod as code_organisme",
+        "lecass.ordreass as ordre_lecture_assemblee",
+        "lecass.sesann as session",
+        "orippr.oripprlib as origine_proposition",
+        "lecass.ptlnum as numero_petite_loi",
+        "lecass.ptlurl as url_petite_loi",
+        "lecass.loiintmod as loi_intitule_modifie",
+        "lecass.debatsurl as url_cr_debats",
+        toDateString(ref("lecass.lecassamecomdat")).as("date_publication_amendements_commission"),
+        toDateString(ref("lecass.lecassamedat")).as("date_publication_amendements_seance"),
+        textes(ref("lecass.lecassidt")).as("textes"),
+        rapports(ref("lecass.lecassidt")).as("rapports"),
+        datesSeances(ref("lecass.lecassidt")).as("dates_seances"),
+    ])
+        .orderBy("lecass.ordreass", "asc"));
 }
-function buildAuteursRapportSql(rapportIdSql) {
-    return `
-    (
-      select coalesce(json_agg(author_rows order by author_rows.ordre_num nulls last), '[]'::json)
-      from (
-        select
-          auteur.prenom as prenom,
-          auteur.nomuse as nom_usuel,
-          auteur.autmat as matricule,
-          ecr.ecrnumtri::text as ordre,
-          ecr.ecrnumtri as ordre_num,
-          rolsig.rolsiglib as role,
-          ecr.ecrqua as qualite
-        from senat.dosleg_auteur as auteur
-        left join senat.dosleg_ecr as ecr on ecr.autcod = auteur.autcod
-        left join senat.dosleg_rolsig as rolsig on rolsig.signataire = ecr.signataire
-        where ecr.rapcod = ${rapportIdSql}
-      ) as author_rows
-    )
-  `;
+function lectures(loiId) {
+    return jsonArrayFrom(dbSenat
+        .withSchema("dosleg")
+        .selectFrom("lecture")
+        .leftJoin("typlec", "typlec.typleccod", "lecture.typleccod")
+        .where("lecture.loicod", "=", loiId)
+        .select(({ ref }) => [
+        rtrim(ref("typlec.typleclib")).as("type_lecture"),
+        rtrim(ref("lecture.leccom")).as("libelle"),
+        "typlec.typlecord as ordre_lecture",
+        lecturesAssemblee(ref("lecture.lecidt")).as("lectures_assemblee"),
+    ])
+        .orderBy("typlec.typlecord", "asc"));
 }
-function buildDocumentsAttachesSql(rapportIdSql) {
-    return `
-    (
-      select coalesce(json_agg(attached_rows), '[]'::json)
-      from (
-        select
-          docatt.docatturl as url,
-          typatt.typattlib as type_document
-        from senat.dosleg_docatt as docatt
-        left join senat.dosleg_typatt as typatt on docatt.typattcod = typatt.typattcod
-        where docatt.rapcod = ${rapportIdSql}
-      ) as attached_rows
-    )
-  `;
+function themes(loiId) {
+    return jsonArrayFrom(dbSenat
+        .withSchema("dosleg")
+        .selectFrom("the")
+        .leftJoin("loithe", "loithe.thecle", "the.thecle")
+        .where("loithe.loicod", "=", loiId)
+        .select(["the.thelib as libelle"]));
 }
-function buildTextesSql(lectureAssembleeIdSql) {
-    return `
-    (
-      select coalesce(json_agg(text_rows order by text_rows.ordre_tri nulls last), '[]'::json)
-      from (
-        select
-          texte.texnum as numero,
-          texte.orgcod as code_organisme,
-          case
-            when texte.texurl is not null then
-              ${stripTrailingHashesSql("regexp_replace(trim(texte.texurl), '^(.*/)?(.*?)(\\.html)?$', '\\2')")}
-            else null
-          end as id,
-          case
-            when texte.typurl = 'I' then
-              ${stripTrailingHashesSql("'https://www.senat.fr/leg/' || rtrim(texte.texurl)")}
-            else ${stripTrailingHashesSql("rtrim(texte.texurl)")}
-          end as url,
-          rtrim(oritxt.oritxtlib) as origine,
-          oritxt.oriordre as ordre_origine,
-          oritxt.oritxtado as code_adoption,
-          oritxt.oritxtmod as modification,
-          rtrim(typtxt.typtxtlib) as type,
-          to_char(texte.txtoritxtdat, 'YYYY-MM-DD') as date,
-          texte.sesann::int as session,
-          ${buildAuteursTexteSql("texte.texcod")} as auteurs,
-          array_position(array['0','2','1'], oritxt.oriordre) as ordre_tri
-        from senat.dosleg_texte as texte
-        left join senat.dosleg_oritxt as oritxt on oritxt.oritxtcod = texte.oritxtcod
-        left join senat.dosleg_typtxt as typtxt on typtxt.typtxtcod = texte.typtxtcod
-        where texte.lecassidt = ${lectureAssembleeIdSql}
-      ) as text_rows
-    )
-  `;
-}
-function buildRapportsSql(lectureAssembleeIdSql) {
-    return `
-    (
-      select coalesce(json_agg(report_rows), '[]'::json)
-      from (
-        select
-          rap.rapnum as numero,
-          raporg.orgcod as code_organisme,
-          case
-            when rap.rapurl is not null then
-              ${stripTrailingHashesSql("regexp_replace(trim(rap.rapurl), '^(.*/)?(.*?)(\\.html)?$', '\\2')")}
-            else null
-          end as id,
-          case
-            when rap.typurl = 'I' then
-              ${stripTrailingHashesSql("'https://www.senat.fr/rap/' || rtrim(rap.rapurl)")}
-            else ${stripTrailingHashesSql("rtrim(rap.rapurl)")}
-          end as url,
-          rtrim(denrap.libdenrap) as type,
-          rtrim(rtrim(rap.raptil)) as titre,
-          rtrim(rtrim(rap.rapsoustit)) as sous_titre,
-          to_char(rap.date_depot, 'YYYY-MM-DD') as date,
-          rap.sesann::int as session,
-          ${buildAuteursRapportSql("rap.rapcod")} as auteurs,
-          ${buildDocumentsAttachesSql("rap.rapcod")} as documents_annexes
-        from senat.dosleg_rap as rap
-        left join senat.dosleg_raporg as raporg on raporg.rapcod = rap.rapcod
-        left join senat.dosleg_denrap as denrap on denrap.coddenrap = rap.coddenrap
-        left join senat.dosleg_lecassrap as lecassrap on lecassrap.rapcod = rap.rapcod
-        where lecassrap.lecassidt = ${lectureAssembleeIdSql}
-      ) as report_rows
-    )
-  `;
-}
-function buildDatesSeancesSql(lectureAssembleeIdSql) {
-    return `
-    (
-      select coalesce(json_agg(date_rows), '[]'::json)
-      from (
-        select to_char(date_seance.date_s, 'YYYY-MM-DD') as date
-        from senat.dosleg_date_seance as date_seance
-        where date_seance.lecidt = ${lectureAssembleeIdSql}
-      ) as date_rows
-    )
-  `;
-}
-function buildLecturesAssembleeSql(lectureIdSql) {
-    return `
-    (
-      select coalesce(json_agg(assembly_rows order by assembly_rows.ordre_lecture_assemblee_num nulls last), '[]'::json)
-      from (
-        select
-          rtrim(ass.libass) as assemblee,
-          org.orgnom as libelle_organisme,
-          org.senorgcod as code_organisme,
-          lecass.ordreass::text as ordre_lecture_assemblee,
-          lecass.ordreass as ordre_lecture_assemblee_num,
-          lecass.sesann::int as session,
-          orippr.oripprlib as origine_proposition,
-          lecass.ptlnum as numero_petite_loi,
-          lecass.ptlurl as url_petite_loi,
-          lecass.loiintmod as loi_intitule_modifie,
-          lecass.debatsurl as url_cr_debats,
-          to_char(lecass.lecassamecomdat, 'YYYY-MM-DD') as date_publication_amendements_commission,
-          to_char(lecass.lecassamedat, 'YYYY-MM-DD') as date_publication_amendements_seance,
-          ${buildTextesSql("lecass.lecassidt")} as textes,
-          ${buildRapportsSql("lecass.lecassidt")} as rapports,
-          ${buildDatesSeancesSql("lecass.lecassidt")} as dates_seances
-        from senat.dosleg_lecass as lecass
-        left join senat.dosleg_ass as ass on ass.codass = lecass.codass
-        left join senat.dosleg_org as org on org.orgcod = lecass.orgcod
-        left join senat.dosleg_orippr as orippr on orippr.oripprcod = lecass.orippr
-        where lecass.lecidt = ${lectureIdSql}
-      ) as assembly_rows
-    )
-  `;
-}
-function buildLecturesSql(loiIdSql) {
-    return `
-    (
-      select coalesce(json_agg(lecture_rows order by lecture_rows.ordre_lecture_num nulls last), '[]'::json)
-      from (
-        select
-          rtrim(typlec.typleclib) as type_lecture,
-          rtrim(lecture.leccom) as libelle,
-          typlec.typlecord::text as ordre_lecture,
-          typlec.typlecord as ordre_lecture_num,
-          ${buildLecturesAssembleeSql("lecture.lecidt")} as lectures_assemblee
-        from senat.dosleg_lecture as lecture
-        left join senat.dosleg_typlec as typlec on typlec.typleccod = lecture.typleccod
-        where lecture.loicod = ${loiIdSql}
-      ) as lecture_rows
-    )
-  `;
-}
-function buildThemesSql(loiIdSql) {
-    return `
-    (
-      select coalesce(json_agg(theme_rows), '[]'::json)
-      from (
-        select the.thelib as libelle
-        from senat.dosleg_the as the
-        left join senat.dosleg_loithe as loithe on loithe.thecle = the.thecle
-        where loithe.loicod = ${loiIdSql}
-      ) as theme_rows
-    )
-  `;
-}
-function buildFindAllDossiersQuery() {
-    return {
-        params: [],
-        query: `
-      select
-        rtrim(loi.loicod) as code,
-        loi.numero,
-        loi.signet,
-        nullif(regexp_replace(loi.url_an, '^.*\\/(DL[^\\/]+)\\.asp$', '\\1'), '') as code_dossier_an,
-        loi.signetalt as signet_alternatif,
-        rtrim(loi.motclef) as mot_cle,
-        rtrim(loi.loient) as titre_court,
-        rtrim(typloi.typloiden) || ' ' || rtrim(loi.loitit) as titre,
-        rtrim(typloi.typloiden) || ' ' || rtrim(loi.loiint) as titre_long,
-        rtrim(typloi.typloiden) || ' ' || rtrim(loi.loiintori) as titre_long_original,
-        'https://www.senat.fr/dossier-legislatif/' || loi.signet || '.html' as url,
-        loi.urgence,
-        rtrim(typloi.groupe) as code_nature_dossier,
-        rtrim(typloi.typloilib) as libelle_type_dossier,
-        rtrim(etaloi.etaloilib) as etat_dossier,
-        loi.url_an as url_dossier_assemblee_nationale,
-        loi.url_presart as url_presentation_articles,
-        loi.url_ordonnance as url_ordonnance,
-        loi.orgcod as code_organisme_resolution,
-        deccoc.deccoclib as libelle_decision_CoC,
-        to_char(loi.date_decision, 'YYYY-MM-DD') as date_decision_CoC,
-        loi.num_decision as num_decision_CoC,
-        loi.deccocurl as url_decision_CoC,
-        loi.doscocurl as url_dossier_CoC,
-        to_char(loi.saisine_date, 'YYYY-MM-DD') as date_saisine_CoC,
-        loi.saisine_par as condition_saisine_CoC,
-        to_char(loi.proaccdat, 'YYYY-MM-DD') as date_procedure_acceleree,
-        to_char(loi.proaccoppdat, 'YYYY-MM-DD') as date_opposition_procedure_acceleree,
-        to_char(loi.retproaccdat, 'YYYY-MM-DD') as date_retrait_procedure_acceleree,
-        to_char(loi.date_loi, 'YYYY-MM-DD') as date_promulgation,
-        case
-          when loi.loititjo is not null then rtrim(typloi.typloiden) || ' ' || rtrim(loi.loititjo)
-          else ''
-        end as titre_JO,
-        to_char(loi.loidatjo, 'YYYY-MM-DD') as date_publication_JO,
-        loi.loinumjo as numero_JO,
-        loi.url_jo as url_JO,
-        to_char(loi.loidatjo2, 'YYYY-MM-DD') as date_publication_JO_correctif_1,
-        loi.loinumjo2 as numero_JO_correctif_1,
-        loi.url_jo2 as url_JO_correctif_1,
-        to_char(loi.loidatjo3, 'YYYY-MM-DD') as date_publication_JO_correctif_2,
-        loi.loinumjo3 as numero_JO_correctif_2,
-        loi.url_jo3 as url_JO_correctif_2,
-        ${buildLecturesSql("loi.loicod")} as lectures,
-        ${buildThemesSql("loi.loicod")} as themes
-      from senat.dosleg_loi as loi
-      left join senat.dosleg_typloi as typloi on typloi.typloicod = loi.typloicod
-      left join senat.dosleg_etaloi as etaloi on etaloi.etaloicod = loi.etaloicod
-      left join senat.dosleg_deccoc as deccoc on deccoc.deccoccod = loi.deccoccod
-    `,
-    };
-}
-export async function* findAllDossiers() {
-    const { query, params } = buildFindAllDossiersQuery();
-    for await (const row of streamUnsafeQuery(query, params)) {
-        if (!row.signet) {
-            continue;
-        }
-        yield {
-            ...row,
-            signet: row.signet,
-            lectures: row.lectures ?? [],
-            themes: row.themes ?? [],
-        };
-    }
+const findAllDossiersQuery = dbSenat
+    .withSchema("dosleg")
+    .selectFrom("loi")
+    .leftJoin("typloi", "typloi.typloicod", "loi.typloicod")
+    .leftJoin("etaloi", "etaloi.etaloicod", "loi.etaloicod")
+    .leftJoin("deccoc", "deccoc.deccoccod", "loi.deccoccod")
+    .select(({ eb, ref, val }) => [
+    rtrim(ref("loi.loicod")).as("code"),
+    "loi.numero as numero",
+    "loi.signet as signet",
+    sql `NULLIF(regexp_replace(loi.url_an, '^.*\\/(DL[^\\/]+)\\.asp$', '\\1'), '')`.as("code_dossier_an"),
+    "loi.signetalt as signet_alternatif",
+    rtrim(ref("loi.motclef")).as("mot_cle"),
+    rtrim(ref("loi.loient")).as("titre_court"),
+    concat(rtrim(ref("typloi.typloiden")), val(" "), rtrim(ref("loi.loitit"))).as("titre"),
+    concat(rtrim(ref("typloi.typloiden")), val(" "), rtrim(ref("loi.loiint"))).as("titre_long"),
+    concat(rtrim(ref("typloi.typloiden")), val(" "), rtrim(ref("loi.loiintori"))).as("titre_long_original"),
+    concat(val("https://www.senat.fr/dossier-legislatif/"), ref("loi.signet"), val(".html")).as("url"),
+    "loi.urgence as urgence",
+    rtrim(ref("typloi.groupe")).as("code_nature_dossier"),
+    rtrim(ref("typloi.typloilib")).as("libelle_type_dossier"),
+    rtrim(ref("etaloi.etaloilib")).as("etat_dossier"),
+    "loi.url_an as url_dossier_assemblee_nationale",
+    "loi.url_presart as url_presentation_articles",
+    "loi.url_ordonnance as url_ordonnance",
+    "loi.orgcod as code_organisme_resolution",
+    "deccoc.deccoclib as libelle_decision_CoC",
+    toDateString(ref("loi.date_decision")).as("date_decision_CoC"),
+    "loi.num_decision as num_decision_CoC",
+    "loi.deccocurl as url_decision_CoC",
+    "loi.doscocurl as url_dossier_CoC",
+    toDateString(ref("loi.saisine_date")).as("date_saisine_CoC"),
+    "loi.saisine_par as condition_saisine_CoC",
+    toDateString(ref("loi.proaccdat")).as("date_procedure_acceleree"),
+    toDateString(ref("loi.proaccoppdat")).as("date_opposition_procedure_acceleree"),
+    toDateString(ref("loi.retproaccdat")).as("date_retrait_procedure_acceleree"),
+    toDateString(ref("loi.date_loi")).as("date_promulgation"),
+    eb
+        .case()
+        .when("loi.loititjo", "is not", null)
+        .then(concat(rtrim(ref("typloi.typloiden")), val(" "), rtrim(ref("loi.loititjo"))))
+        .else("")
+        .end()
+        .as("titre_JO"),
+    toDateString(ref("loi.loidatjo")).as("date_publication_JO"),
+    "loi.loinumjo as numero_JO",
+    "loi.url_jo as url_JO",
+    toDateString(ref("loi.loidatjo2")).as("date_publication_JO_correctif_1"),
+    "loi.loinumjo2 as numero_JO_correctif_1",
+    "loi.url_jo2 as url_JO_correctif_1",
+    toDateString(ref("loi.loidatjo3")).as("date_publication_JO_correctif_2"),
+    "loi.loinumjo3 as numero_JO_correctif_2",
+    "loi.url_jo3 as url_JO_correctif_2",
+    lectures(ref("loi.loicod")).as("lectures"),
+    themes(ref("loi.loicod")).as("themes"),
+])
+    .$narrowType();
+export function findAllDossiers() {
+    return findAllDossiersQuery.stream();
 }
 export function getCodeActeLecture(codeNatureDossier, typeLecture, assemblee) {
     const codeAssemblee = assemblee === "Sénat" ? "SN" : assemblee === "Assemblée nationale" ? "AN" : null;
@@ -304,16 +150,7 @@ export function getCodeActeLecture(codeNatureDossier, typeLecture, assemblee) {
     }
     return null;
 }
-function getDateSortValue(value) {
-    if (!value) {
-        return Number.POSITIVE_INFINITY;
-    }
-    const timestamp = new Date(value).getTime();
-    return Number.isNaN(timestamp) ? Number.POSITIVE_INFINITY : timestamp;
-}
-function compareByDate(left, right) {
-    return getDateSortValue(left.date) - getDateSortValue(right.date);
-}
+// Helper pour déterminer le code de phase (SN1, SN2, CMP...)
 function getPhasePrefix(lecture, assemblee) {
     if (assemblee !== "Sénat")
         return null;
@@ -322,33 +159,38 @@ function getPhasePrefix(lecture, assemblee) {
         return "CMP";
     if (typeLibelle.includes("nouvelle lecture"))
         return "SNNLEC";
-    if (typeLibelle.includes("définitive"))
+    if (typeLibelle.includes("d\u00e9finitive"))
         return "SNLDEF";
     if (typeLibelle.includes("unique"))
         return "SNLUNI";
     if (lecture.ordre_lecture) {
         return `SN${lecture.ordre_lecture}`;
     }
-    if (typeLibelle.includes("première"))
+    if (typeLibelle.includes("premi\u00e8re"))
         return "SN1";
-    if (typeLibelle.includes("deuxième") || typeLibelle.includes("seconde"))
+    if (typeLibelle.includes("deuxi\u00e8me") || typeLibelle.includes("seconde"))
         return "SN2";
     return "SN1";
 }
 export function buildActesLegislatifs(dossier) {
     const actes = [];
     const loiSignet = dossier.signet;
-    const lectures = dossier.lectures ?? [];
+    const lectures = dossier.lectures || [];
     for (const lecture of lectures) {
-        const lecturesAssemblee = lecture.lectures_assemblee ?? [];
+        const lecturesAssemblee = lecture.lectures_assemblee || [];
         for (const lecAss of lecturesAssemblee) {
+            // On ne traite que la partie SÉNAT
             if (lecAss.assemblee !== "Sénat")
                 continue;
             const phasePrefix = getPhasePrefix(lecture, lecAss.assemblee);
             if (!phasePrefix)
                 continue;
-            const textes = lecAss.textes ?? [];
-            const textesTries = [...textes].sort(compareByDate);
+            // Préparation des textes (tri chronologique)
+            const textes = lecAss.textes || [];
+            const textesTries = [...textes].sort((a, b) => new Date(a.date).getTime() - new Date(b.date).getTime());
+            // =================================================================
+            // A. DÉPÔT
+            // =================================================================
             const depotTexte = textesTries.find((t) => (t.origine || "").toLowerCase().includes("déposé") ||
                 (t.origine || "").toLowerCase().includes("transmis") ||
                 t.ordre_origine === "0");
@@ -367,7 +209,10 @@ export function buildActesLegislatifs(dossier) {
                     code_organisme: null,
                 });
             }
-            const rapports = lecAss.rapports ?? [];
+            // =================================================================
+            // B. COMMISSION (Rapports)
+            // =================================================================
+            const rapports = lecAss.rapports || [];
             for (const rap of rapports) {
                 if (rap.date) {
                     actes.push({
@@ -376,7 +221,8 @@ export function buildActesLegislatifs(dossier) {
                         libelle: `Rapport n°${rap.numero} de la commission`,
                         id: rap.id,
                         numero: rap.numero,
-                        code_organisme: rap.code_organisme ?? null,
+                        code_organisme: rap.code_organisme,
+                        adoption: rap.adoption,
                         uid: `${loiSignet}-${phasePrefix}-COM`,
                         session: lecAss.session,
                         chambre: "SN",
@@ -385,16 +231,20 @@ export function buildActesLegislatifs(dossier) {
                     });
                 }
             }
-            const datesSeances = lecAss.dates_seances ?? [];
+            // =================================================================
+            // C. SÉANCE PUBLIQUE
+            // =================================================================
+            const datesSeances = lecAss.dates_seances || [];
             if (datesSeances.length > 0) {
-                datesSeances.sort(compareByDate);
+                // Tri des objets dates
+                datesSeances.sort((a, b) => new Date(a.date).getTime() - new Date(b.date).getTime());
                 const premiereSeance = datesSeances[0];
                 if (premiereSeance && premiereSeance.date) {
                     actes.push({
+                        // Champs pour buildParlementActeLegislatif
                         code_acte: `${phasePrefix}-DEBATS-SEANCE`,
                         date: premiereSeance.date,
-                        libelle: "Discussion en séance publique",
-                        id: null,
+                        libelle: `Discussion en séance publique`,
                         uid: `${loiSignet}-${phasePrefix}-DEBATS-SEANCE`,
                         session: lecAss.session,
                         chambre: "SN",
@@ -403,6 +253,9 @@ export function buildActesLegislatifs(dossier) {
                     });
                 }
             }
+            // =================================================================
+            // D. DÉCISION / VOTE
+            // =================================================================
             const texteFinal = [...textesTries].reverse().find((t) => {
                 const origine = (t.origine || "").toLowerCase();
                 return (origine.includes("adopté") ||
@@ -436,16 +289,18 @@ export function buildActesLegislatifs(dossier) {
             }
         }
     }
+    // =================================================================
+    // E. HORS LECTURE (CC & PROMULGATION)
+    // =================================================================
     if (dossier.date_decision_CoC) {
         actes.push({
             code_acte: "CC",
             date: dossier.date_decision_CoC,
-            libelle: "Décision du Conseil constitutionnel",
+            libelle: `Décision du Conseil constitutionnel`,
             id: dossier.url_decision_CoC,
             uid: `${loiSignet}-CC`,
             chambre: "AN",
             signet_dossier: loiSignet,
-            code_organisme: null,
             texte_url: dossier.url_decision_CoC || dossier.url_dossier_CoC,
         });
     }
@@ -453,7 +308,7 @@ export function buildActesLegislatifs(dossier) {
         actes.push({
             code_acte: "PROM",
             date: dossier.date_promulgation,
-            libelle: "Promulgation de la loi",
+            libelle: `Promulgation de la loi`,
             date_publication_JO: dossier.date_publication_JO,
             numero_JO: dossier.numero_JO,
             url_legifrance: dossier.url_JO,
@@ -461,8 +316,11 @@ export function buildActesLegislatifs(dossier) {
             uid: `${loiSignet}-PROM`,
             chambre: "AN",
             signet_dossier: loiSignet,
-            code_organisme: null,
         });
     }
-    return actes.sort(compareByDate);
+    return actes.sort((a, b) => {
+        const dateA = new Date(a.date).getTime();
+        const dateB = new Date(b.date).getTime();
+        return dateA - dateB;
+    });
 }

package/lib/src/model/index.d.ts

@@ -1,7 +1,7 @@
-export { findAllAmendements } from "./ameli.js";
-export { findAll as findAllDebats } from "./debats.js";
-export { findAllDossiers } from "./dosleg.js";
-export { findAllTextes, findAllRapports } from "./documents.js";
-export { findAllScrutins } from "./scrutins.js";
-export { findAll as findAllQuestions } from "./questions.js";
-export { findAll as findAllSens, findAllCirconscriptions, findAllOrganismes } from "./sens.js";
+export { findAllAmendements } from "./ameli";
+export { findAll as findAllDebats } from "./debats";
+export { findAllDossiers } from "./dosleg";
+export { findAllTextes, findAllRapports } from "./documents";
+export { findAllScrutins } from "./scrutins";
+export { findAll as findAllQuestions } from "./questions";
+export { findAll as findAllSens, findAllCirconscriptions, findAllOrganismes } from "./sens";

package/lib/src/model/index.js

@@ -1,7 +1,7 @@
-export { findAllAmendements } from "./ameli.js";
-export { findAll as findAllDebats } from "./debats.js";
-export { findAllDossiers } from "./dosleg.js";
-export { findAllTextes, findAllRapports } from "./documents.js";
-export { findAllScrutins } from "./scrutins.js";
-export { findAll as findAllQuestions } from "./questions.js";
-export { findAll as findAllSens, findAllCirconscriptions, findAllOrganismes } from "./sens.js";
+export { findAllAmendements } from "./ameli";
+export { findAll as findAllDebats } from "./debats";
+export { findAllDossiers } from "./dosleg";
+export { findAllTextes, findAllRapports } from "./documents";
+export { findAllScrutins } from "./scrutins";
+export { findAll as findAllQuestions } from "./questions";
+export { findAll as findAllSens, findAllCirconscriptions, findAllOrganismes } from "./sens";