@tricoteuses/senat 2.22.5 → 2.22.7

package/lib/model/dosleg.mjs

@@ -1,196 +0,0 @@
-import { sql } from "kysely";
-import { jsonArrayFrom } from "kysely/helpers/postgres";
-import { dbDosleg } 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)
-        .select(({ ref }) => [
-        toDateString(ref("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, ref, val }) => [
-        "rap.rapnum as numero",
-        rtrim(ref("denrap.libdenrap")).as("type_rapport"),
-        eb.case()
-            .when("rap.typurl", "=", "I")
-            .then(concat(val("https://www.senat.fr/rap/"), rtrim(ref("rap.rapurl"))))
-            .else(rtrim(ref("rap.rapurl")))
-            .end()
-            .as("url"),
-        toDateString(ref("rap.date_depot")).as("date_depot"),
-        auteursRapport(ref("rap.rapcod")).as("auteurs"),
-        organismesRapport(ref("rap.rapcod")).as("organismes"),
-    ]));
-}
-function auteursTexte(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, ref, val }) => [
-        "texte.texnum as numero",
-        eb.case()
-            .when("texte.typurl", "=", "I")
-            .then(removeSubstring(ref("texte.texurl"), val(".html")))
-            .else(null)
-            .end()
-            .as("id"),
-        eb.case()
-            .when("texte.typurl", "=", "I")
-            .then(concat(val("https://www.senat.fr/leg/"), rtrim(ref("texte.texurl"))))
-            .else(rtrim(ref("texte.texurl")))
-            .end()
-            .as("url"),
-        rtrim(ref("oritxt.oritxtlib")).as("origine_texte"),
-        rtrim(ref("typtxt.typtxtlib")).as("type_texte"),
-        toDateString(ref("texte.txtoritxtdat")).as("date"),
-        "sesann as session",
-        auteursTexte(ref("texte.texcod")).as("auteurs"),
-    ])
-        .orderBy(({ ref }) => orderOrdreOrigineTexte(ref("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 }) => [
-        rtrim(ref("ass.libass")).as("assemblee"),
-        "org.orgnom as libelle_organisme",
-        "org.orgcod as code_organisme",
-        "lecass.ordreass as ordre_lecture_assemblee",
-        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 }) => [
-        rtrim(ref("typlec.typleclib")).as("type_lecture"),
-        rtrim(ref("lecture.leccom")).as("libelle"),
-        "typlec.typlecord as ordre_lecture",
-        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(({ eb, ref, val }) => [
-    "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"),
-    rtrim(ref("loi.loient")).as("titre_court"),
-    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",
-    toDateString(ref("loi.date_decision")).as("date_decision_CoC"),
-    "loi.num_decision as num_decision_CoC",
-    "loi.deccocurl as url_decision_CoC",
-    toDateString(ref("loi.saisine_date")).as("date_saisine_CoC"),
-    "loi.saisine_par as condition_saisine_CoC",
-    toDateString(ref("loi.date_loi")).as("date_promulgation"),
-    "loi.numero as numero_loi",
-    eb.case()
-        .when("loi.loititjo", "is not", null)
-        .then(concat(rtrim(ref("typloi.typloiden")), val(" "), rtrim(ref("loi.loititjo"))))
-        .else("")
-        .end()
-        .as("titre_JO"),
-    toDateString(ref("loi.loidatjo")).as("date_publication_JO"),
-    "loi.loinumjo as numero_JO",
-    "loi.url_jo as url_JO",
-    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, 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 = []) {
-    return dbDosleg
-        .selectFrom("rap")
-        .where("rapurl", "is not", null)
-        .where("typurl", "=", "I")
-        .$if(sessions.length > 0, (qb) => qb
-        .where("sesann", "in", sessions))
-        .select(({ ref }) => [
-        rtrim(ref("rapurl")).as("url"),
-        "sesann as session",
-    ])
-        .$narrowType()
-        .stream();
-}

package/lib/model/dosleg.ts

@@ -1,240 +0,0 @@
-import { Expression, InferResult, NotNull, sql } from "kysely"
-import { jsonArrayFrom } from "kysely/helpers/postgres"
-
-import { dbDosleg } from "../databases"
-import { concat, removeSubstring, rtrim, toDateString } from "./util"
-
-function orderOrdreOrigineTexte (expr: Expression<string | null | undefined>) {
-  return sql`array_position(array['0','2','1'], ${expr})`
-}
-
-function datesSeances (lectureAssembleeId: Expression<string>) {
-  return jsonArrayFrom(
-    dbDosleg.selectFrom("date_seance")
-      .where("date_seance.lecidt", "=", lectureAssembleeId)
-      .select(({ ref }) => [
-        toDateString(ref("date_seance.date_s")).as("date"),
-      ]),
-  )
-}
-
-function organismesRapport (rapportId: Expression<string>) {
-  return jsonArrayFrom(
-    dbDosleg.selectFrom("org")
-      .leftJoin("raporg", "raporg.orgcod", "org.orgcod")
-      .where("raporg.rapcod", "=", rapportId)
-      .select([
-        "org.orgnom as libelle",
-      ]),
-  )
-}
-
-function auteursRapport (rapportId: Expression<string>) {
-  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: Expression<string>) {
-  return jsonArrayFrom(
-    dbDosleg.selectFrom("rap")
-      .leftJoin("lecassrap", "lecassrap.rapcod", "rap.rapcod")
-      .leftJoin("denrap", "denrap.coddenrap", "rap.coddenrap")
-      .where("lecassrap.lecassidt", "=", lectureAssembleeId)
-      .select(({ eb, ref, val }) => [
-        "rap.rapnum as numero",
-        rtrim(ref("denrap.libdenrap")).as("type_rapport"),
-        eb.case()
-          .when("rap.typurl", "=", "I")
-          .then(concat(val("https://www.senat.fr/rap/"), rtrim(ref("rap.rapurl"))))
-          .else(rtrim(ref("rap.rapurl")))
-          .end()
-          .as("url"),
-        toDateString(ref("rap.date_depot")).as("date_depot"),
-        auteursRapport(ref("rap.rapcod")).as("auteurs"),
-        organismesRapport(ref("rap.rapcod")).as("organismes"),
-      ]),
-  )
-}
-
-function auteursTexte (texteId: Expression<string>) {
-  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: Expression<string>) {
-  return jsonArrayFrom(
-    dbDosleg.selectFrom("texte")
-      .leftJoin("oritxt", "oritxt.oritxtcod", "texte.oritxtcod")
-      .leftJoin("typtxt", "typtxt.typtxtcod", "texte.typtxtcod")
-      .where("texte.lecassidt", "=", lectureAssembleeId)
-      .select(({ eb, ref, val }) => [
-        "texte.texnum as numero",
-        eb.case()
-          .when("texte.typurl", "=", "I")
-          .then(removeSubstring(ref("texte.texurl"), val(".html")))
-          .else(null)
-          .end()
-          .as("id"),
-        eb.case()
-          .when("texte.typurl", "=", "I")
-          .then(concat(val("https://www.senat.fr/leg/"), rtrim(ref("texte.texurl"))))
-          .else(rtrim(ref("texte.texurl")))
-          .end()
-          .as("url"),
-        rtrim(ref("oritxt.oritxtlib")).as("origine_texte"),
-        rtrim(ref("typtxt.typtxtlib")).as("type_texte"),
-        toDateString(ref("texte.txtoritxtdat")).as("date"),
-        "sesann as session",
-        auteursTexte(ref("texte.texcod")).as("auteurs"),
-      ])
-      .orderBy(({ ref }) => orderOrdreOrigineTexte(ref("oritxt.oriordre")))
-  )
-}
-
-function lecturesAssemblee (lectureId: Expression<string>) {
-  return jsonArrayFrom(
-    dbDosleg.selectFrom("lecass")
-      .where("lecass.lecidt", "=", lectureId)
-      .leftJoin("ass", "ass.codass", "lecass.codass")
-      .leftJoin("org", "org.orgcod", "lecass.orgcod")
-      .select(({ ref }) => [
-        rtrim(ref("ass.libass")).as("assemblee"),
-        "org.orgnom as libelle_organisme",
-        "org.orgcod as code_organisme",
-        "lecass.ordreass as ordre_lecture_assemblee",
-        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: Expression<string>) {
-  return jsonArrayFrom(
-    dbDosleg.selectFrom("lecture")
-      .leftJoin("typlec", "typlec.typleccod", "lecture.typleccod")
-      .where("lecture.loicod", "=", loiId)
-      .select(({ ref }) => [
-        rtrim(ref("typlec.typleclib")).as("type_lecture"),
-        rtrim(ref("lecture.leccom")).as("libelle"),
-        "typlec.typlecord as ordre_lecture",
-        lecturesAssemblee(ref("lecture.lecidt")).as("lectures_assemblee"),
-      ])
-      .orderBy("typlec.typlecord", "asc"),
-  )
-}
-
-function themes (loiId: Expression<string>) {
-  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(({ eb, ref, val }) => [
-    "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"),
-    rtrim(ref("loi.loient")).as("titre_court"),
-    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",
-    toDateString(ref("loi.date_decision")).as("date_decision_CoC"),
-    "loi.num_decision as num_decision_CoC",
-    "loi.deccocurl as url_decision_CoC",
-    toDateString(ref("loi.saisine_date")).as("date_saisine_CoC"),
-    "loi.saisine_par as condition_saisine_CoC",
-    toDateString(ref("loi.date_loi")).as("date_promulgation"),
-    "loi.numero as numero_loi",
-    eb.case()
-      .when("loi.loititjo", "is not", null)
-      .then(concat(rtrim(ref("typloi.typloiden")), val(" "), rtrim(ref("loi.loititjo"))))
-      .else("")
-      .end()
-      .as("titre_JO"),
-    toDateString(ref("loi.loidatjo")).as("date_publication_JO"),
-    "loi.loinumjo as numero_JO",
-    "loi.url_jo as url_JO",
-    lectures(ref("loi.loicod")).as("lectures"),
-    themes(ref("loi.loicod")).as("themes"),
-  ])
-  .$narrowType<{ signet: NotNull }>()
-
-export function findAll () {
-  return findAllQuery.stream()
-}
-
-export function findSenatTexteUrls (sessions: string[] = []): AsyncIterableIterator<{
-  session: string | null | undefined,
-  url: string,
-  hasExposeDesMotifs: boolean,
-}> {
-  return dbDosleg
-    .selectFrom("texte")
-    .where("texurl", "is not", null)
-    .where("typurl", "=", "I")
-    .$if(sessions.length > 0, (qb) => qb
-      .where("sesann", "in", sessions),
-    )
-    .select(({ eb, ref }) => [
-      "sesann as session",
-      rtrim(ref("texurl")).as("url"),
-      eb.case()
-        .when("oritxtcod", "=", "1")
-        .then(true)
-        .else(false)
-        .end()
-        .as("hasExposeDesMotifs"),
-    ])
-    .$narrowType<{ url: NotNull }>()
-    .stream()
-}
-
-export function findSenatRapportUrls (sessions: string[] = []): AsyncIterableIterator<{
-  url: string,
-  session: string | null | undefined
-}> {
-  return dbDosleg
-    .selectFrom("rap")
-    .where("rapurl", "is not", null)
-    .where("typurl", "=", "I")
-    .$if(sessions.length > 0, (qb) => qb
-      .where("sesann", "in", sessions),
-    )
-    .select(({ ref }) => [
-      rtrim(ref("rapurl")).as("url"),
-      "sesann as session",
-    ])
-    .$narrowType<{ url: NotNull }>()
-    .stream()
-}
-
-export type DossierLegislatifResult = InferResult<typeof findAllQuery>[0]

package/lib/model/index.mjs

@@ -1,5 +0,0 @@
-export { findAll as findAllAmendements, } from "./ameli";
-export { findAll as findAllLois, } from "./dosleg";
-export { findAll as findAllQuestions, } from "./questions";
-export { findAll as findAllSens, findAllCirconscriptions, findAllOrganismes, } from "./sens";
-export { allFollows, Aggregator } from "../aggregates";

package/lib/model/index.ts

@@ -1,15 +0,0 @@
-export {
-  findAll as findAllAmendements,
-} from "./ameli"
-export {
-  findAll as findAllLois,
-} from "./dosleg"
-export {
-  findAll as findAllQuestions,
-} from "./questions"
-export {
-  findAll as findAllSens,
-  findAllCirconscriptions,
-  findAllOrganismes,
-} from "./sens"
-export { allFollows, Aggregator } from "../aggregates"

package/lib/model/questions.mjs

@@ -1,71 +0,0 @@
-import { jsonArrayFrom } from "kysely/helpers/postgres";
-import { dbQuestions } from "../databases";
-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")
-    .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(({ ref }) => [
-    "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",
-    toDateString(ref("tam_questions.datejodepot")).as("date_publication_JO"),
-    rtrim(ref("tam_questions.mindepotlib")).as("ministere_depot"),
-    toDateString(ref("tam_ministeres.datedebut")).as("ministere_depot_date_debut"),
-    toDateString(ref("tam_questions.datejotran")).as("date_transmission"),
-    "tam_questions.mintranlib as ministere_transmission",
-    toDateString(ref("tam_questions.datejorep1")).as("date_reponse_JO"),
-    "tam_questions.minreplib1 as ministere_reponse",
-    toDateString(ref("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();
-}

package/lib/model/questions.ts

@@ -1,93 +0,0 @@
-import { Expression, InferResult } from "kysely"
-import { jsonArrayFrom } from "kysely/helpers/postgres"
-import { dbQuestions } from "../databases"
-import { expandToRows, rtrim, toDateString } from "./util"
-
-function reponses (questionId: Expression<string>) {
-  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: Expression<string>) {
-  return jsonArrayFrom(
-    dbQuestions.with("question_theme", (db) => db
-      .selectFrom("tam_questions")
-      .select(({ eb, ref, val }) => [
-        "id as question_id",
-         eb.cast<number>(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")
-  .leftJoin("sortquestion", (join) => join
-    .onRef(
-      "tam_questions.sorquecod",
-      "=",
-      eb => eb.cast<number>("sortquestion.sorquecod", "bigint"),
-    ),
-  )
-  .leftJoin("naturequestion", "tam_questions.natquecod", "naturequestion.natquecod")
-  .leftJoin("etatquestion", (join) => join
-    .onRef(
-      "tam_questions.etaquecod",
-      "=",
-      eb => eb.cast<number>("etatquestion.etaquecod", "bigint"),
-    ),
-  )
-  .select(({ ref }) => [
-    "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",
-    toDateString(ref("tam_questions.datejodepot")).as("date_publication_JO"),
-    rtrim(ref("tam_questions.mindepotlib")).as("ministere_depot"),
-    toDateString(ref("tam_ministeres.datedebut")).as("ministere_depot_date_debut"),
-    toDateString(ref("tam_questions.datejotran")).as("date_transmission"),
-    "tam_questions.mintranlib as ministere_transmission",
-    toDateString(ref("tam_questions.datejorep1")).as("date_reponse_JO"),
-    "tam_questions.minreplib1 as ministere_reponse",
-    toDateString(ref("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 type QuestionResult = InferResult<typeof findAllQuery>[0]
-
-export function findAll () {
-  return findAllQuery.stream()
-}