@tricoteuses/senat 3.1.21 → 3.1.22

package/lib/src/sens.d.ts

@@ -0,0 +1,104 @@
+export interface FonctionRow {
+    date_debut: string | null;
+    date_fin: string | null;
+    libelle: string | null;
+}
+export interface MandatSenateurRow {
+    code_circonscription: string | null;
+    date_debut: string | null;
+    date_fin: string | null;
+    etat: string | null;
+    etat_debut: string | null;
+    etat_fin: string | null;
+}
+export interface MandatOrganismeRow {
+    code_organisme: string;
+    date_debut: string | null;
+    date_fin: string | null;
+    etat: string | null;
+    fonctions: FonctionRow[];
+    libelle: string | null;
+    type_code_organisme: string | null;
+    type_organisme: string | null;
+}
+export interface AdressePointContactRow {
+    bureau_distributeur: string | null;
+    code_cedex: string | null;
+    code_postal: string | null;
+    commune: string | null;
+    complement: string | null;
+    complement2: string | null;
+    libelle_cedex: string | null;
+    nom_voie: string | null;
+    numero_voie: string | null;
+}
+export interface TelephonePointContactRow {
+    numero: string | null;
+    type: string;
+}
+export interface PointContactRow {
+    adresses: AdressePointContactRow[];
+    id: string;
+    libelle: string | null;
+    telephones: TelephonePointContactRow[];
+    type: string;
+}
+export interface UrlRow {
+    code_url: string;
+    url: string;
+}
+export interface SenateurResult {
+    PCS_INSEE: string | null;
+    PCS_INSEE_24: string | null;
+    PCS_INSEE_42: string | null;
+    PCS_INSEE_8: string | null;
+    circonscription: string | null;
+    code_circonscription: string | null;
+    code_commission_permanente: string | null;
+    code_groupe_politique: string | null;
+    commission_permanente: string | null;
+    commissions: MandatOrganismeRow[];
+    courrier_electronique: string | null;
+    date_deces: string | null;
+    date_naissance: string | null;
+    delegations: MandatOrganismeRow[];
+    description_profession: string | null;
+    etat: string;
+    fonction_bureau_senat: string | null;
+    fonctions_bureau: FonctionRow[];
+    groupe_politique: string | null;
+    groupes: MandatOrganismeRow[];
+    mandats_senateur: MandatSenateurRow[];
+    matricule: string;
+    nom_usuel: string | null;
+    points_contact: PointContactRow[];
+    prenom_usuel: string;
+    qualite: string;
+    siege: string | null;
+    url_hatvp: string | null;
+    urls: UrlRow[];
+}
+export interface CirconscriptionResult {
+    article: string | null;
+    code: string;
+    date_debut: string | null;
+    date_fin: string | null;
+    etat: string | null;
+    identifiant: string;
+    libelle_departement: string;
+    libelle_region: string;
+    nombre_senateurs: string | null;
+    url: string | null;
+}
+export interface OrganismeResult {
+    code: string;
+    date_debut: string | null;
+    date_fin: string | null;
+    etat: string | null;
+    libelle: string | null;
+    libelle_court: string | null;
+    libelle_long: string | null;
+    type_code: string;
+    type_libelle: string | null;
+    url: string | null;
+}

package/lib/src/sens.js

@@ -0,0 +1 @@
+export {};

package/lib/src/server/ameli.js

@@ -94,17 +94,17 @@ export async function* findAllAmendements(fromSession) {
         "avigvt.lib as avis_gouvernement",
         eb.fn.coalesce("sor.lib", "irr.libirr").as("sort"),
         "amd.rev as revision",
-        sql `
-        (
-          case
-            when ${eb.ref("amd.num")} like '%COM%' then 'https://www.senat.fr/amendements/commissions/'
-            else 'https://www.senat.fr/amendements/'
-          end ||
-          ${eb.ref("ses.ann")}::text || '-' ||
-          (${eb.ref("ses.ann")}::integer + 1)::text || '/' ||
-          ${eb.ref("txt_ameli.numabs")} || '/Amdt_' ||
-          ${eb.ref("amd.num")} || '.html'
-        )
+        sql `
+        (
+          case
+            when ${eb.ref("amd.num")} like '%COM%' then 'https://www.senat.fr/amendements/commissions/'
+            else 'https://www.senat.fr/amendements/'
+          end ||
+          ${eb.ref("ses.ann")}::text || '-' ||
+          (${eb.ref("ses.ann")}::integer + 1)::text || '/' ||
+          ${eb.ref("txt_ameli.numabs")} || '/Amdt_' ||
+          ${eb.ref("amd.num")} || '.html'
+        )
       `.as("url"),
         "grppol_ameli.lilcou as au_nom_de_groupe_politique",
         sql `rtrim(${eb.ref("com_ameli.lil")})`.as("au_nom_de_commission"),
@@ -112,7 +112,6 @@ export async function* findAllAmendements(fromSession) {
         sql `(${eb.ref("cab.entid")} is not null)`.as("auteur_est_gouvernement"),
         // Sous-requête scalaire: numéro de scrutin
         eb
-            .withSchema("senat")
             .selectFrom("dosleg_amescr as amescr")
             .leftJoin("dosleg_scr as scr", (join) => join.onRef("amescr.scrnum", "=", "scr.scrnum").onRef("amescr.sesann", "=", "scr.sesann"))
             .leftJoin("dosleg_date_seance as date_seance", "date_seance.code", "scr.code")
@@ -124,7 +123,6 @@ export async function* findAllAmendements(fromSession) {
             .as("scrutin_num"),
         // Sous-requête pour les auteurs
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("ameli_amdsen as amdsen")
             .leftJoin("ameli_sen_ameli as sen_ameli", "sen_ameli.entid", "amdsen.senid")
             .leftJoin("ameli_grppol_ameli as grppol_ameli2", "grppol_ameli2.entid", "amdsen.grpid")

package/lib/src/server/conversion_textes.js

@@ -82,119 +82,119 @@ export async function convertSenatXmlToHtml(texteXml, outputFilePath) {
     }
     const metadata = extractMetadata(xmlDoc);
     const xmlBody = xmlDoc.querySelector("body");
-    const style = `
-body {
-  font-family: "URW Bookman", "Bookman Old Style", serif;
-  max-width: 800px;
-  margin: 40px auto;
-  line-height: 1.5;
-  color: #333;
-}
-.header {
-  text-align: center;
-  margin-bottom: 40px;
-  border-bottom: 2px solid #333;
-  padding-bottom: 20px;
-}
-.header-top {
-  font-weight: bold;
-  font-size: 1.2em;
-  margin-bottom: 10px;
-}
-.header-session {
-  text-transform: uppercase;
-  font-size: 0.9em;
-  margin-bottom: 5px;
-}
-.header-date {
-  font-size: 0.9em;
-  margin-bottom: 5px;
-}
-.header-number {
-  font-weight: bold;
-  font-size: 1.1em;
-  margin-bottom: 20px;
-}
-.header-type {
-  font-weight: bold;
-  font-size: 1.5em;
-  margin-top: 20px;
-}
-.header-authors {
-  margin-top: 20px;
-  font-style: italic;
-}
-.header-commission {
-  margin-top: 15px;
-  font-size: 0.9em;
-}
-h1 {
-  text-align: center;
-  font-size: 1.8em;
-  margin-top: 10px;
-}
-p {
-  margin: 0.6em 0;
-}
-p.has-alinea {
-  position: relative;
-  padding-left: 2.5em;
-}
-.alinea {
-  position: absolute;
-  left: 0;
-  top: 0.15em;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  min-width: 1.5em;
-  height: 1.5em;
-  padding: 0 0.3em;
-  margin-right: 0.3em;
-  font-size: 0.75em;
-  font-weight: bold;
-  color: #555;
-  background-color: #f0f0f0;
-  border: 1px solid #ccc;
-  border-radius: 1em;
-}
-.num {
-  font-weight: bold;
-  margin-right: 0.2em;
-}
-.article {
-  margin-top: 2em;
-}
-.article h3 {
-  border-bottom: 1px solid #eee;
-  padding-bottom: 5px;
-}
+    const style = `
+body {
+  font-family: "URW Bookman", "Bookman Old Style", serif;
+  max-width: 800px;
+  margin: 40px auto;
+  line-height: 1.5;
+  color: #333;
+}
+.header {
+  text-align: center;
+  margin-bottom: 40px;
+  border-bottom: 2px solid #333;
+  padding-bottom: 20px;
+}
+.header-top {
+  font-weight: bold;
+  font-size: 1.2em;
+  margin-bottom: 10px;
+}
+.header-session {
+  text-transform: uppercase;
+  font-size: 0.9em;
+  margin-bottom: 5px;
+}
+.header-date {
+  font-size: 0.9em;
+  margin-bottom: 5px;
+}
+.header-number {
+  font-weight: bold;
+  font-size: 1.1em;
+  margin-bottom: 20px;
+}
+.header-type {
+  font-weight: bold;
+  font-size: 1.5em;
+  margin-top: 20px;
+}
+.header-authors {
+  margin-top: 20px;
+  font-style: italic;
+}
+.header-commission {
+  margin-top: 15px;
+  font-size: 0.9em;
+}
+h1 {
+  text-align: center;
+  font-size: 1.8em;
+  margin-top: 10px;
+}
+p {
+  margin: 0.6em 0;
+}
+p.has-alinea {
+  position: relative;
+  padding-left: 2.5em;
+}
+.alinea {
+  position: absolute;
+  left: 0;
+  top: 0.15em;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 1.5em;
+  height: 1.5em;
+  padding: 0 0.3em;
+  margin-right: 0.3em;
+  font-size: 0.75em;
+  font-weight: bold;
+  color: #555;
+  background-color: #f0f0f0;
+  border: 1px solid #ccc;
+  border-radius: 1em;
+}
+.num {
+  font-weight: bold;
+  margin-right: 0.2em;
+}
+.article {
+  margin-top: 2em;
+}
+.article h3 {
+  border-bottom: 1px solid #eee;
+  padding-bottom: 5px;
+}
 `;
-    const htmlDocTemplate = `<!DOCTYPE html>
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-  <title>${metadata.title || "Document Sénat"}</title>
-  <style>${style}</style>
-</head>
-<body>
-  <div class="header">
-    <div class="header-top">SÉNAT</div>
-    <div class="header-session">SESSION ORDINAIRE DE ${metadata.session || "...."}</div>
-    ${metadata.date ? `<div class="header-date">Enregistré à la Présidence du Sénat le ${metadata.date}</div>` : ""}
-    <div class="header-number">N° ${metadata.number || "...."}</div>
-    <div class="header-type">${metadata.type || ""}</div>
-    <div class="header-authors">${metadata.authors || ""}</div>
+    const htmlDocTemplate = `<!DOCTYPE html>
+<html lang="fr">
+<head>
+  <meta charset="utf-8">
+  <title>${metadata.title || "Document Sénat"}</title>
+  <style>${style}</style>
+</head>
+<body>
+  <div class="header">
+    <div class="header-top">SÉNAT</div>
+    <div class="header-session">SESSION ORDINAIRE DE ${metadata.session || "...."}</div>
+    ${metadata.date ? `<div class="header-date">Enregistré à la Présidence du Sénat le ${metadata.date}</div>` : ""}
+    <div class="header-number">N° ${metadata.number || "...."}</div>
+    <div class="header-type">${metadata.type || ""}</div>
+    <div class="header-authors">${metadata.authors || ""}</div>
     ${metadata.commission
         ? [
             `<div class="header-commission">Envoyée à la ${metadata.commission.toLowerCase()},`,
             "sous réserve de la constitution éventuelle d'une commission spéciale dans les conditions prévues",
             "par le Règlement.</div>",
         ].join(" ")
-        : ""}
-  </div>
-  <h1>${metadata.title || ""}</h1>
-</body>
+        : ""}
+  </div>
+  <h1>${metadata.title || ""}</h1>
+</body>
 </html>`;
     const { document: htmlDoc } = new JSDOM(htmlDocTemplate).window;
     const body = htmlDoc.body;
@@ -218,7 +218,7 @@ p.has-alinea {
                 else if (child.nodeType === 1) {
                     const element = child;
                     const tagName = element.tagName.toLowerCase();
-                    let htmlElement = null;
+                    let htmlElement;
                     switch (tagName) {
                         case "article": {
                             htmlElement = htmlDoc.createElement("div");

package/lib/src/server/debats.js

@@ -13,7 +13,6 @@ export async function* findAll() {
         "debats.debsyn as etat_synchronisation",
         // Sections principales (PJL)
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("debats_secdis as secdis")
             .leftJoin("debats_typsec as typsec", "typsec.typseccod", "secdis.typseccod")
             .select((eb2) => [
@@ -26,7 +25,6 @@ export async function* findAll() {
             "secdis.lecassidt as lecture_id",
             // Interventions de la section
             jsonArrayFrom(eb2
-                .withSchema("senat")
                 .selectFrom("debats_intpjl as intpjl")
                 .leftJoin("dosleg_auteur as auteur", "auteur.autcod", "intpjl.autcod")
                 .select([
@@ -35,11 +33,11 @@ export async function* findAll() {
                 "intpjl.intfon as fonction_intervenant",
                 "intpjl.inturl as url",
                 "intpjl.intana as analyse",
-                sql `json_build_object(
-                    'code', auteur.autcod,
-                    'nom', auteur.nomuse,
-                    'prenom', auteur.prenom,
-                    'matricule', auteur.autmat
+                sql `json_build_object(
+                    'code', auteur.autcod,
+                    'nom', auteur.nomuse,
+                    'prenom', auteur.prenom,
+                    'matricule', auteur.autmat
                   )`.as("auteur"),
             ])
                 .whereRef("intpjl.secdiscle", "=", "secdis.secdiscle")
@@ -49,7 +47,6 @@ export async function* findAll() {
             .orderBy("secdis.secdisordid", "asc")).as("sections"),
         // Sections diverses
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("debats_secdivers as secdivers")
             .leftJoin("debats_typsec as typsec", "typsec.typseccod", "secdivers.typseccod")
             .select((eb2) => [
@@ -59,7 +56,6 @@ export async function* findAll() {
             "typsec.typseccat as categorie",
             // Interventions diverses
             jsonArrayFrom(eb2
-                .withSchema("senat")
                 .selectFrom("debats_intdivers as intdivers")
                 .leftJoin("dosleg_auteur as auteur", "auteur.autcod", "intdivers.autcod")
                 .select([
@@ -68,11 +64,11 @@ export async function* findAll() {
                 "intdivers.intfon as fonction_intervenant",
                 "intdivers.inturl as url",
                 "intdivers.intana as analyse",
-                sql `json_build_object(
-                    'code', auteur.autcod,
-                    'nom', auteur.nomuse,
-                    'prenom', auteur.prenom,
-                    'matricule', auteur.autmat
+                sql `json_build_object(
+                    'code', auteur.autcod,
+                    'nom', auteur.nomuse,
+                    'prenom', auteur.prenom,
+                    'matricule', auteur.autmat
                   )`.as("auteur"),
             ])
                 .whereRef("intdivers.secdiverscle", "=", "secdivers.secdiverscle")
@@ -81,7 +77,6 @@ export async function* findAll() {
             .whereRef("secdivers.datsea", "=", "debats.datsea")).as("sections_divers"),
         // Lectures
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("debats_lecassdeb as lecassdeb")
             .select(["lecassdeb.lecassidt as id"])
             .whereRef("lecassdeb.datsea", "=", "debats.datsea")).as("lectures"),

package/lib/src/server/documents.js

@@ -14,18 +14,18 @@ export async function* findAllTextes() {
         "loi.signet as signet_dossier",
         "texte.texnum as numero",
         "texte.orgcod as code_organisme",
-        sql `
-        case
-          when ${eb.ref("texte.texurl")} is not null then
-            regexp_replace(regexp_replace(trim(${eb.ref("texte.texurl")}), '#+$', ''), '^(.*/)?(.*?)(\\.html)?$', '\\2')
-          else null
-        end
+        sql `
+        case
+          when ${eb.ref("texte.texurl")} is not null then
+            regexp_replace(regexp_replace(trim(${eb.ref("texte.texurl")}), '#+$', ''), '^(.*/)?(.*?)(\\.html)?$', '\\2')
+          else null
+        end
       `.as("id"),
-        sql `
-        case
-          when ${eb.ref("texte.typurl")} = 'I' then regexp_replace('https://www.senat.fr/leg/' || rtrim(${eb.ref("texte.texurl")}), '#+$', '')
-          else regexp_replace(rtrim(${eb.ref("texte.texurl")}), '#+$', '')
-        end
+        sql `
+        case
+          when ${eb.ref("texte.typurl")} = 'I' then regexp_replace('https://www.senat.fr/leg/' || rtrim(${eb.ref("texte.texurl")}), '#+$', '')
+          else regexp_replace(rtrim(${eb.ref("texte.texurl")}), '#+$', '')
+        end
       `.as("url"),
         sql `rtrim(${eb.ref("oritxt.oritxtlib")})`.as("origine"),
         "oritxt.oriordre as ordre_origine",
@@ -36,7 +36,6 @@ export async function* findAllTextes() {
         sql `${eb.ref("texte.sesann")}::int`.as("session"),
         // Auteurs
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("dosleg_auteur as auteur")
             .leftJoin("dosleg_ecr as ecr", "ecr.autcod", "auteur.autcod")
             .leftJoin("dosleg_rolsig as rolsig", "rolsig.signataire", "ecr.signataire")
@@ -75,18 +74,18 @@ export async function* findAllRapports() {
         "loi.signet as signet_dossier",
         "rap.rapnum as numero",
         "raporg.orgcod as code_organisme",
-        sql `
-        case
-          when ${eb.ref("rap.rapurl")} is not null then
-            regexp_replace(regexp_replace(trim(${eb.ref("rap.rapurl")}), '#+$', ''), '^(.*/)?(.*?)(\\.html)?$', '\\2')
-          else null
-        end
+        sql `
+        case
+          when ${eb.ref("rap.rapurl")} is not null then
+            regexp_replace(regexp_replace(trim(${eb.ref("rap.rapurl")}), '#+$', ''), '^(.*/)?(.*?)(\\.html)?$', '\\2')
+          else null
+        end
       `.as("id"),
-        sql `
-        case
-          when ${eb.ref("rap.typurl")} = 'I' then regexp_replace('https://www.senat.fr/rap/' || rtrim(${eb.ref("rap.rapurl")}), '#+$', '')
-          else regexp_replace(rtrim(${eb.ref("rap.rapurl")}), '#+$', '')
-        end
+        sql `
+        case
+          when ${eb.ref("rap.typurl")} = 'I' then regexp_replace('https://www.senat.fr/rap/' || rtrim(${eb.ref("rap.rapurl")}), '#+$', '')
+          else regexp_replace(rtrim(${eb.ref("rap.rapurl")}), '#+$', '')
+        end
       `.as("url"),
         sql `rtrim(${eb.ref("denrap.libdenrap")})`.as("type"),
         sql `rtrim(rtrim(${eb.ref("rap.raptil")}))`.as("titre"),
@@ -95,7 +94,6 @@ export async function* findAllRapports() {
         sql `${eb.ref("rap.sesann")}::int`.as("session"),
         // Auteurs
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("dosleg_auteur as auteur")
             .leftJoin("dosleg_ecr as ecr", "ecr.autcod", "auteur.autcod")
             .leftJoin("dosleg_rolsig as rolsig", "rolsig.signataire", "ecr.signataire")
@@ -111,7 +109,6 @@ export async function* findAllRapports() {
             .whereRef("ecr.rapcod", "=", "rap.rapcod")).as("auteurs"),
         // Documents annexes
         jsonArrayFrom(eb
-            .withSchema("senat")
             .selectFrom("dosleg_docatt as docatt")
             .leftJoin("dosleg_typatt as typatt", "typatt.typattcod", "docatt.typattcod")
             .select(["docatt.docatturl as url", "typatt.typattlib as type_document"])