@tricoteuses/senat 2.9.7 → 2.9.9

package/lib/model/dosleg.d.ts

@@ -1,11 +1,42 @@
-import { InferResult } from "kysely";
-export type DossierLegislatifResult = InferResult<typeof findAllQuery>[0];
-export type AuteurResult = InferResult<typeof findAuteursQuery>[0];
-declare const findAllQuery: import("kysely").SelectQueryBuilder<{
-    ses: import("../raw_types/dosleg").Ses;
-    qua: import("../raw_types/dosleg").Qua;
-    lecture: import("../raw_types/dosleg").Lecture;
-    loi: import("../raw_types/dosleg").Loi;
+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;
@@ -20,13 +51,15 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
     docatt: import("../raw_types/dosleg").Docatt;
     docsea: import("../raw_types/dosleg").Docsea;
     ecr: import("../raw_types/dosleg").Ecr;
-    etaloi: import("kysely").Nullable<import("../raw_types/dosleg").Etaloi>;
+    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;
@@ -34,11 +67,13 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
     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;
@@ -49,154 +84,13 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
     typdoc: import("../raw_types/dosleg").Typdoc;
     typevtsea: import("../raw_types/dosleg").Typevtsea;
     typlec: import("../raw_types/dosleg").Typlec;
-    typloi: import("kysely").Nullable<import("../raw_types/dosleg").Typloi>;
+    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;
-}, "loi" | "etaloi" | "typloi", {
-    url: string;
-    signet: string;
-    titre: string;
-    titre_court: string;
-    code_nature_dossier: string;
-    libelle_type_dossier: string;
-    etat_dossier: string;
-    date_decision_CoC: string;
-    date_saisine_CoC: string;
-    date_promulgation: string;
-    titre_JO: string;
-    date_publication_JO: string;
-    lectures: {
-        type_lecture: string;
-        libelle: string;
-        ordre_lecture: string | null;
-        lectures_assemblee: {
-            assemblee: string;
-            libelle_organisme: string | null;
-            code_organisme: string | null;
-            ordre_lecture_assemblee: string;
-            session: string | null;
-            textes: {
-                url: string;
-                numero: string | null;
-                id: string | null;
-                origine: string;
-                type: string;
-                date: string;
-                session: string | null;
-                auteurs: {
-                    prenom: string | null;
-                    nom_usuel: string;
-                    matricule: string | null;
-                }[];
-            }[];
-            rapports: {
-                url: string;
-                id: string | null;
-                type: string;
-                date: string;
-                session: string;
-                auteurs: {
-                    prenom: string | null;
-                    nom_usuel: string;
-                    matricule: string | null;
-                }[];
-                numero: string | null;
-            }[];
-            dates_seances: {
-                date: string;
-            }[];
-        }[];
-    }[];
-    themes: {
-        libelle: string;
-    }[];
-    url_dossier_assemblee_nationale: string | null;
-    num_decision_CoC: string | null;
-    url_decision_CoC: string | null;
-    condition_saisine_CoC: string | null;
-    numero_loi: string | null;
-    numero_JO: string | null;
-    url_JO: string | null;
-}>;
-export declare function findAll(): AsyncIterableIterator<{
-    url: string;
-    signet: string;
-    titre: string;
-    titre_court: string;
-    code_nature_dossier: string;
-    libelle_type_dossier: string;
-    etat_dossier: string;
-    date_decision_CoC: string;
-    date_saisine_CoC: string;
-    date_promulgation: string;
-    titre_JO: string;
-    date_publication_JO: string;
-    lectures: {
-        type_lecture: string;
-        libelle: string;
-        ordre_lecture: string | null;
-        lectures_assemblee: {
-            assemblee: string;
-            libelle_organisme: string | null;
-            code_organisme: string | null;
-            ordre_lecture_assemblee: string;
-            session: string | null;
-            textes: {
-                url: string;
-                numero: string | null;
-                id: string | null;
-                origine: string;
-                type: string;
-                date: string;
-                session: string | null;
-                auteurs: {
-                    prenom: string | null;
-                    nom_usuel: string;
-                    matricule: string | null;
-                }[];
-            }[];
-            rapports: {
-                url: string;
-                id: string | null;
-                type: string;
-                date: string;
-                session: string;
-                auteurs: {
-                    prenom: string | null;
-                    nom_usuel: string;
-                    matricule: string | null;
-                }[];
-                numero: string | null;
-            }[];
-            dates_seances: {
-                date: string;
-            }[];
-        }[];
-    }[];
-    themes: {
-        libelle: string;
-    }[];
-    url_dossier_assemblee_nationale: string | null;
-    num_decision_CoC: string | null;
-    url_decision_CoC: string | null;
-    condition_saisine_CoC: string | null;
-    numero_loi: string | null;
-    numero_JO: string | null;
-    url_JO: string | null;
-}>;
-export declare function findSenatTexteUrls(sessions?: number[]): AsyncIterableIterator<{
-    session: string | null | undefined;
-    url: string;
-    hasExposeDesMotifs: boolean;
-}>;
-export declare function findSenatRapportUrls(sessions?: number[]): AsyncIterableIterator<{
-    url: string;
-    session: string | null | undefined;
-}>;
-declare const findAuteursQuery: import("kysely").SelectQueryBuilder<import("../raw_types/dosleg").DB, "auteur", {
+}, "auteur", {
     code: string;
     nom: string;
     prenom: string | null;
@@ -214,4 +108,6 @@ export declare function findAuteur(auteurCode: string): Promise<{
     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

@@ -135,7 +135,47 @@ function themes(loiId) {
         "the.thelib as libelle",
     ]));
 }
-const findAllQuery = dbDosleg
+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
     .selectFrom("loi")
     .leftJoin("typloi", "typloi.typloicod", "loi.typloicod")
     .leftJoin("etaloi", "etaloi.etaloicod", "loi.etaloicod")
@@ -169,16 +209,19 @@ const findAllQuery = dbDosleg
     themes(ref("loi.loicod")).as("themes"),
 ])
     .$narrowType();
-export function findAll() {
-    return findAllQuery.stream();
+export function findAllDossiers() {
+    return findAllDossiersQuery.stream();
+}
+export function findAllScrutins() {
+    return findAllScrutinsQuery.stream();
 }
 export function findSenatTexteUrls(sessions = []) {
-    const sessionsStr = sessions.map(session => String(session));
+    const sessionsList = sessions.map(session => session);
     return dbDosleg
         .selectFrom("texte")
         .where("texurl", "is not", null)
         .where("typurl", "=", "I")
-        .$if(sessions.length > 0, (qb) => qb.where("sesann", "in", sessionsStr))
+        .$if(sessionsList.length > 0, (qb) => qb.where("sesann", "in", sessionsList))
         .select(({ eb, ref }) => [
         "sesann as session",
         rtrim(ref("texurl")).as("url"),
@@ -194,12 +237,12 @@ export function findSenatTexteUrls(sessions = []) {
         .stream();
 }
 export function findSenatRapportUrls(sessions = []) {
-    const sessionsStr = sessions.map(session => String(session));
+    const sessionsList = sessions.map(session => session);
     return dbDosleg
         .selectFrom("rap")
         .where("rapurl", "is not", null)
         .where("typurl", "=", "I")
-        .$if(sessions.length > 0, (qb) => qb.where("sesann", "in", sessionsStr))
+        .$if(sessionsList.length > 0, (qb) => qb.where("sesann", "in", sessionsList))
         .select(({ ref }) => [
         "sesann as session",
         rtrim(ref("rapurl")).as("url"),

package/lib/model/index.d.ts

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

package/lib/model/index.js

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

package/lib/model/questions.d.ts

@@ -2,17 +2,17 @@ import { InferResult } from "kysely";
 export type QuestionResult = InferResult<typeof findAllQuery>[0];
 declare const findAllQuery: import("kysely").SelectQueryBuilder<{
     the: import("../raw_types/questions").The;
-    tam_questions: import("../raw_types/questions").TamQuestions;
     etatquestion: import("kysely").Nullable<import("../raw_types/questions").Etatquestion>;
     legquestion: import("../raw_types/questions").Legquestion;
     naturequestion: import("kysely").Nullable<import("../raw_types/questions").Naturequestion>;
     sortquestion: import("kysely").Nullable<import("../raw_types/questions").Sortquestion>;
     tam_ministeres: import("kysely").Nullable<import("../raw_types/questions").TamMinisteres>;
+    tam_questions: import("../raw_types/questions").TamQuestions;
     tam_reponses: import("../raw_types/questions").TamReponses;
-}, "tam_questions" | "etatquestion" | "naturequestion" | "sortquestion" | "tam_ministeres", {
+}, "etatquestion" | "naturequestion" | "sortquestion" | "tam_ministeres" | "tam_questions", {
     date_publication_JO: string;
-    republique: string | null;
-    legislature: string | null;
+    republique: number | null;
+    legislature: number | null;
     sort: string | null;
     nature: string | null;
     numero: string | null;
@@ -48,8 +48,8 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
 }>;
 export declare function findAll(): AsyncIterableIterator<{
     date_publication_JO: string;
-    republique: string | null;
-    legislature: string | null;
+    republique: number | null;
+    legislature: number | null;
     sort: string | null;
     nature: string | null;
     numero: string | null;