@tricoteuses/senat 2.22.16 → 2.23.0

package/lib/src/model/documents.js

@@ -1,141 +1,182 @@
-import { sql } from "kysely";
-import { dbSenat } from "../databases";
-import { concat, rtrim, toDateString } from "./util";
-import { jsonArrayFrom } from "kysely/helpers/postgres";
-function stripTrailingHashes(expr) {
-    return sql `regexp_replace(${expr}, '#+$', '')`;
+import { streamUnsafeQuery } from "../databases_postgres";
+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 orderOrdreOrigineTexte(expr) {
-    return sql `array_position(array['0','2','1'], ${expr})`;
+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 auteursRapport(rapportId) {
-    return jsonArrayFrom(dbSenat
-        .withSchema("dosleg")
-        .selectFrom("dosleg.auteur")
-        .leftJoin("dosleg.ecr", "dosleg.ecr.autcod", "dosleg.auteur.autcod")
-        .leftJoin("dosleg.rolsig", "dosleg.rolsig.signataire", "dosleg.ecr.signataire")
-        .where("dosleg.ecr.rapcod", "=", rapportId)
-        .select([
-        "dosleg.auteur.prenom as prenom",
-        "dosleg.auteur.nomuse as nom_usuel",
-        "dosleg.auteur.autmat as matricule",
-        "dosleg.ecr.ecrnumtri as ordre",
-        "dosleg.rolsig.rolsiglib as role",
-        "dosleg.ecr.ecrqua as qualite",
-    ])
-        .orderBy("dosleg.ecr.ecrnumtri", "asc"));
+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 documentsAttaches(rapportId) {
-    return jsonArrayFrom(dbSenat
-        .withSchema("dosleg")
-        .selectFrom("docatt")
-        .leftJoin("typatt", "docatt.typattcod", "typatt.typattcod")
-        .where("docatt.rapcod", "=", rapportId)
-        .select(["docatt.docatturl as url", "typatt.typattlib as type_document"]));
+function stripTrailingHashesSql(expr) {
+    return `regexp_replace(${expr}, '#+$', '')`;
 }
-function selectRapportAttributes({ eb, ref, val }) {
-    return [
-        "rap.rapnum as numero",
-        "raporg.orgcod as code_organisme",
-        eb
-            .case()
-            .when("rap.rapurl", "is not", null)
-            .then(stripTrailingHashes(sql `regexp_replace(trim(${ref("rap.rapurl")}), '^(.*/)?(.*?)(\\.html)?$', '\\2')`))
-            .else(null)
-            .end()
-            .as("id"),
-        eb
-            .case()
-            .when("rap.typurl", "=", "I")
-            .then(stripTrailingHashes(concat(val("https://www.senat.fr/rap/"), rtrim(ref("rap.rapurl")))))
-            .else(stripTrailingHashes(rtrim(ref("rap.rapurl"))))
-            .end()
-            .as("url"),
-        rtrim(ref("denrap.libdenrap")).as("type"),
-        rtrim(rtrim(ref("rap.raptil"))).as("titre"),
-        rtrim(rtrim(ref("rap.rapsoustit"))).as("sous_titre"),
-        toDateString(ref("rap.date_depot")).as("date"),
-        "rap.sesann as session",
-        auteursRapport(ref("rap.rapcod")).as("auteurs"),
-        documentsAttaches(ref("rap.rapcod")).as("documents_annexes"),
-    ];
+function rapportIdSql() {
+    return `
+    case
+      when rap.rapurl is not null then
+        ${stripTrailingHashesSql("regexp_replace(trim(rap.rapurl), '^(.*/)?(.*?)(\\.html)?$', '\\2')")}
+      else null
+    end
+  `;
 }
-const baseQueryRapports = dbSenat
-    .withSchema("dosleg")
-    .selectFrom("rap")
-    .leftJoin("raporg", "raporg.rapcod", "rap.rapcod")
-    .leftJoin("denrap", "denrap.coddenrap", "rap.coddenrap")
-    .leftJoin("lecassrap", "lecassrap.rapcod", "rap.rapcod");
-const queryRapports = baseQueryRapports
-    .leftJoin("lecass", "lecass.lecassidt", "lecassrap.lecassidt")
-    .leftJoin("lecture", "lecture.lecidt", "lecass.lecidt")
-    .leftJoin("loi", "loi.loicod", "lecture.loicod")
-    .select((args) => ["loi.signet as signet_dossier", ...selectRapportAttributes(args)]);
-export function rapports(lectureAssembleeId) {
-    return jsonArrayFrom(baseQueryRapports.select(selectRapportAttributes).where("lecassrap.lecassidt", "=", lectureAssembleeId));
+function rapportUrlSql() {
+    return `
+    case
+      when rap.typurl = 'I' then ${stripTrailingHashesSql("'https://www.senat.fr/rap/' || rtrim(rap.rapurl)")}
+      else ${stripTrailingHashesSql("rtrim(rap.rapurl)")}
+    end
+  `;
 }
-function auteursTexte(texteId) {
-    return jsonArrayFrom(dbSenat
-        .withSchema("dosleg")
-        .selectFrom("auteur")
-        .leftJoin("ecr", "ecr.autcod", "auteur.autcod")
-        .leftJoin("rolsig", "rolsig.signataire", "ecr.signataire")
-        .where("ecr.texcod", "=", texteId)
-        .select([
-        "auteur.prenom as prenom",
-        "auteur.nomuse as nom_usuel",
-        "auteur.autmat as matricule",
-        "ecr.ecrnumtri as ordre",
-        "rolsig.rolsiglib as role",
-        "ecr.ecrqua as qualite",
-    ])
-        .orderBy("ecr.ecrnumtri", "asc"));
+function texteIdSql() {
+    return `
+    case
+      when texte.texurl is not null then
+        ${stripTrailingHashesSql("regexp_replace(trim(texte.texurl), '^(.*/)?(.*?)(\\.html)?$', '\\2')")}
+      else null
+    end
+  `;
 }
-function selectTexteAttributes({ eb, ref, val }) {
-    return [
-        "texte.texnum as numero",
-        "texte.orgcod as code_organisme",
-        eb
-            .case()
-            .when("texte.texurl", "is not", null)
-            .then(stripTrailingHashes(sql `regexp_replace(trim(${ref("texte.texurl")}), '^(.*/)?(.*?)(\\.html)?$', '\\2')`))
-            .else(null)
-            .end()
-            .as("id"),
-        eb
-            .case()
-            .when("texte.typurl", "=", "I")
-            .then(stripTrailingHashes(concat(val("https://www.senat.fr/leg/"), rtrim(ref("texte.texurl")))))
-            .else(stripTrailingHashes(rtrim(ref("texte.texurl"))))
-            .end()
-            .as("url"),
-        rtrim(ref("oritxt.oritxtlib")).as("origine"),
-        "oritxt.oriordre as ordre_origine",
-        "oritxt.oritxtado as code_adoption",
-        "oritxt.oritxtmod as modification",
-        rtrim(ref("typtxt.typtxtlib")).as("type"),
-        toDateString(ref("texte.txtoritxtdat")).as("date"),
-        "texte.sesann as session",
-        auteursTexte(ref("texte.texcod")).as("auteurs"),
-    ];
+function texteUrlSql() {
+    return `
+    case
+      when texte.typurl = 'I' then ${stripTrailingHashesSql("'https://www.senat.fr/leg/' || rtrim(texte.texurl)")}
+      else ${stripTrailingHashesSql("rtrim(texte.texurl)")}
+    end
+  `;
 }
-const baseQueryTextes = dbSenat
-    .withSchema("dosleg")
-    .selectFrom("texte")
-    .leftJoin("oritxt", "oritxt.oritxtcod", "texte.oritxtcod")
-    .leftJoin("typtxt", "typtxt.typtxtcod", "texte.typtxtcod")
-    .orderBy(({ ref }) => orderOrdreOrigineTexte(ref("oritxt.oriordre")));
-const queryTextes = baseQueryTextes
-    .leftJoin("lecass", "lecass.lecassidt", "texte.lecassidt")
-    .leftJoin("lecture", "lecture.lecidt", "lecass.lecidt")
-    .leftJoin("loi", "loi.loicod", "lecture.loicod")
-    .select((args) => ["loi.signet as signet_dossier", ...selectTexteAttributes(args)]);
-export function textes(lectureAssembleeId) {
-    return jsonArrayFrom(baseQueryTextes.select(selectTexteAttributes).where("texte.lecassidt", "=", lectureAssembleeId));
+function baseRapportsSelect(includeSignetDossier) {
+    const signet = includeSignetDossier ? "loi.signet as signet_dossier," : "";
+    return `
+    select
+      ${signet}
+      rap.rapnum as numero,
+      raporg.orgcod as code_organisme,
+      ${rapportIdSql()} as id,
+      ${rapportUrlSql()} 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
+  `;
 }
-export function findAllTextes() {
-    return queryTextes.stream();
+function baseTextesSelect(includeSignetDossier) {
+    const signet = includeSignetDossier ? "loi.signet as signet_dossier," : "";
+    return `
+    select
+      ${signet}
+      texte.texnum as numero,
+      texte.orgcod as code_organisme,
+      ${texteIdSql()} as id,
+      ${texteUrlSql()} 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,
+      null::text as titre
+  `;
 }
-export function findAllRapports() {
-    return queryRapports.stream();
+function buildFindAllRapportsQuery() {
+    return {
+        params: [],
+        query: `
+      ${baseRapportsSelect(true)}
+      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
+      left join senat.dosleg_lecass as lecass on lecass.lecassidt = lecassrap.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
+    `,
+    };
+}
+function buildFindAllTextesQuery() {
+    return {
+        params: [],
+        query: `
+      ${baseTextesSelect(true)}
+      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
+      left join senat.dosleg_lecass as lecass on lecass.lecassidt = texte.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
+      order by array_position(array['0','2','1'], oritxt.oriordre)
+    `,
+    };
+}
+export async function* findAllTextes() {
+    const { query, params } = buildFindAllTextesQuery();
+    for await (const row of streamUnsafeQuery(query, params)) {
+        yield {
+            ...row,
+            auteurs: row.auteurs ?? [],
+        };
+    }
+}
+export async function* findAllRapports() {
+    const { query, params } = buildFindAllRapportsQuery();
+    for await (const row of streamUnsafeQuery(query, params)) {
+        yield {
+            ...row,
+            auteurs: row.auteurs ?? [],
+            documents_annexes: row.documents_annexes ?? [],
+        };
+    }
 }

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

@@ -1,7 +1,144 @@
-import { InferResult, SelectQueryBuilder } from "kysely";
-declare const findAllDossiersQuery: SelectQueryBuilder<any, any, any>;
-export declare function findAllDossiers(): AsyncIterableIterator<DossierLegislatifResult>;
+export interface DossierThemeRow {
+    libelle: string;
+}
+type DossierAuteurRow = {
+    matricule: string | null;
+    nom_usuel: string;
+    ordre: string | null;
+    prenom: string | null;
+    qualite: string | null;
+    role: string | null;
+};
+type DossierDocumentAnnexeRow = {
+    type_document: string;
+    url: string | null;
+};
+type DossierTexte = {
+    auteurs?: DossierAuteurRow[] | null;
+    code_adoption?: string | null;
+    code_organisme?: string | null;
+    date?: string | null;
+    id?: string | null;
+    modification?: string | null;
+    numero?: number | string | null;
+    ordre_origine?: string | null;
+    origine?: string | null;
+    session?: number | null;
+    titre?: string | null;
+    type?: string | null;
+    url?: string | null;
+};
+type DossierRapport = {
+    auteurs?: DossierAuteurRow[] | null;
+    code_organisme?: string | null;
+    date?: string | null;
+    documents_annexes?: DossierDocumentAnnexeRow[] | null;
+    id?: string | null;
+    numero?: number | string | null;
+    session?: number | null;
+    sous_titre?: string | null;
+    titre?: string | null;
+    type?: string | null;
+    url?: string | null;
+};
+type DossierDateSeance = {
+    date?: string | null;
+};
+type DossierLectureAssemblee = {
+    assemblee?: string | null;
+    code_organisme?: string | null;
+    date_publication_amendements_commission?: string | null;
+    date_publication_amendements_seance?: string | null;
+    dates_seances?: DossierDateSeance[] | null;
+    libelle_organisme?: string | null;
+    loi_intitule_modifie?: string | null;
+    numero_petite_loi?: number | null;
+    ordre_lecture_assemblee?: string | null;
+    origine_proposition?: string | null;
+    rapports?: DossierRapport[] | null;
+    session?: number | null;
+    textes?: DossierTexte[] | null;
+    url_cr_debats?: string | null;
+    url_petite_loi?: string | null;
+};
+type DossierLecture = {
+    lectures_assemblee?: DossierLectureAssemblee[] | null;
+    libelle?: string | null;
+    ordre_lecture?: number | string | null;
+    type_lecture?: string | null;
+};
+export interface DossierLegislatifResult {
+    code: string | null;
+    code_dossier_an: string | null;
+    code_nature_dossier: string | null;
+    code_organisme_resolution: string | null;
+    condition_saisine_CoC: string | null;
+    date_decision_CoC: string | null;
+    date_opposition_procedure_acceleree: string | null;
+    date_procedure_acceleree: string | null;
+    date_publication_JO: string | null;
+    date_publication_JO_correctif_1: string | null;
+    date_publication_JO_correctif_2: string | null;
+    date_promulgation: string | null;
+    date_retrait_procedure_acceleree: string | null;
+    date_saisine_CoC: string | null;
+    etat_dossier: string | null;
+    lectures: DossierLecture[];
+    libelle_decision_CoC: string | null;
+    libelle_type_dossier: string | null;
+    mot_cle: string | null;
+    num_decision_CoC: string | null;
+    numero: string | null;
+    numero_JO: string | null;
+    numero_JO_correctif_1: string | null;
+    numero_JO_correctif_2: string | null;
+    signet: string;
+    signet_alternatif: string | null;
+    themes: DossierThemeRow[];
+    titre: string | null;
+    titre_JO: string;
+    titre_court: string | null;
+    titre_long: string | null;
+    titre_long_original: string | null;
+    urgence: string | null;
+    url: string;
+    url_JO: string | null;
+    url_JO_correctif_1: string | null;
+    url_JO_correctif_2: string | null;
+    url_decision_CoC: string | null;
+    url_dossier_assemblee_nationale: string | null;
+    url_dossier_CoC: string | null;
+    url_ordonnance: string | null;
+    url_presentation_articles: string | null;
+}
+export type DossierWithLectures = DossierLegislatifResult & {
+    actes_legislatifs?: ActeLegislatif[] | null;
+    lectures?: DossierLecture[] | null;
+    numero_JO?: string | number | null;
+    signet: string;
+    themes?: DossierThemeRow[] | null;
+    url_JO?: string | null;
+    url_decision_CoC?: string | null;
+    url_dossier_CoC?: string | null;
+};
+export type ActeLegislatif = {
+    adoption?: string;
+    chambre: "AN" | "SN";
+    code_acte: string;
+    code_organisme: string | null;
+    date: string;
+    date_publication_JO?: string | null;
+    id?: string | null;
+    libelle: string;
+    numero?: string | number | null;
+    numero_JO?: string | number | null;
+    session?: number | null;
+    signet_dossier: string;
+    texte_url?: string | null;
+    uid: string;
+    url_legifrance?: string | null;
+};
+export declare function findAllDossiers(): AsyncGenerator<DossierLegislatifResult, void, unknown>;
 export declare function getCodeActeLecture(codeNatureDossier: string, typeLecture: string, assemblee: string): string | null;
-export type DossierLegislatifResult = InferResult<typeof findAllDossiersQuery>[0];
-export declare function buildActesLegislatifs(dossier: any): any[];
+export declare function buildActesLegislatifs(dossier: DossierWithLectures): ActeLegislatif[];
 export {};