@tricoteuses/senat 2.10.5 → 2.11.0

package/lib/model/ameli.js

@@ -1,128 +1,135 @@
 import { jsonArrayFrom } from "kysely/helpers/postgres";
-import { dbAmeli } from "../databases";
+import { dbSenat } from "../databases";
 import { concat, toDateString } from "./util";
 function auteurs(amendementId) {
-    return jsonArrayFrom(dbAmeli
-        .selectFrom("amdsen")
-        .leftJoin("sen_ameli", "amdsen.senid", "sen_ameli.entid")
-        .leftJoin("grppol_ameli", "amdsen.grpid", "grppol_ameli.entid")
-        .where("amdsen.amdid", "=", 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([
-        "amdsen.prenomuse as prenom",
-        "amdsen.hom as homonyme",
-        "amdsen.nomuse as nom",
-        "amdsen.qua as qualite",
-        "amdsen.rng 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",
+        "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("amdsen.rng asc"));
+        .orderBy("ameli.amdsen.rng asc"));
 }
-const findAllQuery = dbAmeli
-    .selectFrom("amd")
-    .leftJoin("sub", "amd.subid", "sub.id")
-    .leftJoin("typsub", "sub.typid", "typsub.id")
-    .leftJoin("typrect", "amd.typrectid", "typrect.id")
-    .leftJoin("txt_ameli", "amd.txtid", "txt_ameli.id")
-    .leftJoin("etatxt", "txt_ameli.txtetaid", "etatxt.id")
-    .leftJoin("ses", "txt_ameli.sesdepid", "ses.id")
-    .leftJoin("typses", "typses.id", "ses.typid")
-    .leftJoin("nat", "txt_ameli.natid", "nat.id")
-    .leftJoin("lec_ameli", "txt_ameli.lecid", "lec_ameli.id")
-    .leftJoin("mot", "amd.motid", "mot.id")
-    .leftJoin("avicom", "amd.avcid", "avicom.id")
-    .leftJoin("avigvt", "amd.avgid", "avigvt.id")
-    .leftJoin("sor", "amd.sorid", "sor.id")
-    .leftJoin("irr", "amd.irrid", "irr.id")
-    .leftJoin("grppol_ameli", "amd.nomentid", "grppol_ameli.entid")
-    .leftJoin("com_ameli", "amd.nomentid", "com_ameli.entid")
-    .leftJoin("cab", "amd.nomentid", "cab.entid")
+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("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")
+    .leftJoin("dosleg.amescr", "ameli.amd.num", "dosleg.amescr.amescrnum")
     .select(({ eb, ref, val }) => [
-    "ses.ann 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",
+    "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("amd.typ", "=", "A")
+        .when("ameli.amd.typ", "=", "A")
         .then(val("Amendement"))
-        .when("amd.typ", "=", "M")
+        .when("ameli.amd.typ", "=", "M")
         .then(val("Motion"))
-        .when("amd.typ", "=", "S")
+        .when("ameli.amd.typ", "=", "S")
         .then(val("Sous-amendement"))
         .else("")
         .end()
         .as("nature"),
-    "amd.id as id",
-    "amd.amdperid as parent_id",
-    "amd.amdrendusim as rendu_similaire_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",
-    "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 as alinea",
-    "amd.commentprobleme as commentaire_probleme",
-    "amd.obs as observations",
-    "amd.mot as observations_additionnelles",
-    toDateString(ref("amd.datdep")).as("date_depot"),
-    "amd.dis as dispositif",
-    "amd.obj as objet",
-    "typrect.lib as type_rectification",
-    "mot.lib as motion_libelle",
+    "ameli.amd.id as id",
+    "ameli.amd.amdperid as parent_id",
+    "ameli.amd.amdrendusim as rendu_similaire_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",
+    "dosleg.amescr.scrnum as scrutin_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.commentprobleme as commentaire_probleme",
+    "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("amd.etaid", "=", 7)
+        .when("ameli.amd.etaid", "=", 7)
         .then(val("Diffusé"))
-        .when("amd.etaid", "=", 8)
+        .when("ameli.amd.etaid", "=", 8)
         .then(val("Retiré avant réunion ou séance"))
-        .when("amd.etaid", "=", 9)
+        .when("ameli.amd.etaid", "=", 9)
         .then(val("Examiné en commission ou séance"))
-        .when("amd.etaid", "=", 10)
+        .when("ameli.amd.etaid", "=", 10)
         .then(val("Irrecevable"))
-        .when("amd.etaid", "=", 11)
+        .when("ameli.amd.etaid", "=", 11)
         .then(val("Irrecevable"))
         .else("")
         .end()
         .as("etat"),
-    "avicom.lib as avis_commission",
-    "avigvt.lib as avis_gouvernement",
-    eb.fn.coalesce("sor.lib", "irr.libirr").as("sort"),
-    "amd.rev as revision",
-    concat(val("https://www.senat.fr/amendements/"), ref("ses.lil"), val("/"), ref("txt_ameli.numabs"), val("/Amdt_"), ref("amd.numabs"), val(".html")).as("url"),
-    "grppol_ameli.lilcou as au_nom_de_groupe_politique",
-    "com_ameli.lil as au_nom_de_commission",
+    "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(val("https://www.senat.fr/amendements/"), ref("ameli.ses.lil"), val("/"), ref("ameli.txt_ameli.numabs"), val("/Amdt_"), ref("ameli.amd.numabs"), val(".html")).as("url"),
+    "ameli.grppol_ameli.lilcou as au_nom_de_groupe_politique",
+    "ameli.com_ameli.lil as au_nom_de_commission",
     eb
         .case()
-        .when("cab.entid", "is not", null)
+        .when("ameli.cab.entid", "is not", null)
         .then(true)
         .else(false)
         .end()
         .as("auteur_est_gouvernement"),
-    auteurs(ref("amd.id")).as("auteurs"),
+    auteurs(ref("ameli.amd.id")).as("auteurs")
 ]);
-export function findAll() {
-    return findAllQuery.stream();
+export function findAllAmendements(fromSession) {
+    if (fromSession !== undefined) {
+        return findAllAmendementsQuery
+            .where("ameli.ses.ann", ">=", fromSession)
+            .stream();
+    }
+    return findAllAmendementsQuery.stream();
 }

package/lib/model/debats.d.ts

@@ -1,81 +1,43 @@
 import { InferResult } from "kysely";
 export type DebatResult = InferResult<typeof findAllQuery>[0];
-declare const findAllQuery: import("kysely").SelectQueryBuilder<import("../databases").SenatDb, "debats", {
+declare const findAllQuery: import("kysely").SelectQueryBuilder<any, "debats", {
+    [x: string]: any;
     id: string;
     date_seance: string;
-    numero: number | null;
-    url: string | null;
-    etat_synchronisation: string | null;
     sections: {
-        id: number | null;
-        numero: string | null;
-        objet: string | null;
-        url: string | null;
-        type: string | null;
-        categorie: string | null;
+        [x: string]: any;
         interventions: {
-            id: number | null;
-            auteur_code: string;
-            fonction_intervenant: string | null;
-            url: string | null;
-            analyse: string | null;
+            [x: string]: any;
         }[];
-        lecture_id: string;
     }[];
     sections_divers: {
-        type: string | null;
-        categorie: string | null;
-        libelle: string | null;
-        objet: string | null;
+        [x: string]: any;
         interventions: {
-            id: number | null;
-            auteur_code: string;
-            fonction_intervenant: string | null;
-            url: string | null;
-            analyse: string | null;
+            [x: string]: any;
         }[];
     }[];
     lectures: {
-        id: string;
+        id: any;
     }[];
 }>;
 export declare function findAll(): AsyncIterableIterator<{
+    [x: string]: any;
     id: string;
     date_seance: string;
-    numero: number | null;
-    url: string | null;
-    etat_synchronisation: string | null;
     sections: {
-        id: number | null;
-        numero: string | null;
-        objet: string | null;
-        url: string | null;
-        type: string | null;
-        categorie: string | null;
+        [x: string]: any;
         interventions: {
-            id: number | null;
-            auteur_code: string;
-            fonction_intervenant: string | null;
-            url: string | null;
-            analyse: string | null;
+            [x: string]: any;
         }[];
-        lecture_id: string;
     }[];
     sections_divers: {
-        type: string | null;
-        categorie: string | null;
-        libelle: string | null;
-        objet: string | null;
+        [x: string]: any;
         interventions: {
-            id: number | null;
-            auteur_code: string;
-            fonction_intervenant: string | null;
-            url: string | null;
-            analyse: string | null;
+            [x: string]: any;
         }[];
     }[];
     lectures: {
-        id: string;
+        id: any;
     }[];
 }>;
 export {};

package/lib/model/documents.d.ts

@@ -0,0 +1,2 @@
+export declare function findSenatTexteUrls(sessions?: number[]): any;
+export declare function findSenatRapportUrls(sessions?: number[]): any;

package/lib/model/documents.js

@@ -0,0 +1,37 @@
+import { dbSenat } from "../databases";
+import { rtrim } from "./util";
+export function findSenatTexteUrls(sessions = []) {
+    return dbSenat
+        .withSchema("dosleg")
+        .selectFrom("texte")
+        .where("texurl", "is not", null)
+        .where("typurl", "=", "I")
+        .$if(sessions.length > 0, (qb) => qb.where("sesann", "in", sessions))
+        .select(({ eb, ref }) => [
+        "sesann as session",
+        rtrim(ref("texurl")).as("url"),
+        eb
+            .case()
+            .when("oritxtcod", "=", "1")
+            .then(true)
+            .else(false)
+            .end()
+            .as("hasExposeDesMotifs"),
+    ])
+        .$narrowType()
+        .stream();
+}
+export function findSenatRapportUrls(sessions = []) {
+    return dbSenat
+        .withSchema("dosleg")
+        .selectFrom("rap")
+        .where("rapurl", "is not", null)
+        .where("typurl", "=", "I")
+        .$if(sessions.length > 0, (qb) => qb.where("sesann", "in", sessions))
+        .select(({ ref }) => [
+        "sesann as session",
+        rtrim(ref("rapurl")).as("url"),
+    ])
+        .$narrowType()
+        .stream();
+}

package/lib/model/dosleg.d.ts

@@ -1,113 +1,18 @@
 import { InferResult, SelectQueryBuilder } from "kysely";
 declare const findAllDossiersQuery: SelectQueryBuilder<any, any, any>;
 export declare function findAllDossiers(): AsyncIterableIterator<DossierLegislatifResult>;
-export declare function findAllScrutins(): AsyncIterableIterator<{
-    numero: number;
-    votes: {
-        matricule_votant: string;
-        matricule_delegant: string | null;
-        position: string | null;
-        statut_votant: string | null;
-        titre_votant: string | null;
-    }[];
-    session: number;
-    date_scrutin: string;
-    date_scrutin_effective: string;
-    lecture_id: string | null;
-    intitule: string | null;
-    note: string | null;
-    nombre_majorite: number | null;
-    nombre_majorite_seance: number | null;
-    nombre_votants: number | null;
-    nombre_votants_seance: number | null;
-    nombre_suffrages: number | null;
-    nombre_suffrages_seance: number | null;
-    nombre_contre: number | null;
-    nombre_contre_seance: number | null;
-    nombre_pour: number | null;
-    nombre_pour_seance: number | null;
-}>;
-export declare function findSenatTexteUrls(sessions?: number[]): AsyncIterableIterator<{
-    session: number | null | undefined;
-    url: string;
-    hasExposeDesMotifs: boolean;
-}>;
-export declare function findSenatRapportUrls(sessions?: number[]): AsyncIterableIterator<{
-    url: string;
-    session: number | null | undefined;
-}>;
-declare const findAuteursQuery: SelectQueryBuilder<{
-    amescr: import("../raw_types/dosleg").Amescr;
-    ass: import("../raw_types/dosleg").Ass;
-    aud: import("../raw_types/dosleg").Aud;
-    auteur: import("../raw_types/dosleg").Auteur;
-    ble: import("../raw_types/dosleg").Ble;
-    catrap: import("../raw_types/dosleg").Catrap;
-    corscr: import("../raw_types/dosleg").Corscr;
-    date_seance: import("../raw_types/dosleg").DateSeance;
-    deccoc: import("../raw_types/dosleg").Deccoc;
-    denrap: import("../raw_types/dosleg").Denrap;
-    doc: import("../raw_types/dosleg").Doc;
-    docatt: import("../raw_types/dosleg").Docatt;
-    docsea: import("../raw_types/dosleg").Docsea;
-    ecr: import("../raw_types/dosleg").Ecr;
-    etaloi: import("../raw_types/dosleg").Etaloi;
-    evtsea: import("../raw_types/dosleg").Evtsea;
-    forpub: import("../raw_types/dosleg").Forpub;
-    gen: import("../raw_types/dosleg").Gen;
-    lecass: import("../raw_types/dosleg").Lecass;
-    lecassrap: import("../raw_types/dosleg").Lecassrap;
-    lecture: import("../raw_types/dosleg").Lecture;
-    lnkrap: import("../raw_types/dosleg").Lnkrap;
-    loi: import("../raw_types/dosleg").Loi;
-    loithe: import("../raw_types/dosleg").Loithe;
-    natloi: import("../raw_types/dosleg").Natloi;
-    org: import("../raw_types/dosleg").Org;
-    orgnomhis: import("../raw_types/dosleg").Orgnomhis;
-    orippr: import("../raw_types/dosleg").Orippr;
-    oritxt: import("../raw_types/dosleg").Oritxt;
-    posvot: import("../raw_types/dosleg").Posvot;
-    qua: import("../raw_types/dosleg").Qua;
-    rap: import("../raw_types/dosleg").Rap;
-    raporg: import("../raw_types/dosleg").Raporg;
-    rapthe: import("../raw_types/dosleg").Rapthe;
-    rolsig: import("../raw_types/dosleg").Rolsig;
-    scr: import("../raw_types/dosleg").Scr;
-    ses: import("../raw_types/dosleg").Ses;
-    stavot: import("../raw_types/dosleg").Stavot;
-    texte: import("../raw_types/dosleg").Texte;
-    texte_ancien: import("../raw_types/dosleg").TexteAncien;
-    the: import("../raw_types/dosleg").The;
-    titsen: import("../raw_types/dosleg").Titsen;
-    typatt: import("../raw_types/dosleg").Typatt;
-    typaut: import("../raw_types/dosleg").Typaut;
-    typdoc: import("../raw_types/dosleg").Typdoc;
-    typevtsea: import("../raw_types/dosleg").Typevtsea;
-    typlec: import("../raw_types/dosleg").Typlec;
-    typloi: import("../raw_types/dosleg").Typloi;
-    typorg: import("../raw_types/dosleg").Typorg;
-    typrap: import("../raw_types/dosleg").Typrap;
-    typtxt: import("../raw_types/dosleg").Typtxt;
-    typurl: import("../raw_types/dosleg").Typurl;
-    votsen: import("../raw_types/dosleg").Votsen;
-}, "auteur", {
-    code: string;
-    nom: string;
-    prenom: string | null;
-    matricule: string | null;
+declare const findAuteursQuery: SelectQueryBuilder<any, "dosleg.auteur", {
+    code: any;
+    nom: any;
+    prenom: any;
+    matricule: any;
 }>;
 export declare function findAuteurs(): Promise<{
-    code: string;
-    nom: string;
-    prenom: string | null;
-    matricule: string | null;
+    code: any;
+    nom: any;
+    prenom: any;
+    matricule: any;
 }[]>;
-export declare function findAuteur(auteurCode: string): Promise<{
-    code: string;
-    nom: string;
-    prenom: string | null;
-    matricule: string | null;
-} | undefined>;
 export type DossierLegislatifResult = InferResult<typeof findAllDossiersQuery>[0];
 export type AuteurResult = InferResult<typeof findAuteursQuery>[0];
 export {};