@tricoteuses/senat 1.1.2 → 1.3.1

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

@@ -0,0 +1,197 @@
+import { InferResult } from "kysely";
+declare const findAllQuery: import("kysely").SelectQueryBuilder<{
+    ble: import("../raw_types_kysely/dosleg").Ble;
+    ass: import("../raw_types_kysely/dosleg").Ass;
+    aud: import("../raw_types_kysely/dosleg").Aud;
+    org: import("../raw_types_kysely/dosleg").Org;
+    auteur: import("../raw_types_kysely/dosleg").Auteur;
+    qua: import("../raw_types_kysely/dosleg").Qua;
+    date_seance: import("../raw_types_kysely/dosleg").DateSeance;
+    deccoc: import("../raw_types_kysely/dosleg").Deccoc;
+    denrap: import("../raw_types_kysely/dosleg").Denrap;
+    docatt: import("../raw_types_kysely/dosleg").Docatt;
+    rap: import("../raw_types_kysely/dosleg").Rap;
+    typatt: import("../raw_types_kysely/dosleg").Typatt;
+    ecr: import("../raw_types_kysely/dosleg").Ecr;
+    etaloi: import("kysely").Nullable<import("../raw_types_kysely/dosleg").Etaloi>;
+    lecass: import("../raw_types_kysely/dosleg").Lecass;
+    lecassrap: import("../raw_types_kysely/dosleg").Lecassrap;
+    lecture: import("../raw_types_kysely/dosleg").Lecture;
+    typlec: import("../raw_types_kysely/dosleg").Typlec;
+    loi: import("../raw_types_kysely/dosleg").Loi;
+    typloi: import("kysely").Nullable<import("../raw_types_kysely/dosleg").Typloi>;
+    oritxt: import("../raw_types_kysely/dosleg").Oritxt;
+    scr: import("../raw_types_kysely/dosleg").Scr;
+    ses: import("../raw_types_kysely/dosleg").Ses;
+    texte: import("../raw_types_kysely/dosleg").Texte;
+    typtxt: import("../raw_types_kysely/dosleg").Typtxt;
+    typurl: import("../raw_types_kysely/dosleg").Typurl;
+    amescr: import("../raw_types_kysely/dosleg").Amescr;
+    bur: import("../raw_types_kysely/dosleg").Bur;
+    catrap: import("../raw_types_kysely/dosleg").Catrap;
+    com: import("../raw_types_kysely/dosleg").Com;
+    corscr: import("../raw_types_kysely/dosleg").Corscr;
+    delega: import("../raw_types_kysely/dosleg").Delega;
+    designorg: import("../raw_types_kysely/dosleg").Designorg;
+    doc: import("../raw_types_kysely/dosleg").Doc;
+    docsea: import("../raw_types_kysely/dosleg").Docsea;
+    dpt: import("../raw_types_kysely/dosleg").Dpt;
+    dptele: import("../raw_types_kysely/dosleg").Dptele;
+    elusen: import("../raw_types_kysely/dosleg").Elusen;
+    etadebman: import("../raw_types_kysely/dosleg").Etadebman;
+    etafinman: import("../raw_types_kysely/dosleg").Etafinman;
+    etasen: import("../raw_types_kysely/dosleg").Etasen;
+    evtsea: import("../raw_types_kysely/dosleg").Evtsea;
+    foncom: import("../raw_types_kysely/dosleg").Foncom;
+    fondelega: import("../raw_types_kysely/dosleg").Fondelega;
+    fongrppol: import("../raw_types_kysely/dosleg").Fongrppol;
+    fonmemcom: import("../raw_types_kysely/dosleg").Fonmemcom;
+    fonmemdelega: import("../raw_types_kysely/dosleg").Fonmemdelega;
+    fonmemgrppol: import("../raw_types_kysely/dosleg").Fonmemgrppol;
+    forpub: import("../raw_types_kysely/dosleg").Forpub;
+    gen: import("../raw_types_kysely/dosleg").Gen;
+    grppol: import("../raw_types_kysely/dosleg").Grppol;
+    libcom: import("../raw_types_kysely/dosleg").Libcom;
+    libdelega: import("../raw_types_kysely/dosleg").Libdelega;
+    libgrppol: import("../raw_types_kysely/dosleg").Libgrppol;
+    lnkrap: import("../raw_types_kysely/dosleg").Lnkrap;
+    loithe: import("../raw_types_kysely/dosleg").Loithe;
+    memcom: import("../raw_types_kysely/dosleg").Memcom;
+    memdelega: import("../raw_types_kysely/dosleg").Memdelega;
+    memgrppol: import("../raw_types_kysely/dosleg").Memgrppol;
+    natloi: import("../raw_types_kysely/dosleg").Natloi;
+    orgnomhis: import("../raw_types_kysely/dosleg").Orgnomhis;
+    orippr: import("../raw_types_kysely/dosleg").Orippr;
+    posvot: import("../raw_types_kysely/dosleg").Posvot;
+    qua_sen: import("../raw_types_kysely/dosleg").QuaSen;
+    raporg: import("../raw_types_kysely/dosleg").Raporg;
+    rapthe: import("../raw_types_kysely/dosleg").Rapthe;
+    rolsig: import("../raw_types_kysely/dosleg").Rolsig;
+    sen: import("../raw_types_kysely/dosleg").Sen;
+    senbur: import("../raw_types_kysely/dosleg").Senbur;
+    sennom: import("../raw_types_kysely/dosleg").Sennom;
+    stavot: import("../raw_types_kysely/dosleg").Stavot;
+    texte_ancien: import("../raw_types_kysely/dosleg").TexteAncien;
+    the: import("../raw_types_kysely/dosleg").The;
+    titsen: import("../raw_types_kysely/dosleg").Titsen;
+    typapppol: import("../raw_types_kysely/dosleg").Typapppol;
+    typaut: import("../raw_types_kysely/dosleg").Typaut;
+    typdoc: import("../raw_types_kysely/dosleg").Typdoc;
+    typevtsea: import("../raw_types_kysely/dosleg").Typevtsea;
+    typorg: import("../raw_types_kysely/dosleg").Typorg;
+    typorg_sen: import("../raw_types_kysely/dosleg").TyporgSen;
+    typrap: import("../raw_types_kysely/dosleg").Typrap;
+    votsen: import("../raw_types_kysely/dosleg").Votsen;
+}, "etaloi" | "loi" | "typloi", {
+    url: string;
+    signet: string;
+    titre: string;
+    type_dossier: string;
+    etat_dossier: string;
+    lectures: {
+        type_lecture: string;
+        libelle: string;
+        lectures_assemblee: {
+            assemblee: string;
+            libelle_organisme: string | null;
+            textes: {
+                url: string;
+                auteurs: {
+                    prenom: string | null;
+                    nom_usuel: string;
+                    matricule: string | null;
+                }[];
+                numero: string | null;
+                origine_texte: string;
+                type_texte: string;
+                date: Date;
+                session: string | null;
+            }[];
+            rapports: {
+                numero: string | null;
+                type_rapport: string;
+                url: string;
+                date_depot: Date;
+                auteurs: {
+                    prenom: string | null;
+                    nom_usuel: string;
+                    matricule: string | null;
+                }[];
+                organismes: {
+                    libelle: string;
+                }[];
+            }[];
+            dates_seances: {
+                date: Date | null;
+            }[];
+        }[];
+    }[];
+    themes: {
+        libelle: string;
+    }[];
+    url_dossier_assemblee_nationale: string | null;
+    date_promulgation: Date | null;
+    numero_loi: string | null;
+}>;
+export declare function findAll(): AsyncIterableIterator<{
+    url: string;
+    signet: string;
+    titre: string;
+    type_dossier: string;
+    etat_dossier: string;
+    lectures: {
+        type_lecture: string;
+        libelle: string;
+        lectures_assemblee: {
+            assemblee: string;
+            libelle_organisme: string | null;
+            textes: {
+                url: string;
+                auteurs: {
+                    prenom: string | null;
+                    nom_usuel: string;
+                    matricule: string | null;
+                }[];
+                numero: string | null;
+                origine_texte: string;
+                type_texte: string;
+                date: Date;
+                session: string | null;
+            }[];
+            rapports: {
+                numero: string | null;
+                type_rapport: string;
+                url: string;
+                date_depot: Date;
+                auteurs: {
+                    prenom: string | null;
+                    nom_usuel: string;
+                    matricule: string | null;
+                }[];
+                organismes: {
+                    libelle: string;
+                }[];
+            }[];
+            dates_seances: {
+                date: Date | null;
+            }[];
+        }[];
+    }[];
+    themes: {
+        libelle: string;
+    }[];
+    url_dossier_assemblee_nationale: string | null;
+    date_promulgation: Date | null;
+    numero_loi: string | null;
+}>;
+export declare function findSenatTexteUrls(sessions?: string[]): AsyncIterableIterator<{
+    session: string | null | undefined;
+    url: string;
+    hasExposeDesMotifs: boolean;
+}>;
+export declare function findSenatRapportUrls(sessions?: string[]): AsyncIterableIterator<{
+    url: string;
+    session: string | null | undefined;
+}>;
+export type DossierLegislatifResult = InferResult<typeof findAllQuery>[0];
+export {};

package/lib/src/model/dosleg.js

@@ -0,0 +1,169 @@
+import { sql } from "kysely";
+import { dbDosleg } from "../databases";
+import { jsonArrayFrom } from "kysely/helpers/postgres";
+function datesSeances(lectureAssembleeId) {
+    return jsonArrayFrom(dbDosleg.selectFrom("date_seance")
+        .where("date_seance.lecidt", "=", lectureAssembleeId)
+        .select([
+        "date_seance.date_s as date",
+    ]));
+}
+function organismesRapport(rapportId) {
+    return jsonArrayFrom(dbDosleg.selectFrom("org")
+        .leftJoin("raporg", "raporg.orgcod", "org.orgcod")
+        .where("raporg.rapcod", "=", rapportId)
+        .select([
+        "org.orgnom as libelle",
+    ]));
+}
+function auteursRapport(rapportId) {
+    return jsonArrayFrom(dbDosleg.selectFrom("auteur")
+        .leftJoin("ecr", "ecr.autcod", "auteur.autcod")
+        .where("ecr.rapcod", "=", rapportId)
+        .select([
+        "auteur.prenom as prenom",
+        "auteur.nomuse as nom_usuel",
+        "auteur.autmat as matricule",
+    ])
+        .orderBy("ecr.ecrnumtri", "asc"));
+}
+function rapports(lectureAssembleeId) {
+    return jsonArrayFrom(dbDosleg.selectFrom("rap")
+        .leftJoin("lecassrap", "lecassrap.rapcod", "rap.rapcod")
+        .leftJoin("denrap", "denrap.coddenrap", "rap.coddenrap")
+        .where("lecassrap.lecassidt", "=", lectureAssembleeId)
+        .select((eb) => [
+        "rap.rapnum as numero",
+        sql `rtrim(denrap.libdenrap)`.as("type_rapport"),
+        eb.case()
+            .when("rap.typurl", "=", "I")
+            .then(sql `concat('https://www.senat.fr/rap/', rtrim(rap.rapurl))`)
+            .else(sql `rtrim(rap.rapurl)`)
+            .end()
+            .as("url"),
+        "rap.date_depot as date_depot",
+        auteursRapport(eb.ref("rap.rapcod")).as("auteurs"),
+        organismesRapport(eb.ref("rap.rapcod")).as("organismes"),
+    ]));
+}
+function auteursTextes(texteId) {
+    return jsonArrayFrom(dbDosleg.selectFrom("auteur")
+        .leftJoin("ecr", "ecr.autcod", "auteur.autcod")
+        .where("ecr.texcod", "=", texteId)
+        .select([
+        "auteur.prenom as prenom",
+        "auteur.nomuse as nom_usuel",
+        "auteur.autmat as matricule",
+    ])
+        .orderBy("ecr.ecrnumtri", "asc"));
+}
+function textes(lectureAssembleeId) {
+    return jsonArrayFrom(dbDosleg.selectFrom("texte")
+        .leftJoin("oritxt", "oritxt.oritxtcod", "texte.oritxtcod")
+        .leftJoin("typtxt", "typtxt.typtxtcod", "texte.typtxtcod")
+        .where("texte.lecassidt", "=", lectureAssembleeId)
+        .select((eb) => [
+        "texte.texnum as numero",
+        eb.case()
+            .when("texte.typurl", "=", "I")
+            .then(sql `concat('https://www.senat.fr/leg/', rtrim(texte.texurl))`)
+            .else(sql `rtrim(texte.texurl)`)
+            .end()
+            .as("url"),
+        sql `rtrim(oritxt.oritxtlib)`.as("origine_texte"),
+        sql `rtrim(typtxt.typtxtlib)`.as("type_texte"),
+        "texte.txtoritxtdat as date",
+        "sesann as session",
+        auteursTextes(eb.ref("texte.texcod")).as("auteurs"),
+    ])
+        .orderBy(sql `array_position(array['0','2','1'], oritxt.oriordre)`));
+}
+function lecturesAssemblee(lectureId) {
+    return jsonArrayFrom(dbDosleg.selectFrom("lecass")
+        .where("lecass.lecidt", "=", lectureId)
+        .leftJoin("ass", "ass.codass", "lecass.codass")
+        .leftJoin("org", "org.orgcod", "lecass.orgcod")
+        .select(({ ref }) => [
+        sql `rtrim(ass.libass)`.as("assemblee"),
+        "org.orgnom as libelle_organisme",
+        textes(ref("lecass.lecassidt")).as("textes"),
+        rapports(ref("lecass.lecassidt")).as("rapports"),
+        datesSeances(ref("lecass.lecassidt")).as("dates_seances"),
+    ])
+        .orderBy("lecass.ordreass", "asc"));
+}
+function lectures(loiId) {
+    return jsonArrayFrom(dbDosleg.selectFrom("lecture")
+        .leftJoin("typlec", "typlec.typleccod", "lecture.typleccod")
+        .where("lecture.loicod", "=", loiId)
+        .select(({ ref }) => [
+        sql `rtrim(typlec.typleclib)`.as("type_lecture"),
+        sql `rtrim(lecture.leccom)`.as("libelle"),
+        lecturesAssemblee(ref("lecture.lecidt")).as("lectures_assemblee"),
+    ])
+        .orderBy("typlec.typlecord", "asc"));
+}
+function themes(loiId) {
+    return jsonArrayFrom(dbDosleg.selectFrom("the")
+        .leftJoin("loithe", "loithe.thecle", "the.thecle")
+        .where("loithe.loicod", "=", loiId)
+        .select([
+        "the.thelib as libelle",
+    ]));
+}
+const findAllQuery = dbDosleg
+    .selectFrom("loi")
+    .leftJoin("typloi", "typloi.typloicod", "loi.typloicod")
+    .leftJoin("etaloi", "etaloi.etaloicod", "loi.etaloicod")
+    .select(({ ref }) => [
+    "loi.signet as signet",
+    sql `concat('https://www.senat.fr/dossier-legislatif/', loi.signet, '.html')`.as("url"),
+    sql `concat(rtrim(typloi.typloilib), ' ', rtrim(loi.loitit))`.as("titre"),
+    sql `rtrim(typloi.typloilib)`.as("type_dossier"),
+    sql `rtrim(etaloi.etaloilib)`.as("etat_dossier"),
+    "loi.url_an as url_dossier_assemblee_nationale",
+    //" as decision_conseil_constitutionnel", // TODO
+    //" as date_decision_conseil_constitutionnel", // TODO
+    "loi.date_loi as date_promulgation",
+    "loi.numero as numero_loi",
+    lectures(ref("loi.loicod")).as("lectures"),
+    themes(ref("loi.loicod")).as("themes"),
+])
+    .$narrowType();
+export function findAll() {
+    return findAllQuery.stream();
+}
+export function findSenatTexteUrls(sessions = []) {
+    return dbDosleg
+        .selectFrom("texte")
+        .where("texurl", "is not", null)
+        .where("typurl", "=", "I")
+        .$if(sessions.length > 0, (qb) => qb
+        .where("sesann", "in", sessions))
+        .select((eb) => [
+        "sesann as session",
+        sql `rtrim(texurl)`.as("url"),
+        eb.case()
+            .when("oritxtcod", "=", "1")
+            .then(true)
+            .else(false)
+            .end()
+            .as("hasExposeDesMotifs"),
+    ])
+        .$narrowType()
+        .stream();
+}
+export function findSenatRapportUrls(sessions = []) {
+    return dbDosleg
+        .selectFrom("rap")
+        .where("rapurl", "is not", null)
+        .where("typurl", "=", "I")
+        .$if(sessions.length > 0, (qb) => qb
+        .where("sesann", "in", sessions))
+        .select([
+        sql `rtrim(rapurl)`.as("url"),
+        "sesann as session",
+    ])
+        .$narrowType()
+        .stream();
+}

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

@@ -0,0 +1,4 @@
+export { findAll as findAllLois, } from "./dosleg";
+export { findAll as findAllQuestions, getDbSchema as getQuestionsDbSchema, } from "./questions";
+export { findAll as findAllSens, findAllCirconscriptions, getDbSchema as getSensDbSchema, } from "./sens";
+export { allFollows, Aggregator } from "../aggregates";

package/lib/src/model/index.js

@@ -0,0 +1,4 @@
+export { findAll as findAllLois, } from "./dosleg";
+export { findAll as findAllQuestions, getDbSchema as getQuestionsDbSchema, } from "./questions";
+export { findAll as findAllSens, findAllCirconscriptions, getDbSchema as getSensDbSchema, } from "./sens";
+export { allFollows, Aggregator } from "../aggregates";

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

@@ -0,0 +1,89 @@
+import { InferResult } from "kysely";
+declare const findAllQuery: import("kysely").SelectQueryBuilder<{
+    tam_questions: import("../raw_types_kysely/questions").TamQuestions;
+    the: import("../raw_types_kysely/questions").The;
+    tam_reponses: import("../raw_types_kysely/questions").TamReponses;
+    etatquestion: import("kysely").Nullable<import("../raw_types_kysely/questions").Etatquestion>;
+    legquestion: import("../raw_types_kysely/questions").Legquestion;
+    naturequestion: import("kysely").Nullable<import("../raw_types_kysely/questions").Naturequestion>;
+    sortquestion: import("kysely").Nullable<import("../raw_types_kysely/questions").Sortquestion>;
+    tam_ministeres: import("kysely").Nullable<import("../raw_types_kysely/questions").TamMinisteres>;
+}, "tam_questions" | "etatquestion" | "naturequestion" | "sortquestion" | "tam_ministeres", {
+    republique: string | null;
+    legislature: string | null;
+    sort: string | null;
+    nature: string | null;
+    numero: string | null;
+    reference: string | null;
+    titre: string | null;
+    nom: string | null;
+    prenom: string | null;
+    civilite: string | null;
+    matricule: string;
+    circonscription: string | null;
+    groupe: string | null;
+    type_appartenance: string | null;
+    date_publication_JO: Date | null;
+    ministere_depot: string | null;
+    ministere_depot_date_debut: Date | null;
+    date_transmission: Date | null;
+    ministere_transmission: string | null;
+    date_reponse_JO: Date | null;
+    ministere_reponse: string | null;
+    date_cloture: Date | null;
+    reference_question_rappelee: string | null;
+    texte: string | null;
+    texte_erratum: string | null;
+    rubrique: string | null;
+} & {
+    themes: {
+        libelle: string;
+    }[];
+    reponses: {
+        date_reponse_JO: Date | null;
+        ministere_reponse: string | null;
+        texte: string | null;
+        texte_erratum: string | null;
+    }[];
+}>;
+export type QuestionResult = InferResult<typeof findAllQuery>[0];
+export declare function findAll(): AsyncIterableIterator<{
+    republique: string | null;
+    legislature: string | null;
+    sort: string | null;
+    nature: string | null;
+    numero: string | null;
+    reference: string | null;
+    titre: string | null;
+    nom: string | null;
+    prenom: string | null;
+    civilite: string | null;
+    matricule: string;
+    circonscription: string | null;
+    groupe: string | null;
+    type_appartenance: string | null;
+    date_publication_JO: Date | null;
+    ministere_depot: string | null;
+    ministere_depot_date_debut: Date | null;
+    date_transmission: Date | null;
+    ministere_transmission: string | null;
+    date_reponse_JO: Date | null;
+    ministere_reponse: string | null;
+    date_cloture: Date | null;
+    reference_question_rappelee: string | null;
+    texte: string | null;
+    texte_erratum: string | null;
+    rubrique: string | null;
+} & {
+    themes: {
+        libelle: string;
+    }[];
+    reponses: {
+        date_reponse_JO: Date | null;
+        ministere_reponse: string | null;
+        texte: string | null;
+        texte_erratum: string | null;
+    }[];
+}>;
+export declare function getDbSchema(): Promise<import("kysely").TableMetadata[]>;
+export {};

package/lib/src/model/questions.js

@@ -0,0 +1,76 @@
+import { sql } from "kysely";
+import { jsonArrayFrom } from "kysely/helpers/postgres";
+import { dbQuestions } from "../databases";
+function reponses(questionId) {
+    return jsonArrayFrom(dbQuestions.selectFrom("tam_reponses")
+        .where("tam_reponses.idque", "=", questionId)
+        .select([
+        "tam_reponses.datejorep as date_reponse_JO",
+        "tam_reponses.minreplib as ministere_reponse",
+        "tam_reponses.txtrep as texte",
+        "tam_reponses.txterrrep as texte_erratum",
+    ])
+        .orderBy("tam_reponses.datejorep asc"));
+}
+function themes(questionId) {
+    return jsonArrayFrom(dbQuestions.with("question_theme", (db) => db
+        .selectFrom("tam_questions")
+        .select([
+        "id as question_id",
+        eb => eb
+            .cast(sql `unnest(regexp_matches(tam_questions.themes, '#(\\d+)', 'g'))`, "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 = dbQuestions
+    .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([
+    "tam_questions.repub as republique",
+    "tam_questions.legislature as legislature",
+    "sortquestion.sorquelib as sort",
+    "tam_questions.natquecod as nature",
+    "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.codequalite as civilite",
+    "tam_questions.matricule as matricule",
+    "tam_questions.circonscription as circonscription",
+    "tam_questions.groupe as groupe",
+    "tam_questions.ratgrp as type_appartenance",
+    "tam_questions.datejodepot as date_publication_JO",
+    "tam_questions.mindepotlib as ministere_depot",
+    "tam_ministeres.datedebut as ministere_depot_date_debut",
+    "tam_questions.datejotran as date_transmission",
+    "tam_questions.mintranlib as ministere_transmission",
+    "tam_questions.datejorep1 as date_reponse_JO",
+    "tam_questions.minreplib1 as ministere_reponse",
+    "tam_questions.datecloture as date_cloture",
+    "tam_questions.refquerappelee as reference_question_rappelee",
+    //"tam_questions.url as url", // TODO ?
+    "tam_questions.txtque as texte",
+    "tam_questions.txtque as texte_erratum",
+    "tam_questions.rubrique as rubrique",
+])
+    .select(({ ref }) => [
+    themes(ref("tam_questions.id")).as("themes"),
+    reponses(ref("tam_questions.id")).as("reponses"),
+]);
+export function findAll() {
+    return findAllQuery.stream();
+}
+export function getDbSchema() {
+    return dbQuestions.introspection.getTables();
+}