@tricoteuses/senat 3.1.18 → 3.1.19

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

@@ -1,54 +1,45 @@
-export interface QuestionReponseRow {
-    date_erratum_JO: string | null;
-    date_reponse_JO: string | null;
-    ministere_reponse: string | null;
-    ministere_reponse_id: string | null;
-    page_JO: string | null;
-    texte: string | null;
-    texte_erratum: string | null;
-    url: string | null;
-}
-export interface QuestionResult {
-    circonscription: string | null;
-    circonscription_numero: string | null;
-    civilite: string | null;
-    date_cloture: string | null;
-    date_erratum_JO: string | null;
-    date_publication_JO: string | null;
-    date_reponse_JO: string | null;
-    date_signalement: string | null;
-    date_transmission: string | null;
-    etat_code: string | null;
-    etat_libelle: string | null;
-    etat_tri: string | null;
-    groupe: string | null;
-    legislature: string | null;
-    matricule: string;
-    ministere_depot: string | null;
-    ministere_depot_date_debut: string | null;
-    ministere_depot_id: string | null;
-    ministere_reponse: string | null;
-    ministere_transmission: string | null;
-    nature: string | null;
-    nature_libelle: string | null;
-    nom: string | null;
-    nom_technique: string | null;
-    numero: string | null;
-    page_JO: string | null;
-    page_erratum_JO: string | null;
-    prenom: string | null;
-    reference: string | null;
-    reference_question_rappelee: string | null;
-    republique: string | null;
-    reponses: QuestionReponseRow[];
-    rubrique: string | null;
-    sort: string | null;
-    sort_code: string | null;
-    sort_tri: string | null;
-    texte: string | null;
-    texte_erratum: string | null;
-    themes: string[];
-    titre: string | null;
-    type_appartenance: string | null;
-}
-export declare function findAll(): AsyncGenerator<QuestionResult, void, unknown>;
+import { InferResult } from "kysely";
+export type QuestionResult = InferResult<typeof findAllQuery>[0];
+declare const findAllQuery: import("kysely").SelectQueryBuilder<{
+    [x: string]: any;
+    [x: number]: any;
+    [x: symbol]: any;
+}, "tam_questions" | "sortquestion" | "etatquestion" | "tam_ministeres" | "naturequestion", {
+    [x: string]: any;
+    date_publication_JO: string;
+    ministere_depot: string;
+    ministere_depot_date_debut: string;
+    date_transmission: string;
+    date_reponse_JO: string;
+    date_erratum_JO: string;
+    date_cloture: string;
+    date_signalement: string;
+    themes: {
+        libelle: any;
+    }[];
+    reponses: {
+        [x: string]: any;
+        date_reponse_JO: string;
+        date_erratum_JO: string;
+    }[];
+}>;
+export declare function findAll(): AsyncIterableIterator<{
+    [x: string]: any;
+    date_publication_JO: string;
+    ministere_depot: string;
+    ministere_depot_date_debut: string;
+    date_transmission: string;
+    date_reponse_JO: string;
+    date_erratum_JO: string;
+    date_cloture: string;
+    date_signalement: string;
+    themes: {
+        libelle: any;
+    }[];
+    reponses: {
+        [x: string]: any;
+        date_reponse_JO: string;
+        date_erratum_JO: string;
+    }[];
+}>;
+export {};

package/lib/src/model/questions.js

@@ -1,91 +1,89 @@
-import { streamUnsafeQuery } from "../databases_postgres.js";
-function buildFindAllQuestionsQuery() {
-    return {
-        params: [],
-        query: `
-      select
-        tam_questions.repub::text as republique,
-        tam_questions.legislature::text as legislature,
-        tam_questions.natquecod as nature,
-        naturequestion.natquelib as nature_libelle,
-        tam_questions.numero as numero,
-        tam_questions.reference as reference,
-        tam_questions.titre as titre,
-        tam_questions.nom as nom,
-        tam_questions.prenom as prenom,
-        tam_questions.nomtechnique as nom_technique,
-        tam_questions.codequalite as civilite,
-        tam_questions.matricule as matricule,
-        tam_questions.cirnum::text as circonscription_numero,
-        tam_questions.circonscription as circonscription,
-        tam_questions.groupe as groupe,
-        tam_questions.ratgrp as type_appartenance,
-        to_char(tam_questions.datejodepot, 'YYYY-MM-DD') as date_publication_JO,
-        tam_questions.pagejodepot::text as page_JO,
-        rtrim(tam_questions.mindepotlib) as ministere_depot,
-        tam_questions.mindepotid::text as ministere_depot_id,
-        to_char(tam_ministeres.datedebut, 'YYYY-MM-DD') as ministere_depot_date_debut,
-        to_char(tam_questions.datejotran, 'YYYY-MM-DD') as date_transmission,
-        tam_questions.mintranlib as ministere_transmission,
-        to_char(tam_questions.datejorep1, 'YYYY-MM-DD') as date_reponse_JO,
-        to_char(tam_questions.dateerr, 'YYYY-MM-DD') as date_erratum_JO,
-        tam_questions.pageerr::text as page_erratum_JO,
-        tam_questions.minreplib1 as ministere_reponse,
-        to_char(tam_questions.datecloture, 'YYYY-MM-DD') as date_cloture,
-        to_char(tam_questions.datesignal, 'YYYY-MM-DD') as date_signalement,
-        tam_questions.refquerappelee as reference_question_rappelee,
-        tam_questions.txtque as texte,
-        tam_questions.txterrque as texte_erratum,
-        tam_questions.rubrique as rubrique,
-        sortquestion.sorquelib as sort,
-        sortquestion.sorquecod as sort_code,
-        sortquestion.sorquenumtri::text as sort_tri,
-        etatquestion.etaquelib as etat_libelle,
-        etatquestion.etaquecod as etat_code,
-        etatquestion.etaquenumtri::text as etat_tri,
-        (
-          select coalesce(json_agg(theme_rows.libelle order by theme_rows.theme_order nulls last), '[]'::json)
-          from (
-            select
-              the.thelib as libelle,
-              the.thenouidt as theme_order
-            from regexp_matches(coalesce(tam_questions.themes, ''), '#(\\d+)', 'g') as matches(match)
-            join senat.questions_the as the on the.thenouidt::text = matches.match[1]
-            order by the.thenouidt asc
-          ) as theme_rows
-        ) as themes,
-        (
-          select coalesce(json_agg(response_rows order by response_rows.date_reponse_JO nulls last), '[]'::json)
-          from (
-            select
-              to_char(tam_reponses.datejorep, 'YYYY-MM-DD') as date_reponse_JO,
-              tam_reponses.pagejorep::text as page_JO,
-              to_char(tam_reponses.errdate, 'YYYY-MM-DD') as date_erratum_JO,
-              tam_reponses.minreplib as ministere_reponse,
-              tam_reponses.minrepid::text as ministere_reponse_id,
-              tam_reponses.urlrep as url,
-              tam_reponses.txtrep as texte,
-              tam_reponses.txterrrep as texte_erratum
-            from senat.questions_tam_reponses as tam_reponses
-            where tam_reponses.idque = tam_questions.id
-            order by tam_reponses.datejorep asc
-          ) as response_rows
-        ) as reponses
-      from senat.questions_tam_questions as tam_questions
-      left join senat.questions_tam_ministeres as tam_ministeres on tam_questions.mindepotid = tam_ministeres.minid
-      left join senat.questions_sortquestion as sortquestion on tam_questions.sorquecod::text = sortquestion.sorquecod
-      left join senat.questions_naturequestion as naturequestion on tam_questions.natquecod = naturequestion.natquecod
-      left join senat.questions_etatquestion as etatquestion on tam_questions.etaquecod::text = etatquestion.etaquecod
-    `,
-    };
+import { jsonArrayFrom } from "kysely/helpers/postgres";
+import { dbSenat } from "../databases";
+import { expandToRows, rtrim, toDateString } from "./util";
+function reponses(questionId) {
+    return jsonArrayFrom(dbSenat
+        .withSchema("questions")
+        .selectFrom("tam_reponses")
+        .where("tam_reponses.idque", "=", questionId)
+        .select(({ ref }) => [
+        toDateString(ref("tam_reponses.datejorep")).as("date_reponse_JO"),
+        "tam_reponses.pagejorep as page_JO",
+        toDateString(ref("tam_reponses.errdate")).as("date_erratum_JO"),
+        "tam_reponses.minreplib as ministere_reponse",
+        "tam_reponses.minrepid as ministere_reponse_id",
+        "tam_reponses.urlrep as url",
+        "tam_reponses.txtrep as texte",
+        "tam_reponses.txterrrep as texte_erratum",
+    ])
+        .orderBy("tam_reponses.datejorep", "asc"));
 }
-export async function* findAll() {
-    const { query, params } = buildFindAllQuestionsQuery();
-    for await (const row of streamUnsafeQuery(query, params)) {
-        yield {
-            ...row,
-            reponses: row.reponses ?? [],
-            themes: row.themes ?? [],
-        };
-    }
+function themes(questionId) {
+    return jsonArrayFrom(dbSenat
+        .withSchema("questions")
+        .with("question_theme", (db) => db
+        .selectFrom("tam_questions")
+        .select(({ eb, ref, val }) => [
+        "id as question_id",
+        eb.cast(expandToRows(ref("tam_questions.themes"), val("#(\\d+)")), "smallint").as("theme_id"),
+    ]))
+        .selectFrom("the")
+        .leftJoin("question_theme", "the.thenouidt", "question_theme.theme_id")
+        .where("question_theme.question_id", "=", questionId)
+        .select("the.thelib as libelle")
+        .orderBy("the.thenouidt", "asc"));
+}
+const findAllQuery = dbSenat
+    .withSchema("questions")
+    .selectFrom("tam_questions")
+    .leftJoin("tam_ministeres", "tam_questions.mindepotid", "tam_ministeres.minid")
+    .leftJoin("sortquestion", (join) => join.onRef("tam_questions.sorquecod", "=", (eb) => eb.cast("sortquestion.sorquecod", "bigint")))
+    .leftJoin("naturequestion", "tam_questions.natquecod", "naturequestion.natquecod")
+    .leftJoin("etatquestion", (join) => join.onRef("tam_questions.etaquecod", "=", (eb) => eb.cast("etatquestion.etaquecod", "bigint")))
+    .select(({ ref }) => [
+    "tam_questions.repub as republique",
+    "tam_questions.legislature as legislature",
+    "tam_questions.natquecod as nature",
+    "naturequestion.natquelib as nature_libelle",
+    "tam_questions.numero as numero",
+    "tam_questions.reference as reference",
+    "tam_questions.titre as titre",
+    "tam_questions.nom as nom",
+    "tam_questions.prenom as prenom",
+    "tam_questions.nomtechnique as nom_technique",
+    "tam_questions.codequalite as civilite",
+    "tam_questions.matricule as matricule",
+    "tam_questions.cirnum as circonscription_numero",
+    "tam_questions.circonscription as circonscription",
+    "tam_questions.groupe as groupe",
+    "tam_questions.ratgrp as type_appartenance",
+    toDateString(ref("tam_questions.datejodepot")).as("date_publication_JO"),
+    "tam_questions.pagejodepot as page_JO",
+    rtrim(ref("tam_questions.mindepotlib")).as("ministere_depot"),
+    "tam_questions.mindepotid as ministere_depot_id",
+    toDateString(ref("tam_ministeres.datedebut")).as("ministere_depot_date_debut"),
+    toDateString(ref("tam_questions.datejotran")).as("date_transmission"),
+    "tam_questions.mintranlib as ministere_transmission",
+    toDateString(ref("tam_questions.datejorep1")).as("date_reponse_JO"),
+    toDateString(ref("tam_questions.dateerr")).as("date_erratum_JO"),
+    "tam_questions.pageerr as page_erratum_JO",
+    "tam_questions.minreplib1 as ministere_reponse",
+    toDateString(ref("tam_questions.datecloture")).as("date_cloture"),
+    toDateString(ref("tam_questions.datesignal")).as("date_signalement"),
+    "tam_questions.refquerappelee as reference_question_rappelee",
+    //"tam_questions.url as url", // TODO ?
+    "tam_questions.txtque as texte",
+    "tam_questions.txterrque as texte_erratum",
+    "tam_questions.rubrique as rubrique",
+    "sortquestion.sorquelib as sort",
+    "sortquestion.sorquecod as sort_code",
+    "sortquestion.sorquenumtri as sort_tri",
+    "etatquestion.etaquelib as etat_libelle",
+    "etatquestion.etaquecod as etat_code",
+    "etatquestion.etaquenumtri as etat_tri",
+    themes(ref("tam_questions.id")).as("themes"),
+    reponses(ref("tam_questions.id")).as("reponses"),
+]);
+export function findAll() {
+    return findAllQuery.stream();
 }

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

@@ -1,48 +1,13 @@
-export interface VoteScrutinRow {
-    groupe_politique_code: string | null;
-    groupe_politique_id: string | null;
-    matricule_delegant: string | null;
-    matricule_votant: string;
-    position: string | null;
-    statut_votant: string | null;
-    titre_votant: string | null;
-}
-export interface GroupeVotantRow {
-    groupe_politique_code: string | null;
-    nombre_abstentions: string;
-    nombre_contre: string;
-    nombre_non_votants: string;
-    nombre_pour: string;
-    nombre_votants: string;
-}
-export interface MiseAuPointRow {
-    ordre: string | null;
-    texte: string;
-    url: string | null;
-}
-export interface ScrutinResult {
-    date_scrutin: string | null;
-    date_scrutin_effective: string | null;
-    groupes_votants: GroupeVotantRow[];
-    intitule: string | null;
-    lecture_id: string | null;
-    lecture_libelle: string | null;
-    mises_au_point: MiseAuPointRow[];
-    nombre_contre: string | null;
-    nombre_contre_seance: string | null;
-    nombre_majorite: string | null;
-    nombre_majorite_seance: string | null;
-    nombre_pour: string | null;
-    nombre_pour_seance: string | null;
-    nombre_suffrages: string | null;
-    nombre_suffrages_seance: string | null;
-    nombre_votants: string | null;
-    nombre_votants_seance: string | null;
-    note: string | null;
-    numero: string;
-    session: string;
-    signet_dossier: string | null;
-    type_lecture: string | null;
-    votes: VoteScrutinRow[];
-}
-export declare function findAllScrutins(fromSession?: number): AsyncGenerator<ScrutinResult, void, unknown>;
+import { InferResult } from "kysely";
+export type ScrutinResult = InferResult<typeof findAllScrutinsQuery>[0];
+declare const findAllScrutinsQuery: import("kysely").SelectQueryBuilder<{
+    [x: string]: any;
+    [x: number]: any;
+    [x: symbol]: any;
+}, "date_seance" | "lecass" | "lecture" | "loi" | "scr" | "typlec", {
+    [x: string]: any;
+}>;
+export declare function findAllScrutins(fromSession?: number): AsyncIterableIterator<{
+    [x: string]: any;
+}>;
+export {};

package/lib/src/model/scrutins.js

@@ -1,121 +1,114 @@
-import { streamUnsafeQuery } from "../databases_postgres.js";
-function buildFindAllScrutinsQuery(fromSession) {
-    const params = [];
-    const whereSession = fromSession === undefined ? "" : "where scr.sesann >= $1";
-    if (fromSession !== undefined) {
-        params.push(String(fromSession));
-    }
-    return {
-        params,
-        query: `
-      select
-        scr.sesann::text as session,
-        scr.scrnum::text as numero,
-        rtrim(date_seance.lecidt) as lecture_id,
-        rtrim(lecture.leccom) as lecture_libelle,
-        loi.signet as signet_dossier,
-        rtrim(typlec.typleclib) as type_lecture,
-        to_char(scr.scrdat, 'YYYY-MM-DD') as date_scrutin,
-        to_char(scr.scrdateff, 'YYYY-MM-DD') as date_scrutin_effective,
-        replace(scr.scrint, E'\\u0092', '''') as intitule,
-        scr.scrbaspag as note,
-        scr.scrmaj::text as nombre_majorite,
-        scr.scrmajsea::text as nombre_majorite_seance,
-        scr.scrvot::text as nombre_votants,
-        scr.scrvotsea::text as nombre_votants_seance,
-        scr.scrsuf::text as nombre_suffrages,
-        scr.scrsufsea::text as nombre_suffrages_seance,
-        scr.scrcon::text as nombre_contre,
-        scr.scrconsea::text as nombre_contre_seance,
-        scr.scrpou::text as nombre_pour,
-        scr.scrpousea::text as nombre_pour_seance,
-        (
-          select coalesce(json_agg(vote_rows order by vote_rows.membership_start desc nulls last), '[]'::json)
-          from (
-            select
-              votsen.senmat as matricule_votant,
-              votsen.senmatdel as matricule_delegant,
-              posvot.posvotlib as position,
-              stavot.stavotlib as statut_votant,
-              titsen.titsenlib as titre_votant,
-              memgrppol.memgrppolid::text as groupe_politique_id,
-              memgrppol.grppolcod as groupe_politique_code,
-              memgrppol.memgrppoldatdeb as membership_start
-            from senat.dosleg_votsen as votsen
-            left join senat.dosleg_titsen as titsen on titsen.titsencod = votsen.titsencod
-            left join senat.dosleg_stavot as stavot on stavot.stavotidt = votsen.stavotidt
-            left join senat.dosleg_posvot as posvot on posvot.posvotcod = votsen.posvotcod
-            left join senat.sens_memgrppol as memgrppol
-              on memgrppol.senmat = votsen.senmat
-             and memgrppol.memgrppoldatdeb <= scr.scrdat
-             and (memgrppol.memgrppoldatfin >= scr.scrdat or memgrppol.memgrppoldatfin is null)
-            where votsen.scrnum = scr.scrnum
-              and votsen.sesann = scr.sesann
-          ) as vote_rows
-        ) as votes,
-        (
-          select coalesce(json_agg(group_rows order by group_rows.groupe_politique_code nulls last), '[]'::json)
-          from (
-            select
-              unique_votes.grppolcod as groupe_politique_code,
-              sum(case when unique_votes.posvotlib = 'pour' then 1 else 0 end)::text as nombre_pour,
-              sum(case when unique_votes.posvotlib = 'contre' then 1 else 0 end)::text as nombre_contre,
-              sum(case when unique_votes.posvotlib = 'abstention' then 1 else 0 end)::text as nombre_abstentions,
-              sum(case when unique_votes.posvotlib = 'non-votant' then 1 else 0 end)::text as nombre_non_votants,
-              count(unique_votes.senmat)::text as nombre_votants
-            from (
-              select
-                votsen.senmat,
-                posvot.posvotlib,
-                stavot.stavotlib,
-                memgrppol.grppolcod,
-                row_number() over (
-                  partition by votsen.senmat, votsen.scrnum, votsen.sesann
-                  order by memgrppol.memgrppoldatdeb desc nulls last
-                ) as vote_rank
-              from senat.dosleg_votsen as votsen
-              left join senat.dosleg_posvot as posvot on posvot.posvotcod = votsen.posvotcod
-              left join senat.dosleg_stavot as stavot on stavot.stavotidt = votsen.stavotidt
-              left join senat.sens_memgrppol as memgrppol
-                on memgrppol.senmat = votsen.senmat
-               and memgrppol.memgrppoldatdeb <= scr.scrdat
-               and (memgrppol.memgrppoldatfin >= scr.scrdat or memgrppol.memgrppoldatfin is null)
-              where votsen.scrnum = scr.scrnum
-                and votsen.sesann = scr.sesann
-            ) as unique_votes
-            where unique_votes.vote_rank = 1
-            group by unique_votes.grppolcod
-          ) as group_rows
-        ) as groupes_votants,
-        (
-          select coalesce(json_agg(correction_rows order by correction_rows.ordre nulls last), '[]'::json)
-          from (
-            select
-              corscr.corscrtxt as texte,
-              corscr.corscrord::text as ordre,
-              corscr.corscrurl as url
-            from senat.dosleg_corscr as corscr
-            where corscr.scrnum = scr.scrnum
-          ) as correction_rows
-        ) as mises_au_point
-      from senat.dosleg_scr as scr
-      left join senat.dosleg_date_seance as date_seance on scr.code = date_seance.code
-      left join senat.dosleg_lecass as lecass on date_seance.lecidt = lecass.lecassidt
-      left join senat.dosleg_lecture as lecture on lecture.lecidt = lecass.lecidt
-      left join senat.dosleg_loi as loi on loi.loicod = lecture.loicod
-      left join senat.dosleg_typlec as typlec on typlec.typleccod = lecture.typleccod
-      ${whereSession}
-    `,
-    };
+import { sql } from "kysely";
+import { jsonArrayFrom } from "kysely/helpers/postgres";
+import { dbSenat } from "../databases";
+import { rtrim, toDateString } from "./util";
+function votes(scrutinNum, scrutinSession, scrutinDate) {
+    return jsonArrayFrom(dbSenat
+        .selectFrom("dosleg.votsen")
+        .leftJoin("dosleg.titsen", "dosleg.titsen.titsencod", "dosleg.votsen.titsencod")
+        .leftJoin("dosleg.stavot", "dosleg.stavot.stavotidt", "dosleg.votsen.stavotidt")
+        .leftJoin("dosleg.posvot", "dosleg.posvot.posvotcod", "dosleg.votsen.posvotcod")
+        .leftJoin("sens.memgrppol", (join) => join
+        .onRef("sens.memgrppol.senmat", "=", "dosleg.votsen.senmat")
+        .onRef("sens.memgrppol.memgrppoldatdeb", "<=", scrutinDate)
+        .on((eb) => eb.or([
+        eb("sens.memgrppol.memgrppoldatfin", ">=", scrutinDate),
+        eb("sens.memgrppol.memgrppoldatfin", "is", null),
+    ])))
+        .where("dosleg.votsen.scrnum", "=", scrutinNum)
+        .where("dosleg.votsen.sesann", "=", scrutinSession)
+        .orderBy("sens.memgrppol.memgrppoldatdeb", "desc")
+        .select([
+        "dosleg.votsen.senmat as matricule_votant",
+        "dosleg.votsen.senmatdel as matricule_delegant",
+        "dosleg.posvot.posvotlib as position",
+        "dosleg.stavot.stavotlib as statut_votant",
+        "dosleg.titsen.titsenlib as titre_votant",
+        "sens.memgrppol.memgrppolid as groupe_politique_id",
+        "sens.memgrppol.grppolcod as groupe_politique_code",
+    ]));
+}
+function groupesVotants(scrutinNum, scrutinSession, scrutinDate) {
+    return jsonArrayFrom(dbSenat
+        .selectFrom((eb) => eb
+        .selectFrom("dosleg.votsen")
+        .leftJoin("dosleg.posvot", "dosleg.posvot.posvotcod", "dosleg.votsen.posvotcod")
+        .leftJoin("dosleg.stavot", "dosleg.stavot.stavotidt", "dosleg.votsen.stavotidt")
+        .leftJoin("sens.memgrppol", (join) => join
+        .onRef("sens.memgrppol.senmat", "=", "dosleg.votsen.senmat")
+        .onRef("sens.memgrppol.memgrppoldatdeb", "<=", scrutinDate)
+        .on((eb) => eb.or([
+        eb("sens.memgrppol.memgrppoldatfin", ">=", scrutinDate),
+        eb("sens.memgrppol.memgrppoldatfin", "is", null),
+    ])))
+        .where("dosleg.votsen.scrnum", "=", scrutinNum)
+        .where("dosleg.votsen.sesann", "=", scrutinSession)
+        .orderBy("sens.memgrppol.memgrppoldatdeb", "desc")
+        .select([
+        "dosleg.votsen.senmat",
+        "dosleg.posvot.posvotlib",
+        "dosleg.stavot.stavotlib",
+        "sens.memgrppol.grppolcod",
+    ])
+        .as("unique_votes"))
+        .groupBy(["unique_votes.grppolcod"])
+        .select(({ fn, eb }) => [
+        "unique_votes.grppolcod as groupe_politique_code",
+        fn.sum(eb.case().when("unique_votes.posvotlib", "=", "pour").then(1).else(0).end()).as("nombre_pour"),
+        fn.sum(eb.case().when("unique_votes.posvotlib", "=", "contre").then(1).else(0).end()).as("nombre_contre"),
+        fn
+            .sum(eb.case().when("unique_votes.posvotlib", "=", "abstention").then(1).else(0).end())
+            .as("nombre_abstentions"),
+        fn
+            .sum(eb.case().when("unique_votes.posvotlib", "=", "non-votant").then(1).else(0).end())
+            .as("nombre_non_votants"),
+        fn.count("unique_votes.senmat").as("nombre_votants"),
+    ]));
 }
-export async function* findAllScrutins(fromSession) {
-    const { query, params } = buildFindAllScrutinsQuery(fromSession);
-    for await (const row of streamUnsafeQuery(query, params)) {
-        yield {
-            ...row,
-            groupes_votants: row.groupes_votants ?? [],
-            mises_au_point: row.mises_au_point ?? [],
-            votes: row.votes ?? [],
-        };
+function misesAuPoint(scrutinNum) {
+    return jsonArrayFrom(dbSenat
+        .withSchema("dosleg")
+        .selectFrom("corscr")
+        .where("corscr.scrnum", "=", scrutinNum)
+        .select(["corscr.corscrtxt as texte", "corscr.corscrord as ordre", "corscr.corscrurl as url"]));
+}
+const findAllScrutinsQuery = dbSenat
+    .withSchema("dosleg")
+    .selectFrom("scr")
+    .leftJoin("date_seance", "scr.code", "date_seance.code")
+    .leftJoin("lecass", "date_seance.lecidt", "lecass.lecassidt")
+    .leftJoin("lecture", "lecture.lecidt", "lecass.lecidt")
+    .leftJoin("loi", "loi.loicod", "lecture.loicod")
+    .leftJoin("typlec", "typlec.typleccod", "lecture.typleccod")
+    .select(({ eb, ref, val }) => [
+    "scr.sesann as session",
+    "scr.scrnum as numero",
+    rtrim(ref("date_seance.lecidt")).as("lecture_id"),
+    rtrim(ref("lecture.leccom")).as("lecture_libelle"),
+    "loi.signet as signet_dossier",
+    rtrim(ref("typlec.typleclib")).as("type_lecture"),
+    toDateString(ref("scr.scrdat")).as("date_scrutin"),
+    toDateString(ref("scr.scrdateff")).as("date_scrutin_effective"),
+    sql `REPLACE(scr.scrint, E'\\u0092', '''')`.as("intitule"),
+    "scr.scrbaspag as note",
+    "scr.scrmaj as nombre_majorite",
+    "scr.scrmajsea as nombre_majorite_seance",
+    "scr.scrvot as nombre_votants",
+    "scr.scrvotsea as nombre_votants_seance",
+    "scr.scrsuf as nombre_suffrages",
+    "scr.scrsufsea as nombre_suffrages_seance",
+    "scr.scrcon as nombre_contre",
+    "scr.scrconsea as nombre_contre_seance",
+    "scr.scrpou as nombre_pour",
+    "scr.scrpousea as nombre_pour_seance",
+    votes(ref("scr.scrnum"), ref("scr.sesann"), ref("scr.scrdat")).as("votes"),
+    groupesVotants(ref("scr.scrnum"), ref("scr.sesann"), ref("scr.scrdat")).as("groupes_votants"),
+    misesAuPoint(ref("scr.scrnum")).as("mises_au_point"),
+])
+    .$narrowType();
+export function findAllScrutins(fromSession) {
+    if (fromSession !== undefined) {
+        return findAllScrutinsQuery.where("scr.sesann", ">=", fromSession).stream();
     }
+    return findAllScrutinsQuery.stream();
 }

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

@@ -1,3 +1,3 @@
-import { CompteRendu } from "../types/compte_rendu.js";
+import { CompteRendu } from "../types/compte_rendu";
 export declare function parseCompteRenduIntervalFromFile(xmlFilePath: string, startIndex: number, endIndex: number, agendaEventId: string): Promise<CompteRendu | null>;
 export declare function sessionStartYearFromDate(d: Date): number;

package/lib/src/model/seance.js

@@ -1,9 +1,9 @@
 import fs from "fs";
 import * as cheerio from "cheerio";
-import { toCRDate } from "./util.js";
-import { makeReunionUid } from "../utils/reunion_parsing.js";
-import { yyyymmddFromPath } from "../utils/date.js";
-import { decodeHtmlEntities, dedupeSpeaker, fixApostrophes, norm } from "../utils/string_cleaning.js";
+import { toCRDate } from "./util";
+import { makeReunionUid } from "../utils/reunion_parsing";
+import { yyyymmddFromPath } from "../utils/date";
+import { decodeHtmlEntities, dedupeSpeaker, fixApostrophes, norm } from "../utils/string_cleaning";
 export async function parseCompteRenduIntervalFromFile(xmlFilePath, startIndex, endIndex, agendaEventId) {
     try {
         const raw = fs.readFileSync(xmlFilePath, "utf8");
@@ -140,10 +140,10 @@ function extractAndRemoveLeadingQualite($, $block) {
                 $node.remove();
         }
         else if (node.type === "text") {
-            const textNode = node;
-            const t = norm(textNode.data || "");
+            const t = norm(node.data || "");
             if (!t || /^[:.,;–—-]+$/.test(t)) {
-                textNode.data = "";
+                ;
+                node.data = "";
                 return;
             }
             stop = true;