@tricoteuses/senat 2.9.8 → 2.9.10

package/lib/databases.d.ts

@@ -1,11 +1,28 @@
 import { Kysely } from "kysely";
-import { DB as AmeliDatabase } from "./raw_types/ameli";
-import { DB as DebatsDatabase } from "./raw_types/debats";
-import { DB as DoslegDatabase } from "./raw_types/dosleg";
-import { DB as QuestionsDatabase } from "./raw_types/questions";
-import { DB as SensDatabase } from "./raw_types/sens";
-export declare const dbAmeli: Kysely<AmeliDatabase>;
-export declare const dbDebats: Kysely<DebatsDatabase>;
-export declare const dbDosleg: Kysely<DoslegDatabase>;
-export declare const dbQuestions: Kysely<QuestionsDatabase>;
-export declare const dbSens: Kysely<SensDatabase>;
+import { TableTypes as AmeliTableTypes } from "./raw_types/ameli";
+import { TableTypes as DebatsTableTypes } from "./raw_types/debats";
+import { TableTypes as DoslegTableTypes } from "./raw_types/dosleg";
+import { TableTypes as QuestionsTableTypes } from "./raw_types/questions";
+import { TableTypes as SensTableTypes } from "./raw_types/sens";
+type AmeliDb = {
+    [K in keyof AmeliTableTypes]: AmeliTableTypes[K]["select"];
+};
+type DebatsDb = {
+    [K in keyof DebatsTableTypes]: DebatsTableTypes[K]["select"];
+};
+type DoslegDb = {
+    [K in keyof DoslegTableTypes]: DoslegTableTypes[K]["select"];
+};
+type QuestionsDb = {
+    [K in keyof QuestionsTableTypes]: QuestionsTableTypes[K]["select"];
+};
+type SensDb = {
+    [K in keyof SensTableTypes]: SensTableTypes[K]["select"];
+};
+export declare const dbSenat: Kysely<unknown>;
+export declare const dbAmeli: Kysely<AmeliDb>;
+export declare const dbDebats: Kysely<DebatsDb>;
+export declare const dbDosleg: Kysely<DoslegDb>;
+export declare const dbQuestions: Kysely<QuestionsDb>;
+export declare const dbSens: Kysely<SensDb>;
+export {};

package/lib/databases.js

@@ -9,25 +9,24 @@ import { datasets } from "./datasets";
 pg.types.setTypeParser(types.builtins.INT8, (val) => {
     return parseInt(val, 10);
 });
-export const dbAmeli = createDb(datasets.ameli.database, datasets.ameli.schema);
-export const dbDebats = createDb(datasets.debats.database, datasets.debats.schema);
-export const dbDosleg = createDb(datasets.dosleg.database, datasets.dosleg.schema);
-export const dbQuestions = createDb(datasets.questions.database, datasets.questions.schema);
-export const dbSens = createDb(datasets.sens.database, datasets.sens.schema);
-function createDb(database, schema) {
-    const dialect = new PostgresDialect({
-        pool: new pg.Pool({
-            database: database,
-            host: config.db.host,
-            user: config.db.user,
-            password: config.db.password,
-            port: config.db.port,
-            max: 10,
-        }),
-        cursor: Cursor,
-    });
-    return new Kysely({
-        log: ["error"],
-        dialect: dialect,
-    }).withSchema(schema);
-}
+const senatPool = new pg.Pool({
+    database: "senat",
+    host: config.db.host,
+    user: config.db.user,
+    password: config.db.password,
+    port: config.db.port,
+    max: 10,
+});
+const senatDialect = new PostgresDialect({
+    pool: senatPool,
+    cursor: Cursor,
+});
+export const dbSenat = new Kysely({
+    log: ["error"],
+    dialect: senatDialect,
+});
+export const dbAmeli = dbSenat.withSchema(datasets.ameli.database);
+export const dbDebats = dbSenat.withSchema(datasets.debats.database);
+export const dbDosleg = dbSenat.withSchema(datasets.dosleg.database);
+export const dbQuestions = dbSenat.withSchema(datasets.questions.database);
+export const dbSens = dbSenat.withSchema(datasets.sens.database);

package/lib/datasets.d.ts

@@ -2,7 +2,6 @@ export interface Dataset {
     database: string;
     repairEncoding: boolean;
     repairZip?: (dataset: Dataset, dataDir: string) => void;
-    schema: string;
     title: string;
     url: string;
 }

package/lib/datasets.js

@@ -16,35 +16,31 @@ export var EnabledDatasets;
 export const datasets = {
     ameli: {
         database: "ameli",
-        repairEncoding: false,
+        repairEncoding: true,
         repairZip: (dataset, dataDir) => {
             const sqlFilename = `${dataset.database}.sql`;
             const sqlFilePath = path.join(dataDir, sqlFilename);
             fs.removeSync(sqlFilePath);
             fs.moveSync(path.join(dataDir, "var", "opt", "opendata", sqlFilename), sqlFilePath);
         },
-        schema: "public",
         title: "Amendements",
         url: "https://data.senat.fr/data/ameli/ameli.zip",
     },
     debats: {
         database: "debats",
         repairEncoding: true,
-        schema: "public",
         title: "Informations relatives aux comptes rendus intégraux de la séance publique",
         url: "https://data.senat.fr/data/debats/debats.zip",
     },
     dosleg: {
         database: "dosleg",
         repairEncoding: true,
-        schema: "public",
         title: "Dossiers législatifs",
         url: "https://data.senat.fr/data/dosleg/dosleg.zip",
     },
     questions: {
         database: "questions",
         repairEncoding: true,
-        schema: "questions",
         title: "Questions écrites et orales posées par les sénateurs au Gouvernement",
         url: "https://data.senat.fr/data/questions/questions.zip",
     },
@@ -57,7 +53,6 @@ export const datasets = {
             fs.removeSync(sqlFilePath);
             fs.moveSync(path.join(dataDir, "export_sens.sql"), sqlFilePath);
         },
-        schema: "public",
         title: "Sénateurs (y compris organes et présence)",
         url: "https://data.senat.fr/data/senateurs/export_sens.zip",
     },

package/lib/loaders.d.ts

@@ -26,7 +26,7 @@ export type IterItem<T> = {
 };
 export interface TexteMetadata {
     name: string;
-    session: string | null | undefined;
+    session: number | null | undefined;
     url_expose_des_motifs?: URL;
     url_xml: URL;
     url_html: URL;
@@ -34,7 +34,7 @@ export interface TexteMetadata {
 }
 export interface RapportMetadata {
     name: string;
-    session: string | null | undefined;
+    session: number | null | undefined;
     url_html: URL;
     url_pdf: URL;
 }
@@ -45,13 +45,13 @@ export interface DossierLegislatifDocumentResult {
     type_lecture: string;
     libelle_lecture: string;
     libelle_organisme: string | null;
-    numero: string | null;
+    numero: number | null;
     id: string | null;
     url: string;
     origine?: string | null | undefined;
     type: string;
     date: string;
-    session: string | null;
+    session: number | null;
     auteurs: {
         prenom: string | null;
         nom_usuel: string;

package/lib/loaders.js

@@ -99,14 +99,14 @@ export function* iterLoadSenatDossiersLegislatifsTexteUrls(dataDir, session) {
 }
 export function* iterLoadSenatDossiersLegislatifsDocuments(dataDir, session, documentType, options = {}) {
     for (const { item: dossierLegislatif } of iterLoadSenatDossiersLegislatifs(dataDir, session, options)) {
-        for (const lecture of dossierLegislatif.lectures) {
+        for (const lecture of dossierLegislatif["lectures"]) {
             const lecturesSenat = lecture.lectures_assemblee.filter((lectureAssemblee) => lectureAssemblee.assemblee === "Sénat");
             for (const lectureSenat of lecturesSenat) {
                 for (const document of lectureSenat[documentType]) {
                     const enrichedDocument = {
-                        signet_dossier: dossierLegislatif.signet,
-                        url_dossier_senat: dossierLegislatif.url,
-                        url_dossier_assemblee_nationale: dossierLegislatif.url_dossier_assemblee_nationale,
+                        signet_dossier: dossierLegislatif["signet"],
+                        url_dossier_senat: dossierLegislatif["url"],
+                        url_dossier_assemblee_nationale: dossierLegislatif["url_dossier_assemblee_nationale"],
                         type_lecture: lecture.type_lecture,
                         libelle_lecture: lecture.libelle,
                         libelle_organisme: lectureSenat.libelle_organisme,

package/lib/model/ameli.d.ts

@@ -2,101 +2,123 @@ import { InferResult } from "kysely";
 export type AmendementResult = InferResult<typeof findAllQuery>[0];
 declare const findAllQuery: import("kysely").SelectQueryBuilder<{
     amd: import("../raw_types/ameli").Amd;
-    amdsen: import("../raw_types/ameli").Amdsen;
+    mot: import("../raw_types/ameli").Mot;
+    sub: import("kysely").Nullable<import("../raw_types/ameli").Sub>;
+    ent: import("../raw_types/ameli").Ent;
+    sor: import("kysely").Nullable<import("../raw_types/ameli").Sor>;
     avicom: import("kysely").Nullable<import("../raw_types/ameli").Avicom>;
     avigvt: import("kysely").Nullable<import("../raw_types/ameli").Avigvt>;
+    irr: import("kysely").Nullable<import("../raw_types/ameli").Irr>;
+    txt_ameli: import("kysely").Nullable<import("../raw_types/ameli").TxtAmeli>;
+    typrect: import("../raw_types/ameli").Typrect;
+    amdsen: import("../raw_types/ameli").Amdsen;
+    sen_ameli: import("../raw_types/ameli").SenAmeli;
+    grppol_ameli: import("kysely").Nullable<import("../raw_types/ameli").GrppolAmeli>;
     cab: import("kysely").Nullable<import("../raw_types/ameli").Cab>;
     com_ameli: import("kysely").Nullable<import("../raw_types/ameli").ComAmeli>;
-    ent: import("../raw_types/ameli").Ent;
     etatxt: import("../raw_types/ameli").Etatxt;
     fbu: import("../raw_types/ameli").Fbu;
-    grppol_ameli: import("kysely").Nullable<import("../raw_types/ameli").GrppolAmeli>;
+    ses: import("kysely").Nullable<import("../raw_types/ameli").Ses>;
     gvt: import("../raw_types/ameli").Gvt;
     intora: import("../raw_types/ameli").Intora;
-    irr: import("kysely").Nullable<import("../raw_types/ameli").Irr>;
+    sea: import("../raw_types/ameli").Sea;
+    orarol: import("../raw_types/ameli").Orarol;
     lec_ameli: import("kysely").Nullable<import("../raw_types/ameli").LecAmeli>;
-    mot: import("../raw_types/ameli").Mot;
     nat: import("kysely").Nullable<import("../raw_types/ameli").Nat>;
-    orarol: import("../raw_types/ameli").Orarol;
     sai: import("../raw_types/ameli").Sai;
     saisen: import("../raw_types/ameli").Saisen;
-    sea: import("../raw_types/ameli").Sea;
-    sen_ameli: import("../raw_types/ameli").SenAmeli;
-    ses: import("kysely").Nullable<import("../raw_types/ameli").Ses>;
-    sor: import("kysely").Nullable<import("../raw_types/ameli").Sor>;
-    sub: import("kysely").Nullable<import("../raw_types/ameli").Sub>;
-    txt_ameli: import("kysely").Nullable<import("../raw_types/ameli").TxtAmeli>;
-    typrect: import("../raw_types/ameli").Typrect;
     typses: import("../raw_types/ameli").Typses;
     typsub: import("kysely").Nullable<import("../raw_types/ameli").Typsub>;
     w_nivrec: import("../raw_types/ameli").WNivrec;
-}, "amd" | "avicom" | "avigvt" | "cab" | "com_ameli" | "grppol_ameli" | "irr" | "lec_ameli" | "nat" | "ses" | "sor" | "sub" | "txt_ameli" | "typsub", {
-    session: string | null;
+}, "amd" | "sub" | "sor" | "avicom" | "avigvt" | "irr" | "txt_ameli" | "grppol_ameli" | "cab" | "com_ameli" | "ses" | "lec_ameli" | "nat" | "typsub", {
+    session: number | null;
     signet_dossier_legislatif: string | null;
     nature_texte: string | null;
     numero_texte: number | null;
+    numero_adoption_texte: number | null;
     intitule_texte: string | null;
     lecture: string | null;
     nature: string;
     id: number;
     parent_id: number | null;
+    rendu_similaire_id: number | null;
+    identique_id: number | null;
     numero: string | null;
-    numero_absolu: string | null;
-    ordre: string | null;
+    numero_absolu: number | null;
+    ordre: number | null;
+    accepte_gouvernement: string | null;
     subdivision_libelle: string | null;
     subdivision_libelle_court: string | null;
     subdivision_type: string | null;
     alinea: number | null;
+    commentaire_probleme: string | null;
+    observations: string | null;
+    observations_additionnelles: string | null;
     date_depot: string;
     dispositif: string | null;
+    discussion_commune_id: number | null;
     objet: string | null;
     etat: string;
     avis_commission: string | null;
     avis_gouvernement: string | null;
     sort: string | null;
-    revision: string;
+    revision: number;
     url: string;
     au_nom_de_groupe_politique: string | null;
     au_nom_de_commission: string | null;
     auteur_est_gouvernement: boolean;
     auteurs: {
         prenom: string | null;
+        homonyme: string | null;
         nom: string | null;
+        qualite: string | null;
+        rang: number | null;
         matricule: string | null;
     }[];
 }>;
 export declare function findAll(): AsyncIterableIterator<{
-    session: string | null;
+    session: number | null;
     signet_dossier_legislatif: string | null;
     nature_texte: string | null;
     numero_texte: number | null;
+    numero_adoption_texte: number | null;
     intitule_texte: string | null;
     lecture: string | null;
     nature: string;
     id: number;
     parent_id: number | null;
+    rendu_similaire_id: number | null;
+    identique_id: number | null;
     numero: string | null;
-    numero_absolu: string | null;
-    ordre: string | null;
+    numero_absolu: number | null;
+    ordre: number | null;
+    accepte_gouvernement: string | null;
     subdivision_libelle: string | null;
     subdivision_libelle_court: string | null;
     subdivision_type: string | null;
     alinea: number | null;
+    commentaire_probleme: string | null;
+    observations: string | null;
+    observations_additionnelles: string | null;
     date_depot: string;
     dispositif: string | null;
+    discussion_commune_id: number | null;
     objet: string | null;
     etat: string;
     avis_commission: string | null;
     avis_gouvernement: string | null;
     sort: string | null;
-    revision: string;
+    revision: number;
     url: string;
     au_nom_de_groupe_politique: string | null;
     au_nom_de_commission: string | null;
     auteur_est_gouvernement: boolean;
     auteurs: {
         prenom: string | null;
+        homonyme: string | null;
         nom: string | null;
+        qualite: string | null;
+        rang: number | null;
         matricule: string | null;
     }[];
 }>;

package/lib/model/ameli.js

@@ -8,7 +8,10 @@ function auteurs(amendementId) {
         .where("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",
     ])
         .orderBy("amdsen.rng asc"));
@@ -33,6 +36,7 @@ const findAllQuery = dbAmeli
     "txt_ameli.doslegsignet as signet_dossier_legislatif",
     "nat.libcourt as nature_texte",
     "txt_ameli.numabs as numero_texte",
+    "txt_ameli.numado as numero_adoption_texte",
     "txt_ameli.int as intitule_texte",
     "lec_ameli.lib as lecture",
     eb
@@ -48,15 +52,22 @@ const findAllQuery = dbAmeli
         .as("nature"),
     "amd.id as id",
     "amd.amdperid as parent_id",
+    "amd.amdrendusim as rendu_similaire_id",
+    "amd.ideid as identique_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",
     "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.discomid as discussion_commune_id",
     "amd.obj as objet",
     eb
         .case()

package/lib/model/debats.d.ts

@@ -1,20 +1,29 @@
 import { InferResult } from "kysely";
 export type DebatResult = InferResult<typeof findAllQuery>[0];
-declare const findAllQuery: import("kysely").SelectQueryBuilder<import("../raw_types/debats").DB, "debats", {
+declare const findAllQuery: import("kysely").SelectQueryBuilder<{
+    debats: import("../raw_types/debats").Debats;
+    intdivers: import("../raw_types/debats").Intdivers;
+    intpjl: import("../raw_types/debats").Intpjl;
+    lecassdeb: import("../raw_types/debats").Lecassdeb;
+    secdis: import("../raw_types/debats").Secdis;
+    secdivers: import("../raw_types/debats").Secdivers;
+    syndeb: import("../raw_types/debats").Syndeb;
+    typsec: import("../raw_types/debats").Typsec;
+}, "debats", {
     id: string;
     date_seance: string;
-    numero: string | null;
+    numero: number | null;
     url: string | null;
     etat_synchronisation: string | null;
     sections: {
-        id: string | null;
+        id: number | null;
         numero: string | null;
         objet: string | null;
         url: string | null;
         type: string | null;
         categorie: string | null;
         interventions: {
-            id: string | null;
+            id: number | null;
             auteur_code: string;
             fonction_intervenant: string | null;
             url: string | null;
@@ -28,7 +37,7 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<import("../raw_t
         libelle: string | null;
         objet: string | null;
         interventions: {
-            id: string | null;
+            id: number | null;
             auteur_code: string;
             fonction_intervenant: string | null;
             url: string | null;
@@ -42,18 +51,18 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<import("../raw_t
 export declare function findAll(): AsyncIterableIterator<{
     id: string;
     date_seance: string;
-    numero: string | null;
+    numero: number | null;
     url: string | null;
     etat_synchronisation: string | null;
     sections: {
-        id: string | null;
+        id: number | null;
         numero: string | null;
         objet: string | null;
         url: string | null;
         type: string | null;
         categorie: string | null;
         interventions: {
-            id: string | null;
+            id: number | null;
             auteur_code: string;
             fonction_intervenant: string | null;
             url: string | null;
@@ -67,7 +76,7 @@ export declare function findAll(): AsyncIterableIterator<{
         libelle: string | null;
         objet: string | null;
         interventions: {
-            id: string | null;
+            id: number | null;
             auteur_code: string;
             fonction_intervenant: string | null;
             url: string | null;