@tricoteuses/senat 3.1.18 → 3.1.19

package/lib/src/model/ameli.js

@@ -1,150 +1,148 @@
-import { streamUnsafeQuery } from "../databases_postgres.js";
-function buildFindAllAmendementsQuery(fromSession) {
-    const params = [];
-    const whereSession = fromSession === undefined ? "" : "where ses.ann >= $1";
-    if (fromSession !== undefined) {
-        params.push(fromSession);
-    }
-    return {
-        params,
-        query: `
-      select
-        ses.ann::text as session,
-        ses.lil as session_libelle,
-        typses.lib as type_session,
-        txt_ameli.doslegsignet as signet_dossier_legislatif,
-        nat.libcourt as nature_texte,
-        nat.lib as nature_texte_libelle,
-        txt_ameli.numabs as numero_texte,
-        txt_ameli.numado as numero_adoption_texte,
-        txt_ameli.int as intitule_texte,
-        etatxt.lic as etat_texte,
-        etatxt.lib as etat_texte_libelle,
-        etatxt.txttyp as type_texte,
-        lec_ameli.lib as lecture,
-        case amd.typ
-          when 'A' then 'Amendement'
-          when 'M' then 'Motion'
-          when 'S' then 'Sous-amendement'
-          else ''
-        end as nature,
-        amd.id,
-        amd.amdperid as parent_id,
-        amd.ideid as identique_id,
-        amd.discomid as discussion_commune_id,
-        amd.num as numero,
-        amd.numabs as numero_absolu,
-        amd.ord as ordre,
-        amd.accgou as accepte_gouvernement,
-        amd.txtid as texte_id,
-        sub.lib as subdivision_libelle,
-        sub.lic as subdivision_libelle_court,
-        sub.pos as subdivision_position_texte,
-        sub.posder as subdivision_position_discussion,
-        sub.merid as subdivision_mere_id,
-        sub.sig as subdivision_signet,
-        sub.comdelid as subdivision_commission_id,
-        sub.dupl as subdivision_dupliquee,
-        typsub.lib as subdivision_type,
-        amd.alinea,
-        amd.obs as observations,
-        amd.mot as observations_additionnelles,
-        to_char(amd.datdep, 'YYYY-MM-DD') as date_depot,
-        amd.dis as dispositif,
-        amd.obj as objet,
-        typrect.lib as type_rectification,
-        mot.lib as motion_libelle,
-        case amd.etaid
-          when 7 then 'Diffusé'
-          when 8 then 'Retiré avant réunion ou séance'
-          when 9 then 'Examiné en commission ou séance'
-          when 10 then 'Irrecevable'
-          when 11 then 'Irrecevable'
-          else ''
-        end as etat,
-        avicom.lib as avis_commission,
-        avigvt.lib as avis_gouvernement,
-        coalesce(sor.lib, irr.libirr) as sort,
-        amd.rev as revision,
-        (
-          case
-            when amd.num like '%COM%' then 'https://www.senat.fr/amendements/commissions/'
-            else 'https://www.senat.fr/amendements/'
-          end ||
-          ses.ann::text || '-' ||
-          (ses.ann + 1)::text || '/' ||
-          txt_ameli.numabs || '/Amdt_' ||
-          amd.num || '.html'
-        ) as url,
-        grppol_ameli.lilcou as au_nom_de_groupe_politique,
-        rtrim(com_ameli.lil) as au_nom_de_commission,
-        rtrim(com_ameli.cod) as code_commission,
-        (cab.entid is not null) as auteur_est_gouvernement,
-        (
-          select amescr.scrnum::text
-          from senat.dosleg_amescr as amescr
-          left join senat.dosleg_scr as scr
-            on amescr.scrnum = scr.scrnum
-           and amescr.sesann = scr.sesann
-          left join senat.dosleg_date_seance as date_seance on scr.code = date_seance.code
-          where amescr.amescrnum = amd.num
-            and amescr.sesann = ses.ann
-            and date_seance.lecidt = texte.lecassidt
-          limit 1
-        ) as scrutin_num,
-        (
-          select coalesce(json_agg(author_rows order by author_rows.rang nulls last), '[]'::json)
-          from (
-            select
-              amdsen.prenomuse as prenom,
-              amdsen.hom as homonyme,
-              amdsen.nomuse as nom,
-              amdsen.qua as qualite,
-              amdsen.rng::text as rang,
-              sen_ameli.mat as matricule,
-              amdsen.grpid as groupe_politique_id,
-              grppol_ameli.cod as group_politique_code,
-              grppol_ameli.libcou as groupe_politique_libelle_court,
-              grppol_ameli.lilcou as groupe_politique_libelle
-            from senat.ameli_amdsen as amdsen
-            left join senat.ameli_sen_ameli as sen_ameli on amdsen.senid = sen_ameli.entid
-            left join senat.ameli_grppol_ameli as grppol_ameli on amdsen.grpid = grppol_ameli.entid
-            where amdsen.amdid = amd.id
-            order by amdsen.rng asc
-          ) as author_rows
-        ) as auteurs
-      from senat.ameli_amd as amd
-      left join senat.ameli_sub as sub on amd.subid = sub.id
-      left join senat.ameli_typsub as typsub on sub.typid = typsub.id
-      left join senat.ameli_typrect as typrect on amd.typrectid = typrect.id
-      left join senat.ameli_txt_ameli as txt_ameli on amd.txtid = txt_ameli.id
-      left join senat.ameli_etatxt as etatxt on txt_ameli.txtetaid = etatxt.id
-      left join senat.ameli_ses as ses on txt_ameli.sesdepid = ses.id
-      left join senat.ameli_typses as typses on typses.id = ses.typid
-      left join senat.ameli_nat as nat on txt_ameli.natid = nat.id
-      left join senat.ameli_lec_ameli as lec_ameli on txt_ameli.lecid = lec_ameli.id
-      left join senat.dosleg_texte as texte
-        on ses.ann = texte.sesann
-        and txt_ameli.numabs = texte.texnum
-      left join senat.dosleg_lecass as lecass on texte.lecassidt = lecass.lecassidt
-      left join senat.ameli_mot as mot on amd.motid = mot.id
-      left join senat.ameli_avicom as avicom on amd.avcid = avicom.id
-      left join senat.ameli_avigvt as avigvt on amd.avgid = avigvt.id
-      left join senat.ameli_sor as sor on amd.sorid = sor.id
-      left join senat.ameli_irr as irr on amd.irrid = irr.id
-      left join senat.ameli_grppol_ameli as grppol_ameli on amd.nomentid = grppol_ameli.entid
-      left join senat.ameli_com_ameli as com_ameli on amd.nomentid = com_ameli.entid
-      left join senat.ameli_cab as cab on amd.nomentid = cab.entid
-      ${whereSession}
-    `,
-    };
+import { sql } from "kysely";
+import { jsonArrayFrom } from "kysely/helpers/postgres";
+import { dbSenat } from "../databases";
+import { concat, rtrim, toDateString } from "./util";
+function auteurs(amendementId) {
+    return jsonArrayFrom(dbSenat
+        .selectFrom("ameli.amdsen")
+        .leftJoin("ameli.sen_ameli", "ameli.amdsen.senid", "ameli.sen_ameli.entid")
+        .leftJoin("ameli.grppol_ameli", "ameli.amdsen.grpid", "ameli.grppol_ameli.entid")
+        .where("ameli.amdsen.amdid", "=", amendementId)
+        .select([
+        "ameli.amdsen.prenomuse as prenom",
+        "ameli.amdsen.hom as homonyme",
+        "ameli.amdsen.nomuse as nom",
+        "ameli.amdsen.qua as qualite",
+        "ameli.amdsen.rng as rang",
+        "ameli.sen_ameli.mat as matricule",
+        "ameli.amdsen.grpid as groupe_politique_id",
+        "ameli.grppol_ameli.cod as group_politique_code",
+        "ameli.grppol_ameli.libcou as groupe_politique_libelle_court",
+        "ameli.grppol_ameli.lilcou as groupe_politique_libelle",
+    ])
+        .orderBy("ameli.amdsen.rng", "asc"));
 }
-export async function* findAllAmendements(fromSession) {
-    const { query, params } = buildFindAllAmendementsQuery(fromSession);
-    for await (const row of streamUnsafeQuery(query, params)) {
-        yield {
-            ...row,
-            auteurs: row.auteurs ?? [],
-        };
+function scrutin(amendementNum, sesann, lecassidt) {
+    return dbSenat
+        .selectFrom("dosleg.amescr")
+        .leftJoin("dosleg.scr", (join) => join
+        .onRef("dosleg.amescr.scrnum", "=", "dosleg.scr.scrnum")
+        .onRef("dosleg.amescr.sesann", "=", "dosleg.scr.sesann"))
+        .leftJoin("dosleg.date_seance", "dosleg.scr.code", "dosleg.date_seance.code")
+        .where("dosleg.amescr.amescrnum", "=", amendementNum)
+        .where("dosleg.amescr.sesann", "=", sesann)
+        .where("dosleg.date_seance.lecidt", "=", lecassidt)
+        .select(["dosleg.amescr.scrnum as scrutin_num"])
+        .limit(1)
+        .as("scrutin_num");
+}
+const findAllAmendementsQuery = dbSenat
+    .selectFrom("ameli.amd")
+    .leftJoin("ameli.sub", "ameli.amd.subid", "ameli.sub.id")
+    .leftJoin("ameli.typsub", "ameli.sub.typid", "ameli.typsub.id")
+    .leftJoin("ameli.typrect", "ameli.amd.typrectid", "ameli.typrect.id")
+    .leftJoin("ameli.txt_ameli", "ameli.amd.txtid", "ameli.txt_ameli.id")
+    .leftJoin("ameli.etatxt", "ameli.txt_ameli.txtetaid", "ameli.etatxt.id")
+    .leftJoin("ameli.ses", "ameli.txt_ameli.sesdepid", "ameli.ses.id")
+    .leftJoin("ameli.typses", "ameli.typses.id", "ameli.ses.typid")
+    .leftJoin("ameli.nat", "ameli.txt_ameli.natid", "ameli.nat.id")
+    .leftJoin("ameli.lec_ameli", "ameli.txt_ameli.lecid", "ameli.lec_ameli.id")
+    .leftJoin("dosleg.texte", (join) => join.onRef("ameli.ses.ann", "=", "dosleg.texte.sesann").onRef("ameli.txt_ameli.numabs", "=", "dosleg.texte.texnum"))
+    .leftJoin("dosleg.lecass", "dosleg.texte.lecassidt", "dosleg.lecass.lecassidt")
+    .leftJoin("ameli.mot", "ameli.amd.motid", "ameli.mot.id")
+    .leftJoin("ameli.avicom", "ameli.amd.avcid", "ameli.avicom.id")
+    .leftJoin("ameli.avigvt", "ameli.amd.avgid", "ameli.avigvt.id")
+    .leftJoin("ameli.sor", "ameli.amd.sorid", "ameli.sor.id")
+    .leftJoin("ameli.irr", "ameli.amd.irrid", "ameli.irr.id")
+    .leftJoin("ameli.grppol_ameli", "ameli.amd.nomentid", "ameli.grppol_ameli.entid")
+    .leftJoin("ameli.com_ameli", "ameli.amd.nomentid", "ameli.com_ameli.entid")
+    .leftJoin("ameli.cab", "ameli.amd.nomentid", "ameli.cab.entid")
+    .select(({ eb, ref, val }) => [
+    "ameli.ses.ann as session",
+    "ameli.ses.lil as session_libelle",
+    "ameli.typses.lib as type_session",
+    "ameli.txt_ameli.doslegsignet as signet_dossier_legislatif",
+    "ameli.nat.libcourt as nature_texte",
+    "ameli.nat.lib as nature_texte_libelle",
+    "ameli.txt_ameli.numabs as numero_texte",
+    "ameli.txt_ameli.numado as numero_adoption_texte",
+    "ameli.txt_ameli.int as intitule_texte",
+    "ameli.etatxt.lic as etat_texte",
+    "ameli.etatxt.lib as etat_texte_libelle",
+    "ameli.etatxt.txttyp as type_texte",
+    "ameli.lec_ameli.lib as lecture",
+    eb
+        .case()
+        .when("ameli.amd.typ", "=", "A")
+        .then(val("Amendement"))
+        .when("ameli.amd.typ", "=", "M")
+        .then(val("Motion"))
+        .when("ameli.amd.typ", "=", "S")
+        .then(val("Sous-amendement"))
+        .else("")
+        .end()
+        .as("nature"),
+    "ameli.amd.id as id",
+    "ameli.amd.amdperid as parent_id",
+    "ameli.amd.ideid as identique_id",
+    "ameli.amd.discomid as discussion_commune_id",
+    "ameli.amd.num as numero",
+    "ameli.amd.numabs as numero_absolu",
+    "ameli.amd.ord as ordre",
+    "ameli.amd.accgou as accepte_gouvernement",
+    "ameli.amd.txtid as texte_id",
+    "ameli.sub.lib as subdivision_libelle",
+    "ameli.sub.lic as subdivision_libelle_court",
+    "ameli.sub.pos as subdivision_position_texte",
+    "ameli.sub.posder as subdivision_position_discussion",
+    "ameli.sub.merid as subdivision_mere_id",
+    "ameli.sub.sig as subdivision_signet",
+    "ameli.sub.comdelid as subdivision_commission_id",
+    "ameli.sub.dupl as subdivision_dupliquee",
+    "ameli.typsub.lib as subdivision_type",
+    "ameli.amd.alinea as alinea",
+    "ameli.amd.obs as observations",
+    "ameli.amd.mot as observations_additionnelles",
+    toDateString(ref("ameli.amd.datdep")).as("date_depot"),
+    "ameli.amd.dis as dispositif",
+    "ameli.amd.obj as objet",
+    "ameli.typrect.lib as type_rectification",
+    "ameli.mot.lib as motion_libelle",
+    eb
+        .case()
+        .when("ameli.amd.etaid", "=", 7)
+        .then(val("Diffusé"))
+        .when("ameli.amd.etaid", "=", 8)
+        .then(val("Retiré avant réunion ou séance"))
+        .when("ameli.amd.etaid", "=", 9)
+        .then(val("Examiné en commission ou séance"))
+        .when("ameli.amd.etaid", "=", 10)
+        .then(val("Irrecevable"))
+        .when("ameli.amd.etaid", "=", 11)
+        .then(val("Irrecevable"))
+        .else("")
+        .end()
+        .as("etat"),
+    "ameli.avicom.lib as avis_commission",
+    "ameli.avigvt.lib as avis_gouvernement",
+    eb.fn.coalesce("ameli.sor.lib", "ameli.irr.libirr").as("sort"),
+    "ameli.amd.rev as revision",
+    concat(eb
+        .case()
+        .when("ameli.amd.num", "like", "%COM%")
+        .then(val("https://www.senat.fr/amendements/commissions/"))
+        .else(val("https://www.senat.fr/amendements/"))
+        .end(), ref("ameli.ses.ann"), val("-"), sql `(ameli.ses.ann + 1)`, val("/"), ref("ameli.txt_ameli.numabs"), val("/Amdt_"), ref("ameli.amd.num"), val(".html")).as("url"),
+    "ameli.grppol_ameli.lilcou as au_nom_de_groupe_politique",
+    rtrim(ref("ameli.com_ameli.lil")).as("au_nom_de_commission"),
+    rtrim(ref("ameli.com_ameli.cod")).as("code_commission"),
+    eb.case().when("ameli.cab.entid", "is not", null).then(true).else(false).end().as("auteur_est_gouvernement"),
+    scrutin(ref("ameli.amd.num"), ref("ameli.ses.ann"), ref("dosleg.texte.lecassidt")),
+    auteurs(ref("ameli.amd.id")).as("auteurs"),
+]);
+export function findAllAmendements(fromSession) {
+    if (fromSession !== undefined) {
+        return findAllAmendementsQuery.where("ameli.ses.ann", ">=", fromSession).stream();
     }
+    return findAllAmendementsQuery.stream();
 }

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

@@ -1,11 +1,10 @@
 import * as cheerio from "cheerio";
-import type { AnyNode } from "domhandler";
-import { CompteRendu } from "../types/compte_rendu.js";
-import { Reunion } from "../types/agenda.js";
-export declare function getRemainingTextAfterSpeakerHeader($: cheerio.CheerioAPI, $p: cheerio.Cheerio<AnyNode>): string;
+import { CompteRendu } from "../types/compte_rendu";
+import { Reunion } from "../types/agenda";
+export declare function getRemainingTextAfterSpeakerHeader($: cheerio.CheerioAPI, $p: cheerio.Cheerio<any>): string;
 export type DaySection = {
     title: string;
-    $start: cheerio.Cheerio<AnyNode>;
+    $start: cheerio.Cheerio<any>;
     time?: string;
 };
 export declare function cleanTitle(t: string): string;

package/lib/src/model/commission.js

@@ -1,9 +1,9 @@
 import * as cheerio from "cheerio";
 import path from "path";
-import { makeReunionUid } from "../utils/reunion_parsing.js";
-import { norm } from "../utils/string_cleaning.js";
-import { frDateToISO, hourShortToStartTime } from "../utils/date.js";
-import { toCRDate } from "./util.js";
+import { makeReunionUid } from "../utils/reunion_parsing";
+import { norm } from "../utils/string_cleaning";
+import { frDateToISO, hourShortToStartTime } from "../utils/date";
+import { toCRDate } from "./util";
 const PARA_h3_SEL = "p.sh_justify, p.sh_center, p.sh_marge, p[align], li, h3";
 function findDayRoot($, targetISO) {
     let $root = $();
@@ -39,7 +39,7 @@ function collectLeadingHeaderStrongEls($, $clone) {
             }
             if ($n.is("a") && $n.children("strong, b").length) {
                 $n.children("strong, b").each((_, el) => {
-                    els.push(el);
+                    els.push($(el));
                 });
                 continue;
             }
@@ -68,7 +68,7 @@ function buildPointsFromParagraphs($, paras) {
     const normSpeaker = (s) => s
         .normalize("NFKC")
         .replace(/\s+/g, " ")
-        .replace(/[.:]\s*$/, "")
+        .replace(/[:\.]\s*$/, "")
         .trim();
     const normQual = (s) => s
         .normalize("NFKC")

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

@@ -1,39 +1,67 @@
-export interface DebatAuteurRow {
-    code: string | null;
-    matricule: string | null;
-    nom: string | null;
-    prenom: string | null;
-}
-export interface DebatInterventionRow {
-    analyse: string | null;
-    auteur: DebatAuteurRow | null;
-    auteur_code: string;
-    fonction_intervenant: string | null;
-    id: string | null;
-    url: string | null;
-}
-export interface DebatSectionRow {
-    categorie: string | null;
-    id?: string | null;
-    interventions: DebatInterventionRow[];
-    lecture_id?: string | null;
-    libelle?: string | null;
-    numero?: string | null;
-    objet: string | null;
-    type: string | null;
-    url?: string | null;
-}
-export interface DebatLectureRow {
+import { InferResult } from "kysely";
+export type DebatResult = InferResult<typeof findAllQuery>[0];
+declare const findAllQuery: import("kysely").SelectQueryBuilder<any, "debats.debats", {
+    [x: string]: any;
     id: string;
-}
-export interface DebatResult {
-    date_seance: string | null;
-    etat_synchronisation: string | null;
-    id: string | null;
-    lectures: DebatLectureRow[];
-    numero: string | null;
-    sections: DebatSectionRow[];
-    sections_divers: DebatSectionRow[];
-    url: string | null;
-}
-export declare function findAll(): AsyncGenerator<DebatResult, void, unknown>;
+    date_seance: string;
+    sections: {
+        [x: string]: any;
+        interventions: {
+            [x: string]: any;
+            auteur: {
+                code: any;
+                nom: any;
+                prenom: any;
+                matricule: any;
+            };
+        }[];
+    }[];
+    sections_divers: {
+        [x: string]: any;
+        interventions: {
+            [x: string]: any;
+            auteur: {
+                code: any;
+                nom: any;
+                prenom: any;
+                matricule: any;
+            };
+        }[];
+    }[];
+    lectures: {
+        id: any;
+    }[];
+}>;
+export declare function findAll(fromSession?: number): AsyncIterableIterator<{
+    [x: string]: any;
+    id: string;
+    date_seance: string;
+    sections: {
+        [x: string]: any;
+        interventions: {
+            [x: string]: any;
+            auteur: {
+                code: any;
+                nom: any;
+                prenom: any;
+                matricule: any;
+            };
+        }[];
+    }[];
+    sections_divers: {
+        [x: string]: any;
+        interventions: {
+            [x: string]: any;
+            auteur: {
+                code: any;
+                nom: any;
+                prenom: any;
+                matricule: any;
+            };
+        }[];
+    }[];
+    lectures: {
+        id: any;
+    }[];
+}>;
+export {};

package/lib/src/model/debats.js

@@ -1,112 +1,95 @@
-import { streamUnsafeQuery } from "../databases_postgres.js";
-function buildFindAllDebatsQuery() {
-    return {
-        params: [],
-        query: `
-      select
-        to_char(debats.datsea, 'YYYYMMDD') as id,
-        to_char(debats.datsea, 'YYYY-MM-DD') as date_seance,
-        debats.numero::text as numero,
-        debats.deburl as url,
-        debats.debsyn as etat_synchronisation,
-        (
-          select coalesce(json_agg(section_rows order by section_rows.section_order nulls last), '[]'::json)
-          from (
-            select
-              secdis.secdisordid::text as id,
-              secdis.secdisnum as numero,
-              secdis.secdisobj as objet,
-              secdis.secdisurl as url,
-              typsec.typseclib as type,
-              typsec.typseccat as categorie,
-              secdis.lecassidt as lecture_id,
-              secdis.secdisordid as section_order,
-              (
-                select coalesce(
-                  json_agg(intervention_rows order by intervention_rows.intervention_order nulls last),
-                  '[]'::json
-                )
-                from (
-                  select
-                    intpjl.intordid::text as id,
-                    intpjl.autcod as auteur_code,
-                    intpjl.intfon as fonction_intervenant,
-                    intpjl.inturl as url,
-                    intpjl.intana as analyse,
-                    json_build_object(
-                      'code', auteur.autcod,
-                      'nom', auteur.nomuse,
-                      'prenom', auteur.prenom,
-                      'matricule', auteur.autmat
-                    ) as auteur,
-                    intpjl.intordid as intervention_order
-                  from senat.debats_intpjl as intpjl
-                  left join senat.dosleg_auteur as auteur on intpjl.autcod = auteur.autcod
-                  where intpjl.secdiscle = secdis.secdiscle
-                ) as intervention_rows
-              ) as interventions
-            from senat.debats_secdis as secdis
-            left join senat.debats_typsec as typsec on secdis.typseccod = typsec.typseccod
-            where secdis.datsea = debats.datsea
-          ) as section_rows
-        ) as sections,
-        (
-          select coalesce(json_agg(section_rows), '[]'::json)
-          from (
-            select
-              secdivers.secdiverslibelle as libelle,
-              secdivers.secdiversobj as objet,
-              typsec.typseclib as type,
-              typsec.typseccat as categorie,
-              (
-                select coalesce(
-                  json_agg(intervention_rows order by intervention_rows.intervention_order nulls last),
-                  '[]'::json
-                )
-                from (
-                  select
-                    intdivers.intdiversordid::text as id,
-                    intdivers.autcod as auteur_code,
-                    intdivers.intfon as fonction_intervenant,
-                    intdivers.inturl as url,
-                    intdivers.intana as analyse,
-                    json_build_object(
-                      'code', auteur.autcod,
-                      'nom', auteur.nomuse,
-                      'prenom', auteur.prenom,
-                      'matricule', auteur.autmat
-                    ) as auteur,
-                    intdivers.intdiversordid as intervention_order
-                  from senat.debats_intdivers as intdivers
-                  left join senat.dosleg_auteur as auteur on intdivers.autcod = auteur.autcod
-                  where intdivers.secdiverscle = secdivers.secdiverscle
-                ) as intervention_rows
-              ) as interventions
-            from senat.debats_secdivers as secdivers
-            left join senat.debats_typsec as typsec on secdivers.typseccod = typsec.typseccod
-            where secdivers.datsea = debats.datsea
-          ) as section_rows
-        ) as sections_divers,
-        (
-          select coalesce(json_agg(lecture_rows), '[]'::json)
-          from (
-            select lecassdeb.lecassidt as id
-            from senat.debats_lecassdeb as lecassdeb
-            where lecassdeb.datsea = debats.datsea
-          ) as lecture_rows
-        ) as lectures
-      from senat.debats_debats as debats
-    `,
-    };
+import { jsonArrayFrom, jsonBuildObject } from "kysely/helpers/postgres";
+import { dbSenat } from "../databases";
+import { ID_DATE_FORMAT } from "../scripts/datautil";
+import { toDateString } from "./util";
+function sectionsLegislatives(dateSeance) {
+    return jsonArrayFrom(dbSenat
+        .selectFrom("debats.secdis")
+        .leftJoin("debats.typsec", "debats.secdis.typseccod", "debats.typsec.typseccod")
+        .where("debats.secdis.datsea", "=", dateSeance)
+        .select(({ ref }) => [
+        "debats.secdis.secdisordid as id",
+        "debats.secdis.secdisnum as numero",
+        "debats.secdis.secdisobj as objet",
+        "debats.secdis.secdisurl as url",
+        "debats.typsec.typseclib as type",
+        "debats.typsec.typseccat as categorie",
+        interventionsLegislatives(ref("debats.secdis.secdiscle")).as("interventions"),
+        "debats.secdis.lecassidt as lecture_id",
+    ])
+        .orderBy("debats.secdis.secdisordid", "asc"));
 }
-export async function* findAll() {
-    const { query, params } = buildFindAllDebatsQuery();
-    for await (const row of streamUnsafeQuery(query, params)) {
-        yield {
-            ...row,
-            lectures: row.lectures ?? [],
-            sections: row.sections ?? [],
-            sections_divers: row.sections_divers ?? [],
-        };
-    }
+function interventionsLegislatives(sectionId) {
+    return jsonArrayFrom(dbSenat
+        .selectFrom("debats.intpjl")
+        .leftJoin("dosleg.auteur", "debats.intpjl.autcod", "dosleg.auteur.autcod")
+        .where("debats.intpjl.secdiscle", "=", sectionId)
+        .select(({ ref, val, fn }) => [
+        "debats.intpjl.intordid as id",
+        "debats.intpjl.autcod as auteur_code",
+        "debats.intpjl.intfon as fonction_intervenant",
+        "debats.intpjl.inturl as url",
+        "debats.intpjl.intana as analyse",
+        jsonBuildObject({
+            code: ref("dosleg.auteur.autcod"),
+            nom: ref("dosleg.auteur.nomuse"),
+            prenom: ref("dosleg.auteur.prenom"),
+            matricule: ref("dosleg.auteur.autmat"),
+        }).as("auteur"),
+    ])
+        .orderBy("debats.intpjl.intordid", "asc"));
+}
+function sectionsNonLegislatives(dateSeance) {
+    return jsonArrayFrom(dbSenat
+        .selectFrom("debats.secdivers")
+        .leftJoin("debats.typsec", "debats.secdivers.typseccod", "debats.typsec.typseccod")
+        .where("debats.secdivers.datsea", "=", dateSeance)
+        .select(({ ref }) => [
+        "debats.secdivers.secdiverslibelle as libelle",
+        "debats.secdivers.secdiversobj as objet",
+        "debats.typsec.typseclib as type",
+        "debats.typsec.typseccat as categorie",
+        interventionsNonLegislatives(ref("debats.secdivers.secdiverscle")).as("interventions"),
+    ]));
+}
+function interventionsNonLegislatives(sectionId) {
+    return jsonArrayFrom(dbSenat
+        .selectFrom("debats.intdivers")
+        .leftJoin("dosleg.auteur", "debats.intdivers.autcod", "dosleg.auteur.autcod")
+        .where("debats.intdivers.intdiverscle", "=", sectionId)
+        .select(({ ref, val }) => [
+        "debats.intdivers.intdiversordid as id",
+        "debats.intdivers.autcod as auteur_code",
+        "debats.intdivers.intfon as fonction_intervenant",
+        "debats.intdivers.inturl as url",
+        "debats.intdivers.intana as analyse",
+        jsonBuildObject({
+            code: ref("dosleg.auteur.autcod"),
+            nom: ref("dosleg.auteur.nomuse"),
+            prenom: ref("dosleg.auteur.prenom"),
+            matricule: ref("dosleg.auteur.autmat"),
+        }).as("auteur"),
+    ])
+        .orderBy("debats.intdivers.intdiversordid", "asc"));
+}
+function lecturesAssemblee(dateSeance) {
+    return jsonArrayFrom(dbSenat
+        .selectFrom("debats.lecassdeb")
+        .where("debats.lecassdeb.datsea", "=", dateSeance)
+        .select("debats.lecassdeb.lecassidt as id"));
+}
+const findAllQuery = dbSenat
+    .selectFrom("debats.debats")
+    .select(({ ref, val }) => [
+    toDateString(ref("debats.debats.datsea"), val(ID_DATE_FORMAT)).as("id"),
+    toDateString(ref("debats.debats.datsea")).as("date_seance"),
+    "debats.debats.numero as numero",
+    "debats.debats.deburl as url",
+    "debats.debats.debsyn as etat_synchronisation",
+    sectionsLegislatives(ref("debats.debats.datsea")).as("sections"),
+    sectionsNonLegislatives(ref("debats.debats.datsea")).as("sections_divers"),
+    lecturesAssemblee(ref("debats.debats.datsea")).as("lectures"),
+]);
+export function findAll(fromSession) {
+    return findAllQuery.stream();
 }