@tricoteuses/senat 2.8.6 → 2.9.1

package/README.md

@@ -105,6 +105,7 @@ To publish a new version of this package onto npm, bump the package version and
 
 ```bash
 npm version x.y.z # Bumps version in package.json and creates a new tag x.y.z
+npx tsc
 npm publish
 ```
 

package/lib/model/dosleg.d.ts

@@ -11,67 +11,39 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
     aud: import("../raw_types/dosleg").Aud;
     auteur: import("../raw_types/dosleg").Auteur;
     ble: import("../raw_types/dosleg").Ble;
-    bur: import("../raw_types/dosleg").Bur;
     catrap: import("../raw_types/dosleg").Catrap;
-    com: import("../raw_types/dosleg").Com;
     corscr: import("../raw_types/dosleg").Corscr;
     date_seance: import("../raw_types/dosleg").DateSeance;
     deccoc: import("../raw_types/dosleg").Deccoc;
-    delega: import("../raw_types/dosleg").Delega;
     denrap: import("../raw_types/dosleg").Denrap;
-    designorg: import("../raw_types/dosleg").Designorg;
     doc: import("../raw_types/dosleg").Doc;
     docatt: import("../raw_types/dosleg").Docatt;
     docsea: import("../raw_types/dosleg").Docsea;
-    dpt: import("../raw_types/dosleg").Dpt;
-    dptele: import("../raw_types/dosleg").Dptele;
     ecr: import("../raw_types/dosleg").Ecr;
-    elusen: import("../raw_types/dosleg").Elusen;
-    etadebman: import("../raw_types/dosleg").Etadebman;
-    etafinman: import("../raw_types/dosleg").Etafinman;
     etaloi: import("kysely").Nullable<import("../raw_types/dosleg").Etaloi>;
-    etasen: import("../raw_types/dosleg").Etasen;
     evtsea: import("../raw_types/dosleg").Evtsea;
-    foncom: import("../raw_types/dosleg").Foncom;
-    fondelega: import("../raw_types/dosleg").Fondelega;
-    fongrppol: import("../raw_types/dosleg").Fongrppol;
-    fonmemcom: import("../raw_types/dosleg").Fonmemcom;
-    fonmemdelega: import("../raw_types/dosleg").Fonmemdelega;
-    fonmemgrppol: import("../raw_types/dosleg").Fonmemgrppol;
     forpub: import("../raw_types/dosleg").Forpub;
     gen: import("../raw_types/dosleg").Gen;
-    grppol: import("../raw_types/dosleg").Grppol;
     lecass: import("../raw_types/dosleg").Lecass;
     lecassrap: import("../raw_types/dosleg").Lecassrap;
-    libcom: import("../raw_types/dosleg").Libcom;
-    libdelega: import("../raw_types/dosleg").Libdelega;
-    libgrppol: import("../raw_types/dosleg").Libgrppol;
     lnkrap: import("../raw_types/dosleg").Lnkrap;
     loithe: import("../raw_types/dosleg").Loithe;
-    memcom: import("../raw_types/dosleg").Memcom;
-    memdelega: import("../raw_types/dosleg").Memdelega;
-    memgrppol: import("../raw_types/dosleg").Memgrppol;
     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_sen: import("../raw_types/dosleg").QuaSen;
     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;
-    sen: import("../raw_types/dosleg").Sen;
-    senbur: import("../raw_types/dosleg").Senbur;
-    sennom: import("../raw_types/dosleg").Sennom;
     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;
-    typapppol: import("../raw_types/dosleg").Typapppol;
     typatt: import("../raw_types/dosleg").Typatt;
     typaut: import("../raw_types/dosleg").Typaut;
     typdoc: import("../raw_types/dosleg").Typdoc;
@@ -79,7 +51,6 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
     typlec: import("../raw_types/dosleg").Typlec;
     typloi: import("kysely").Nullable<import("../raw_types/dosleg").Typloi>;
     typorg: import("../raw_types/dosleg").Typorg;
-    typorg_sen: import("../raw_types/dosleg").TyporgSen;
     typrap: import("../raw_types/dosleg").Typrap;
     typtxt: import("../raw_types/dosleg").Typtxt;
     typurl: import("../raw_types/dosleg").Typurl;

package/lib/model/questions.d.ts

@@ -1,12 +1,14 @@
 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_reponses: import("../raw_types/questions").TamReponses;
 }, "tam_questions" | "etatquestion" | "naturequestion" | "sortquestion" | "tam_ministeres", {
     date_publication_JO: string;
     republique: string | null;
@@ -34,6 +36,15 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
     texte: string | null;
     texte_erratum: string | null;
     rubrique: string | null;
+    themes: {
+        libelle: string;
+    }[];
+    reponses: {
+        date_reponse_JO: string;
+        ministere_reponse: string | null;
+        texte: string | null;
+        texte_erratum: string | null;
+    }[];
 }>;
 export declare function findAll(): AsyncIterableIterator<{
     date_publication_JO: string;
@@ -62,5 +73,14 @@ export declare function findAll(): AsyncIterableIterator<{
     texte: string | null;
     texte_erratum: string | null;
     rubrique: string | null;
+    themes: {
+        libelle: string;
+    }[];
+    reponses: {
+        date_reponse_JO: string;
+        ministere_reponse: string | null;
+        texte: string | null;
+        texte_erratum: string | null;
+    }[];
 }>;
 export {};

package/lib/model/questions.js

@@ -1,5 +1,34 @@
+import { jsonArrayFrom } from "kysely/helpers/postgres";
 import { dbQuestions } from "../databases";
-import { rtrim, toDateString } from "./util";
+import { expandToRows, rtrim, toDateString } from "./util";
+function reponses(questionId) {
+    return jsonArrayFrom(dbQuestions
+        .selectFrom("tam_reponses")
+        .where("tam_reponses.idque", "=", questionId)
+        .select(({ ref }) => [
+        toDateString(ref("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(({ eb, ref, val }) => [
+        "id as question_id",
+        eb
+            .cast(expandToRows(ref("tam_questions.themes"), val("#(\\d+)")), "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")
@@ -34,6 +63,8 @@ const findAllQuery = dbQuestions
     "tam_questions.txtque as texte",
     "tam_questions.txtque as texte_erratum",
     "tam_questions.rubrique as rubrique",
+    themes(ref("tam_questions.id")).as("themes"),
+    reponses(ref("tam_questions.id")).as("reponses"),
 ]);
 export function findAll() {
     return findAllQuery.stream();