@tricoteuses/senat 2.8.6 → 2.9.1

package/lib/model/dosleg.ts

@@ -1,204 +0,0 @@
-import { Expression, InferResult, NotNull, sql } from "kysely"
-import { dbDosleg } from "../databases"
-import { jsonArrayFrom } from "kysely/helpers/postgres"
-
-function datesSeances (lectureAssembleeId: Expression<string>) {
-  return jsonArrayFrom(
-    dbDosleg.selectFrom("date_seance")
-      .where("date_seance.lecidt", "=", lectureAssembleeId)
-      .select([
-        "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) => [
-        "rap.rapnum as numero",
-        sql<string>`rtrim(denrap.libdenrap)`.as("type_rapport"),
-        eb.case()
-          .when("rap.typurl", "=", "I")
-          .then(sql<string>`concat('https://www.senat.fr/rap/', rtrim(rap.rapurl))`)
-          .else(sql<string>`rtrim(rap.rapurl)`)
-          .end()
-          .as("url"),
-        "rap.date_depot as date_depot",
-        auteursRapport(eb.ref("rap.rapcod")).as("auteurs"),
-        organismesRapport(eb.ref("rap.rapcod")).as("organismes"),
-      ]),
-  )
-}
-
-function auteursTextes (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) => [
-        "texte.texnum as numero",
-        eb.case()
-          .when("texte.typurl", "=", "I")
-          .then(sql<string>`concat('https://www.senat.fr/leg/', rtrim(texte.texurl))`)
-          .else(sql<string>`rtrim(texte.texurl)`)
-          .end()
-          .as("url"),
-        sql<string>`rtrim(oritxt.oritxtlib)`.as("origine_texte"),
-        sql<string>`rtrim(typtxt.typtxtlib)`.as("type_texte"),
-        "texte.txtoritxtdat as date",
-        "sesann as session",
-        auteursTextes(eb.ref("texte.texcod")).as("auteurs"),
-      ])
-      .orderBy(sql`array_position(array['0','2','1'], 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 }) => [
-        sql<string>`rtrim(ass.libass)`.as("assemblee"),
-        "org.orgnom as libelle_organisme",
-        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 }) => [
-        sql<string>`rtrim(typlec.typleclib)`.as("type_lecture"),
-        sql<string>`rtrim(lecture.leccom)`.as("libelle"),
-        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(({ ref }) => [
-    "loi.signet as signet",
-    sql<string>`concat('https://www.senat.fr/dossier-legislatif/', loi.signet, '.html')`.as("url"),
-    sql<string>`concat(rtrim(typloi.typloilib), ' ', rtrim(loi.loitit))`.as("titre"),
-    sql<string>`rtrim(typloi.typloilib)`.as("type_dossier"),
-    sql<string>`rtrim(etaloi.etaloilib)`.as("etat_dossier"),
-    "loi.url_an as url_dossier_assemblee_nationale",
-    //" as decision_conseil_constitutionnel", // TODO
-    //" as date_decision_conseil_constitutionnel", // TODO
-    "loi.date_loi as date_promulgation",
-    "loi.numero as numero_loi",
-    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<{
-  url: string,
-  session: string | null | undefined
-}> {
-  return dbDosleg
-    .selectFrom("texte")
-    .where("texurl", "is not", null)
-    .where("typurl", "=", "I")
-    .$if(sessions.length > 0, (qb) => qb
-      .where("sesann", "in", sessions),
-    )
-    .select([
-      sql<string>`rtrim(texurl)`.as("url"),
-      "sesann as session",
-    ])
-    .$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([
-      sql<string>`rtrim(rapurl)`.as("url"),
-      "sesann as session",
-    ])
-    .$narrowType<{ url: NotNull }>()
-    .stream()
-}
-
-export type DossierLegislatifResult = InferResult<typeof findAllQuery>[0]

package/lib/model/index.mjs

@@ -1,4 +0,0 @@
-export { findAll as findAllLois, } from "./dosleg";
-export { findAll as findAllQuestions, getDbSchema as getQuestionsDbSchema, } from "./questions";
-export { findAll as findAllSens, findAllCirconscriptions, getDbSchema as getSensDbSchema, } from "./sens";
-export { allFollows, Aggregator } from "../aggregates";

package/lib/model/index.ts

@@ -1,13 +0,0 @@
-export {
-  findAll as findAllLois,
-} from "./dosleg"
-export {
-  findAll as findAllQuestions,
-  getDbSchema as getQuestionsDbSchema,
-} from "./questions"
-export {
-  findAll as findAllSens,
-  findAllCirconscriptions,
-  getDbSchema as getSensDbSchema,
-} from "./sens"
-export { allFollows, Aggregator } from "../aggregates"

package/lib/model/questions.mjs

@@ -1,76 +0,0 @@
-import { sql } from "kysely";
-import { jsonArrayFrom } from "kysely/helpers/postgres";
-import { dbQuestions } from "../databases";
-function reponses(questionId) {
-    return jsonArrayFrom(dbQuestions.selectFrom("tam_reponses")
-        .where("tam_reponses.idque", "=", questionId)
-        .select([
-        "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([
-        "id as question_id",
-        eb => eb
-            .cast(sql `unnest(regexp_matches(tam_questions.themes, '#(\\d+)', 'g'))`, "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([
-    "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",
-    "tam_questions.datejodepot as date_publication_JO",
-    "tam_questions.mindepotlib as ministere_depot",
-    "tam_ministeres.datedebut as ministere_depot_date_debut",
-    "tam_questions.datejotran as date_transmission",
-    "tam_questions.mintranlib as ministere_transmission",
-    "tam_questions.datejorep1 as date_reponse_JO",
-    "tam_questions.minreplib1 as ministere_reponse",
-    "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();
-}
-export function getDbSchema() {
-    return dbQuestions.introspection.getTables();
-}

package/lib/model/questions.ts

@@ -1,102 +0,0 @@
-import { Expression, InferResult, sql } from "kysely"
-import { jsonArrayFrom } from "kysely/helpers/postgres"
-
-import { dbQuestions } from "../databases"
-
-function reponses (questionId: Expression<string>) {
-  return jsonArrayFrom(
-    dbQuestions.selectFrom("tam_reponses")
-      .where("tam_reponses.idque", "=", questionId)
-      .select([
-        "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([
-        "id as question_id",
-        eb => eb
-          .cast<number>(
-            sql`unnest(regexp_matches(tam_questions.themes, '#(\\d+)', 'g'))`,
-            "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([
-    "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",
-    "tam_questions.datejodepot as date_publication_JO",
-    "tam_questions.mindepotlib as ministere_depot",
-    "tam_ministeres.datedebut as ministere_depot_date_debut",
-    "tam_questions.datejotran as date_transmission",
-    "tam_questions.mintranlib as ministere_transmission",
-    "tam_questions.datejorep1 as date_reponse_JO",
-    "tam_questions.minreplib1 as ministere_reponse",
-    "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()
-}
-
-export function getDbSchema() {
-  return dbQuestions.introspection.getTables()
-}