@tricoteuses/senat 3.1.20 → 3.1.22

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";
-import { norm } from "../utils/string_cleaning";
-import { frDateToISO, hourShortToStartTime } from "../utils/date";
-import { toCRDate } from "./util";
+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";
 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,67 +1,39 @@
-import { InferResult } from "kysely";
-export type DebatResult = InferResult<typeof findAllQuery>[0];
-declare const findAllQuery: import("kysely").SelectQueryBuilder<any, "debats.debats", {
-    [x: string]: any;
+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 {
     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 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 {};
+}
+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>;

package/lib/src/model/debats.js

@@ -1,95 +1,112 @@
-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"));
+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
+    `,
+    };
 }
-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();
+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 ?? [],
+        };
+    }
 }

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

@@ -1,12 +1,32 @@
-import { Expression, InferResult, SelectQueryBuilder } from "kysely";
-export declare function rapports(lectureAssembleeId: Expression<string>): import("kysely").RawBuilder<{
-    [x: string]: any;
-}[]>;
-declare const queryTextes: SelectQueryBuilder<any, any, any>;
-export declare function textes(lectureAssembleeId: Expression<string>): import("kysely").RawBuilder<{
-    [x: string]: any;
-}[]>;
-export declare function findAllTextes(): AsyncIterableIterator<DocumentResult>;
-export declare function findAllRapports(): AsyncIterableIterator<DocumentResult>;
-export type DocumentResult = InferResult<typeof queryTextes>[0];
-export {};
+export interface AuteurDocumentRow {
+    matricule: string | null;
+    nom_usuel: string;
+    ordre: string | null;
+    prenom: string | null;
+    qualite: string | null;
+    role: string | null;
+}
+export interface DocumentAnnexeRow {
+    type_document: string;
+    url: string | null;
+}
+export interface DocumentResult {
+    auteurs: AuteurDocumentRow[];
+    code_adoption?: string | null;
+    code_organisme: string | null;
+    date: string;
+    documents_annexes?: DocumentAnnexeRow[];
+    id: string | null;
+    modification?: string | null;
+    numero: number | string | null;
+    ordre_origine?: string | null;
+    origine?: string | null;
+    session: number | null;
+    signet_dossier?: string | null;
+    sous_titre?: string | null;
+    titre: string | null;
+    type: string | null;
+    url: string | null;
+}
+export declare function findAllTextes(): AsyncGenerator<DocumentResult, void, unknown>;
+export declare function findAllRapports(): AsyncGenerator<DocumentResult, void, unknown>;