@tricoteuses/senat 2.10.5 → 2.11.1

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 {};

package/lib/model/dosleg.js

@@ -1,32 +1,39 @@
 import { sql } from "kysely";
 import { jsonArrayFrom } from "kysely/helpers/postgres";
-import { dbDosleg } from "../databases";
+import { dbSenat } from "../databases";
 import { concat, removeSubstring, rtrim, toDateString } from "./util";
 function orderOrdreOrigineTexte(expr) {
     return sql `array_position(array['0','2','1'], ${expr})`;
 }
 function datesSeances(lectureAssembleeId) {
-    return jsonArrayFrom(dbDosleg
-        .selectFrom("date_seance")
-        .where("date_seance.lecidt", "=", lectureAssembleeId)
+    return jsonArrayFrom(dbSenat
+        .withSchema("dosleg")
+        .selectFrom("dosleg.date_seance")
+        .where("dosleg.date_seance.lecidt", "=", lectureAssembleeId)
         .select(({ ref }) => [
-        toDateString(ref("date_seance.date_s")).as("date"),
+        toDateString(ref("dosleg.date_seance.date_s")).as("date"),
     ]));
 }
 function auteursRapport(rapportId) {
-    return jsonArrayFrom(dbDosleg
-        .selectFrom("auteur")
-        .leftJoin("ecr", "ecr.autcod", "auteur.autcod")
-        .where("ecr.rapcod", "=", 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([
-        "auteur.prenom as prenom",
-        "auteur.nomuse as nom_usuel",
-        "auteur.autmat as matricule",
+        "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("ecr.ecrnumtri", "asc"));
+        .orderBy("dosleg.ecr.ecrnumtri", "asc"));
 }
 function rapports(lectureAssembleeId) {
-    return jsonArrayFrom(dbDosleg
+    return jsonArrayFrom(dbSenat
+        .withSchema("dosleg")
         .selectFrom("rap")
         .leftJoin("lecassrap", "lecassrap.rapcod", "rap.rapcod")
         .leftJoin("denrap", "denrap.coddenrap", "rap.coddenrap")
@@ -54,19 +61,25 @@ function rapports(lectureAssembleeId) {
     ]));
 }
 function auteursTexte(texteId) {
-    return jsonArrayFrom(dbDosleg
+    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 textes(lectureAssembleeId) {
-    return jsonArrayFrom(dbDosleg
+    return jsonArrayFrom(dbSenat
+        .withSchema("dosleg")
         .selectFrom("texte")
         .leftJoin("oritxt", "oritxt.oritxtcod", "texte.oritxtcod")
         .leftJoin("typtxt", "typtxt.typtxtcod", "texte.typtxtcod")
@@ -88,6 +101,9 @@ function textes(lectureAssembleeId) {
             .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"),
         "sesann as session",
@@ -96,17 +112,26 @@ function textes(lectureAssembleeId) {
         .orderBy(({ ref }) => orderOrdreOrigineTexte(ref("oritxt.oriordre"))));
 }
 function lecturesAssemblee(lectureId) {
-    return jsonArrayFrom(dbDosleg
+    return jsonArrayFrom(dbSenat
+        .withSchema("dosleg")
         .selectFrom("lecass")
         .where("lecass.lecidt", "=", lectureId)
         .leftJoin("ass", "ass.codass", "lecass.codass")
         .leftJoin("org", "org.orgcod", "lecass.orgcod")
+        .leftJoin("orippr", "orippr.oripprcod", "lecass.orippr")
         .select(({ ref }) => [
         rtrim(ref("ass.libass")).as("assemblee"),
         "org.orgnom as libelle_organisme",
         "org.senorgcod as code_organisme",
         "lecass.ordreass as ordre_lecture_assemblee",
         "lecass.sesann as session",
+        "orippr.oripprlib as origine_proposition",
+        "lecass.ptlnum as numero_petite_loi",
+        "lecass.ptlurl as url_petite_loi",
+        "lecass.loiintmod as loi_intitule_modifie",
+        "lecass.debatsurl as url_cr_debats",
+        toDateString(ref("lecass.lecassamecomdat")).as("date_publication_amendements_commission"),
+        toDateString(ref("lecass.lecassamedat")).as("date_publication_amendements_seance"),
         textes(ref("lecass.lecassidt")).as("textes"),
         rapports(ref("lecass.lecassidt")).as("rapports"),
         datesSeances(ref("lecass.lecassidt")).as("dates_seances"),
@@ -114,7 +139,8 @@ function lecturesAssemblee(lectureId) {
         .orderBy("lecass.ordreass", "asc"));
 }
 function lectures(loiId) {
-    return jsonArrayFrom(dbDosleg
+    return jsonArrayFrom(dbSenat
+        .withSchema("dosleg")
         .selectFrom("lecture")
         .leftJoin("typlec", "typlec.typleccod", "lecture.typleccod")
         .where("lecture.loicod", "=", loiId)
@@ -127,7 +153,8 @@ function lectures(loiId) {
         .orderBy("typlec.typlecord", "asc"));
 }
 function themes(loiId) {
-    return jsonArrayFrom(dbDosleg
+    return jsonArrayFrom(dbSenat
+        .withSchema("dosleg")
         .selectFrom("the")
         .leftJoin("loithe", "loithe.thecle", "the.thecle")
         .where("loithe.loicod", "=", loiId)
@@ -135,66 +162,43 @@ function themes(loiId) {
         "the.thelib as libelle",
     ]));
 }
-function votes(scrutinNum) {
-    return jsonArrayFrom(dbDosleg
-        .selectFrom("votsen")
-        .leftJoin("titsen", "titsen.titsencod", "votsen.titsencod")
-        .leftJoin("stavot", "stavot.stavotidt", "votsen.stavotidt")
-        .leftJoin("posvot", "posvot.posvotcod", "votsen.posvotcod")
-        .where("votsen.scrnum", "=", scrutinNum)
-        .select([
-        "votsen.senmat as matricule_votant",
-        "votsen.senmatdel as matricule_delegant",
-        "posvot.posvotlib as position",
-        "stavot.stavotlib as statut_votant",
-        "titsen.titsenlib as titre_votant",
-    ]));
-}
-const findAllScrutinsQuery = dbDosleg
-    .selectFrom("scr")
-    .leftJoin("date_seance", "scr.code", "date_seance.code")
-    .leftJoin("lecture", "date_seance.lecidt", "lecture.lecidt")
-    .select(({ eb, ref, val }) => [
-    "scr.sesann as session",
-    "scr.scrnum as numero",
-    "date_seance.lecidt as lecture_id",
-    toDateString(ref("scr.scrdat")).as("date_scrutin"),
-    toDateString(ref("scr.scrdateff")).as("date_scrutin_effective"),
-    "scr.scrint as intitule",
-    "scr.scrbaspag as note",
-    "scr.scrmaj as nombre_majorite",
-    "scr.scrmajsea as nombre_majorite_seance",
-    "scr.scrvot as nombre_votants",
-    "scr.scrvotsea as nombre_votants_seance",
-    "scr.scrsuf as nombre_suffrages",
-    "scr.scrsufsea as nombre_suffrages_seance",
-    "scr.scrcon as nombre_contre",
-    "scr.scrconsea as nombre_contre_seance",
-    "scr.scrpou as nombre_pour",
-    "scr.scrpousea as nombre_pour_seance",
-    votes(ref("scr.scrnum")).as("votes"),
-])
-    .$narrowType();
-const findAllDossiersQuery = dbDosleg
+const findAllDossiersQuery = dbSenat
+    .withSchema("dosleg")
     .selectFrom("loi")
     .leftJoin("typloi", "typloi.typloicod", "loi.typloicod")
     .leftJoin("etaloi", "etaloi.etaloicod", "loi.etaloicod")
+    .leftJoin("deccoc", "deccoc.deccoccod", "loi.deccoccod")
     .select(({ eb, ref, val }) => [
+    rtrim(ref("loi.loicod")).as("code"),
+    "loi.numero as numero",
     "loi.signet as signet",
-    concat(val("https://www.senat.fr/dossier-legislatif/"), ref("loi.signet"), val(".html")).as("url"),
-    concat(rtrim(ref("typloi.typloiden")), val(" "), rtrim(ref("loi.loitit"))).as("titre"),
+    sql `NULLIF(regexp_replace(loi.url_an, '^.*\\/(DL[^\\/]+)\\.asp$', '\\1'), '')`.as("code_dossier_an"),
+    "loi.signetalt as signet_alternatif",
+    rtrim(ref("loi.motclef")).as("mot_cle"),
     rtrim(ref("loi.loient")).as("titre_court"),
+    concat(rtrim(ref("typloi.typloiden")), val(" "), rtrim(ref("loi.loitit"))).as("titre"),
+    concat(rtrim(ref("typloi.typloiden")), val(" "), rtrim(ref("loi.loiint"))).as("titre_long"),
+    concat(rtrim(ref("typloi.typloiden")), val(" "), rtrim(ref("loi.loiintori"))).as("titre_long_original"),
+    concat(val("https://www.senat.fr/dossier-legislatif/"), ref("loi.signet"), val(".html")).as("url"),
+    "loi.urgence as urgence",
     rtrim(ref("typloi.groupe")).as("code_nature_dossier"),
     rtrim(ref("typloi.typloilib")).as("libelle_type_dossier"),
     rtrim(ref("etaloi.etaloilib")).as("etat_dossier"),
     "loi.url_an as url_dossier_assemblee_nationale",
+    "loi.url_presart as url_presentation_articles",
+    "loi.url_ordonnance as url_ordonnance",
+    "loi.orgcod as code_organisme_resolution",
+    "deccoc.deccoclib as libelle_decision_CoC",
     toDateString(ref("loi.date_decision")).as("date_decision_CoC"),
     "loi.num_decision as num_decision_CoC",
     "loi.deccocurl as url_decision_CoC",
+    "loi.doscocurl as url_dossier_CoC",
     toDateString(ref("loi.saisine_date")).as("date_saisine_CoC"),
     "loi.saisine_par as condition_saisine_CoC",
+    toDateString(ref("loi.proaccdat")).as("date_procedure_acceleree"),
+    toDateString(ref("loi.proaccoppdat")).as("date_opposition_procedure_acceleree"),
+    toDateString(ref("loi.retproaccdat")).as("date_retrait_procedure_acceleree"),
     toDateString(ref("loi.date_loi")).as("date_promulgation"),
-    "loi.numero as numero_loi",
     eb
         .case()
         .when("loi.loititjo", "is not", null)
@@ -205,6 +209,12 @@ const findAllDossiersQuery = dbDosleg
     toDateString(ref("loi.loidatjo")).as("date_publication_JO"),
     "loi.loinumjo as numero_JO",
     "loi.url_jo as url_JO",
+    toDateString(ref("loi.loidatjo2")).as("date_publication_JO_correctif_1"),
+    "loi.loinumjo2 as numero_JO_correctif_1",
+    "loi.url_jo2 as url_JO_correctif_1",
+    toDateString(ref("loi.loidatjo3")).as("date_publication_JO_correctif_2"),
+    "loi.loinumjo3 as numero_JO_correctif_2",
+    "loi.url_jo3 as url_JO_correctif_2",
     lectures(ref("loi.loicod")).as("lectures"),
     themes(ref("loi.loicod")).as("themes"),
 ])
@@ -212,46 +222,9 @@ const findAllDossiersQuery = dbDosleg
 export function findAllDossiers() {
     return findAllDossiersQuery.stream();
 }
-export function findAllScrutins() {
-    return findAllScrutinsQuery.stream();
-}
-export function findSenatTexteUrls(sessions = []) {
-    const sessionsList = sessions.map(session => session);
-    return dbDosleg
-        .selectFrom("texte")
-        .where("texurl", "is not", null)
-        .where("typurl", "=", "I")
-        .$if(sessionsList.length > 0, (qb) => qb.where("sesann", "in", sessionsList))
-        .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 = []) {
-    const sessionsList = sessions.map(session => session);
-    return dbDosleg
-        .selectFrom("rap")
-        .where("rapurl", "is not", null)
-        .where("typurl", "=", "I")
-        .$if(sessionsList.length > 0, (qb) => qb.where("sesann", "in", sessionsList))
-        .select(({ ref }) => [
-        "sesann as session",
-        rtrim(ref("rapurl")).as("url"),
-    ])
-        .$narrowType()
-        .stream();
-}
-const findAuteursQuery = dbDosleg
-    .selectFrom("auteur")
+const findAuteursQuery = dbSenat
+    .withSchema("dosleg")
+    .selectFrom("dosleg.auteur")
     .select([
     "autcod as code",
     "nomuse as nom",
@@ -262,8 +235,3 @@ export async function findAuteurs() {
     return findAuteursQuery
         .execute();
 }
-export async function findAuteur(auteurCode) {
-    return findAuteursQuery
-        .where("autcod", "=", auteurCode)
-        .executeTakeFirst();
-}

package/lib/model/index.d.ts

@@ -1,5 +1,7 @@
-export { findAll as findAllAmendements } from "./ameli";
+export { findAllAmendements } from "./ameli";
 export { findAll as findAllDebats } from "./debats";
-export { findAllDossiers, findAllScrutins, findAuteur, findAuteurs, findSenatRapportUrls, findSenatTexteUrls, } from "./dosleg";
+export { findAllDossiers, findAuteurs, } from "./dosleg";
+export { findSenatTexteUrls, findSenatRapportUrls } from "./documents";
+export { findAllScrutins } from "./scrutins";
 export { findAll as findAllQuestions } from "./questions";
 export { findAll as findAllSens, findAllCirconscriptions, findAllOrganismes, } from "./sens";

package/lib/model/index.js

@@ -1,5 +1,7 @@
-export { findAll as findAllAmendements } from "./ameli";
+export { findAllAmendements } from "./ameli";
 export { findAll as findAllDebats } from "./debats";
-export { findAllDossiers, findAllScrutins, findAuteur, findAuteurs, findSenatRapportUrls, findSenatTexteUrls, } from "./dosleg";
+export { findAllDossiers, findAuteurs, } from "./dosleg";
+export { findSenatTexteUrls, findSenatRapportUrls } from "./documents";
+export { findAllScrutins } from "./scrutins";
 export { findAll as findAllQuestions } from "./questions";
 export { findAll as findAllSens, findAllCirconscriptions, findAllOrganismes, } from "./sens";