@tricoteuses/senat 2.19.6 → 2.19.8

package/lib/datasets.js

@@ -31,24 +31,16 @@ export const datasets = {
                 { name: "idx_senid", columns: ["senid"] },
                 { name: "idx_grpid", columns: ["grpid"] },
             ],
-            sen_ameli: [
-                { name: "idx_entid", columns: ["entid"] },
-            ],
-            grppol_ameli: [
-                { name: "idx_entid", columns: ["entid"] },
-            ],
+            sen_ameli: [{ name: "idx_entid", columns: ["entid"] }],
+            grppol_ameli: [{ name: "idx_entid", columns: ["entid"] }],
             sub: [
                 { name: "idx_id", columns: ["id"] },
                 { name: "idx_typid", columns: ["typid"] },
                 { name: "idx_merid", columns: ["merid"] },
                 { name: "idx_comdelid", columns: ["comdelid"] },
             ],
-            typsub: [
-                { name: "idx_id", columns: ["id"] },
-            ],
-            typrect: [
-                { name: "idx_id", columns: ["id"] },
-            ],
+            typsub: [{ name: "idx_id", columns: ["id"] }],
+            typrect: [{ name: "idx_id", columns: ["id"] }],
             txt_ameli: [
                 { name: "idx_id", columns: ["id"] },
                 { name: "idx_txtetaid", columns: ["txtetaid"] },
@@ -56,44 +48,22 @@ export const datasets = {
                 { name: "idx_natid", columns: ["natid"] },
                 { name: "idx_lecid", columns: ["lecid"] },
             ],
-            etatxt: [
-                { name: "idx_id", columns: ["id"] },
-            ],
+            etatxt: [{ name: "idx_id", columns: ["id"] }],
             ses: [
                 { name: "idx_id", columns: ["id"] },
                 { name: "idx_typid", columns: ["typid"] },
-                { name: "idx_ann", columns: ["ann"] }
-            ],
-            typses: [
-                { name: "idx_id", columns: ["id"] },
-            ],
-            nat: [
-                { name: "idx_id", columns: ["id"] },
-            ],
-            lec_ameli: [
-                { name: "idx_id", columns: ["id"] },
-            ],
-            mot: [
-                { name: "idx_id", columns: ["id"] },
-            ],
-            avicom: [
-                { name: "idx_id", columns: ["id"] },
-            ],
-            avigvt: [
-                { name: "idx_id", columns: ["id"] },
-            ],
-            sor: [
-                { name: "idx_id", columns: ["id"] },
-            ],
-            irr: [
-                { name: "idx_id", columns: ["id"] },
-            ],
-            com_ameli: [
-                { name: "idx_entid", columns: ["entid"] },
-            ],
-            cab: [
-                { name: "idx_entid", columns: ["entid"] },
-            ],
+                { name: "idx_ann", columns: ["ann"] },
+            ],
+            typses: [{ name: "idx_id", columns: ["id"] }],
+            nat: [{ name: "idx_id", columns: ["id"] }],
+            lec_ameli: [{ name: "idx_id", columns: ["id"] }],
+            mot: [{ name: "idx_id", columns: ["id"] }],
+            avicom: [{ name: "idx_id", columns: ["id"] }],
+            avigvt: [{ name: "idx_id", columns: ["id"] }],
+            sor: [{ name: "idx_id", columns: ["id"] }],
+            irr: [{ name: "idx_id", columns: ["id"] }],
+            com_ameli: [{ name: "idx_entid", columns: ["entid"] }],
+            cab: [{ name: "idx_entid", columns: ["entid"] }],
             amd: [
                 { name: "idx_subid", columns: ["subid"] },
                 { name: "idx_typrectid", columns: ["typrectid"] },
@@ -117,19 +87,13 @@ export const datasets = {
                 { name: "idx_datsea", columns: ["datsea"] },
                 { name: "idx_typseccod", columns: ["typseccod"] },
             ],
-            intpjl: [
-                { name: "idx_secdiscle", columns: ["secdiscle"] },
-            ],
+            intpjl: [{ name: "idx_secdiscle", columns: ["secdiscle"] }],
             secdivers: [
                 { name: "idx_datsea", columns: ["datsea"] },
                 { name: "idx_typseccod", columns: ["typseccod"] },
             ],
-            intdivers: [
-                { name: "idx_intdiverscle", columns: ["intdiverscle"] },
-            ],
-            lecassdeb: [
-                { name: "idx_datsea", columns: ["datsea"] },
-            ],
+            intdivers: [{ name: "idx_intdiverscle", columns: ["intdiverscle"] }],
+            lecassdeb: [{ name: "idx_datsea", columns: ["datsea"] }],
         },
     },
     dosleg: {
@@ -138,25 +102,15 @@ export const datasets = {
         title: "Dossiers législatifs",
         url: "https://data.senat.fr/data/dosleg/dosleg.zip",
         indexes: {
-            amescr: [
-                { name: "idx_scrnum", columns: ["scrnum"] },
-            ],
-            auteur: [
-                { name: "idx_autcod", columns: ["autcod"] },
-            ],
-            corscr: [
-                { name: "idx_scrnum", columns: ["scrnum"] },
-            ],
+            amescr: [{ name: "idx_scrnum", columns: ["scrnum"] }],
+            auteur: [{ name: "idx_autcod", columns: ["autcod"] }],
+            corscr: [{ name: "idx_scrnum", columns: ["scrnum"] }],
             date_seance: [
                 { name: "idx_code", columns: ["code"] },
                 { name: "idx_lecidt", columns: ["lecidt"] },
             ],
-            deccoc: [
-                { name: "idx_deccoccod", columns: ["deccoccod"] },
-            ],
-            etaloi: [
-                { name: "idx_etaloicod", columns: ["etaloicod"] },
-            ],
+            deccoc: [{ name: "idx_deccoccod", columns: ["deccoccod"] }],
+            etaloi: [{ name: "idx_etaloicod", columns: ["etaloicod"] }],
             lecass: [
                 { name: "idx_lecidt", columns: ["lecidt"] },
                 { name: "idx_codass", columns: ["codass"] },
@@ -182,42 +136,28 @@ export const datasets = {
                 { name: "idx_thecle", columns: ["thecle"] },
                 { name: "idx_loicod", columns: ["loicod"] },
             ],
-            posvot: [
-                { name: "idx_posvotcod", columns: ["posvotcod"] },
-            ],
+            posvot: [{ name: "idx_posvotcod", columns: ["posvotcod"] }],
             rap: [
                 { name: "idx_rapcod", columns: ["rapcod"] },
                 { name: "idx_coddenrap", columns: ["coddenrap"] },
             ],
-            rolsig: [
-                { name: "idx_signataire", columns: ["signataire"] },
-            ],
+            rolsig: [{ name: "idx_signataire", columns: ["signataire"] }],
             scr: [
                 { name: "idx_code", columns: ["code"] },
                 { name: "idx_scrnum", columns: ["scrnum"] },
                 { name: "idx_sesann", columns: ["sesann"] },
             ],
-            stavot: [
-                { name: "idx_stavotidt", columns: ["stavotidt"] },
-            ],
+            stavot: [{ name: "idx_stavotidt", columns: ["stavotidt"] }],
             texte: [
                 { name: "idx_lecassidt", columns: ["lecassidt"] },
                 { name: "idx_oritxtcod", columns: ["oritxtcod"] },
                 { name: "idx_typtxtcod", columns: ["typtxtcod"] },
                 { name: "idx_texcod", columns: ["texcod"] },
             ],
-            the: [
-                { name: "idx_thecle", columns: ["thecle"] },
-            ],
-            titsen: [
-                { name: "idx_titsencod", columns: ["titsencod"] },
-            ],
-            typloi: [
-                { name: "idx_typloicod", columns: ["typloicod"] },
-            ],
-            typtxt: [
-                { name: "idx_typtxtcod", columns: ["typtxtcod"] },
-            ],
+            the: [{ name: "idx_thecle", columns: ["thecle"] }],
+            titsen: [{ name: "idx_titsencod", columns: ["titsencod"] }],
+            typloi: [{ name: "idx_typloicod", columns: ["typloicod"] }],
+            typtxt: [{ name: "idx_typtxtcod", columns: ["typtxtcod"] }],
             votsen: [
                 { name: "idx_scrnum", columns: ["scrnum"] },
                 { name: "idx_sesann", columns: ["sesann"] },
@@ -234,22 +174,14 @@ export const datasets = {
         title: "Questions écrites et orales posées par les sénateurs au Gouvernement",
         url: "https://data.senat.fr/data/questions/questions.zip",
         indexes: {
-            tam_reponses: [
-                { name: "idx_idque", columns: ["idque"] },
-            ],
+            tam_reponses: [{ name: "idx_idque", columns: ["idque"] }],
             tam_questions: [
                 { name: "idx_sorquecod", columns: ["sorquecod"] },
                 { name: "idx_etaquecod", columns: ["etaquecod"] },
             ],
-            the: [
-                { name: "idx_thenouidt", columns: ["thenouidt"] },
-            ],
-            sortquestion: [
-                { name: "idx_sorquecod", columns: ["sorquecod"] },
-            ],
-            etatquestion: [
-                { name: "idx_etaquecod", columns: ["etaquecod"] },
-            ],
+            the: [{ name: "idx_thenouidt", columns: ["thenouidt"] }],
+            sortquestion: [{ name: "idx_sorquecod", columns: ["sorquecod"] }],
+            etatquestion: [{ name: "idx_etaquecod", columns: ["etaquecod"] }],
         },
     },
     sens: {
@@ -268,18 +200,10 @@ export const datasets = {
                 { name: "idx_dptnum", columns: ["dptnum"] },
                 { name: "idx_regcod", columns: ["regcod"] },
             ],
-            activite_loi: [
-                { name: "idx_actid", columns: ["actid"] },
-            ],
-            activite_delegation: [
-                { name: "idx_actid", columns: ["actid"] },
-            ],
-            activite_participant: [
-                { name: "idx_senmat", columns: ["senmat"] },
-            ],
-            activite_senateur: [
-                { name: "idx_senmat", columns: ["senmat"] },
-            ],
+            activite_loi: [{ name: "idx_actid", columns: ["actid"] }],
+            activite_delegation: [{ name: "idx_actid", columns: ["actid"] }],
+            activite_participant: [{ name: "idx_senmat", columns: ["senmat"] }],
+            activite_senateur: [{ name: "idx_senmat", columns: ["senmat"] }],
             senbur: [
                 { name: "idx_senmat", columns: ["senmat"] },
                 { name: "idx_burcod", columns: ["burcod"] },

package/lib/index.d.ts

@@ -1,8 +1,8 @@
-export type { AmendementResult, } from "./model/ameli";
-export type { DossierLegislatifResult, } from "./model/dosleg";
-export type { ScrutinResult, } from "./model/scrutins";
-export type { QuestionResult, } from "./model/questions";
-export type { CirconscriptionResult, OrganismeResult, SenateurResult, } from "./model/sens";
+export type { AmendementResult } from "./model/ameli";
+export type { DossierLegislatifResult } from "./model/dosleg";
+export type { ScrutinResult } from "./model/scrutins";
+export type { QuestionResult } from "./model/questions";
+export type { CirconscriptionResult, OrganismeResult, SenateurResult } from "./model/sens";
 export type { AgendaEvent, GroupedReunion } from "./types/agenda";
 export type { Ses, Sub, TxtAmeli } from "./types/ameli";
 export type { CompteRendu } from "./types/compte_rendu";

package/lib/model/ameli.js

@@ -19,7 +19,7 @@ function auteurs(amendementId) {
         "ameli.grppol_ameli.libcou as groupe_politique_libelle_court",
         "ameli.grppol_ameli.lilcou as groupe_politique_libelle",
     ])
-        .orderBy("ameli.amdsen.rng asc"));
+        .orderBy("ameli.amdsen.rng", "asc"));
 }
 const findAllAmendementsQuery = dbSenat
     .selectFrom("ameli.amd")

package/lib/model/debats.js

@@ -15,9 +15,9 @@ function sectionsLegislatives(dateSeance) {
         "debats.typsec.typseclib as type",
         "debats.typsec.typseccat as categorie",
         interventionsLegislatives(ref("debats.secdis.secdiscle")).as("interventions"),
-        "debats.secdis.lecassidt as lecture_id"
+        "debats.secdis.lecassidt as lecture_id",
     ])
-        .orderBy("debats.secdis.secdisordid asc"));
+        .orderBy("debats.secdis.secdisordid", "asc"));
 }
 function interventionsLegislatives(sectionId) {
     return jsonArrayFrom(dbSenat
@@ -34,10 +34,10 @@ function interventionsLegislatives(sectionId) {
             code: ref("dosleg.auteur.autcod"),
             nom: ref("dosleg.auteur.nomuse"),
             prenom: ref("dosleg.auteur.prenom"),
-            matricule: ref("dosleg.auteur.autmat")
-        }).as("auteur")
+            matricule: ref("dosleg.auteur.autmat"),
+        }).as("auteur"),
     ])
-        .orderBy("debats.intpjl.intordid asc"));
+        .orderBy("debats.intpjl.intordid", "asc"));
 }
 function sectionsNonLegislatives(dateSeance) {
     return jsonArrayFrom(dbSenat
@@ -67,10 +67,10 @@ function interventionsNonLegislatives(sectionId) {
             code: ref("dosleg.auteur.autcod"),
             nom: ref("dosleg.auteur.nomuse"),
             prenom: ref("dosleg.auteur.prenom"),
-            matricule: ref("dosleg.auteur.autmat")
-        }).as("auteur")
+            matricule: ref("dosleg.auteur.autmat"),
+        }).as("auteur"),
     ])
-        .orderBy("debats.intdivers.intdiversordid asc"));
+        .orderBy("debats.intdivers.intdiversordid", "asc"));
 }
 function lecturesAssemblee(dateSeance) {
     return jsonArrayFrom(dbSenat

package/lib/model/dosleg.js

@@ -10,9 +10,7 @@ function datesSeances(lectureAssembleeId) {
         .withSchema("dosleg")
         .selectFrom("dosleg.date_seance")
         .where("dosleg.date_seance.lecidt", "=", lectureAssembleeId)
-        .select(({ ref }) => [
-        toDateString(ref("dosleg.date_seance.date_s")).as("date"),
-    ]));
+        .select(({ ref }) => [toDateString(ref("dosleg.date_seance.date_s")).as("date")]));
 }
 function auteursRapport(rapportId) {
     return jsonArrayFrom(dbSenat
@@ -27,7 +25,7 @@ function auteursRapport(rapportId) {
         "dosleg.auteur.autmat as matricule",
         "dosleg.ecr.ecrnumtri as ordre",
         "dosleg.rolsig.rolsiglib as role",
-        "dosleg.ecr.ecrqua as qualite"
+        "dosleg.ecr.ecrqua as qualite",
     ])
         .orderBy("dosleg.ecr.ecrnumtri", "asc"));
 }
@@ -73,7 +71,7 @@ function auteursTexte(texteId) {
         "auteur.autmat as matricule",
         "ecr.ecrnumtri as ordre",
         "rolsig.rolsiglib as role",
-        "ecr.ecrqua as qualite"
+        "ecr.ecrqua as qualite",
     ])
         .orderBy("ecr.ecrnumtri", "asc"));
 }
@@ -158,9 +156,7 @@ function themes(loiId) {
         .selectFrom("the")
         .leftJoin("loithe", "loithe.thecle", "the.thecle")
         .where("loithe.loicod", "=", loiId)
-        .select([
-        "the.thelib as libelle",
-    ]));
+        .select(["the.thelib as libelle"]));
 }
 const findAllDossiersQuery = dbSenat
     .withSchema("dosleg")
@@ -228,17 +224,17 @@ export function createActesLegislatifs(dossier) {
             const codeParent = getCodeActeLecture(dossier["code_nature_dossier"], lecture["type_lecture"], lectureAss["assemblee"]);
             const textesWithCodeActe = (lectureAss["textes"] || []).map((texte) => ({
                 code_acte: getCodeActeTexte(codeParent, texte["origine"]),
-                ...texte
+                ...texte,
             }));
             // Ajout étape -COM-FOND après chaque -DEPOT
             let textesWithComFond = [];
             for (let i = 0; i < textesWithCodeActe.length; i++) {
                 const t = textesWithCodeActe[i];
                 textesWithComFond.push(t);
-                if (t.code_acte && t.code_acte.endsWith('-DEPOT')) {
+                if (t.code_acte && t.code_acte.endsWith("-DEPOT")) {
                     textesWithComFond.push({
                         ...t,
-                        code_acte: t.code_acte.replace('-DEPOT', '-COM-FOND')
+                        code_acte: t.code_acte.replace("-DEPOT", "-COM-FOND"),
                     });
                 }
             }
@@ -260,7 +256,8 @@ export function createActesLegislatifs(dossier) {
             ordre_lecture: null,
             libelle_lecture: "Conseil constitutionnel",
             code_acte: "CC",
-            actes_legislatifs: [{
+            actes_legislatifs: [
+                {
                     code_acte: "CC-SAISIE",
                     date: dossier["date_saisine_CoC"],
                     libelle_decision_CoC: dossier["libelle_decision_CoC"],
@@ -270,7 +267,8 @@ export function createActesLegislatifs(dossier) {
                     url_dossier_CoC: dossier["url_dossier_CoC"],
                     date_saisine_CoC: dossier["date_saisine_CoC"],
                     condition_saisine_CoC: dossier["condition_saisine_CoC"],
-                }]
+                },
+            ],
         });
     }
     if (dossier["date_publication_JO"]) {
@@ -279,14 +277,16 @@ export function createActesLegislatifs(dossier) {
             ordre_lecture: null,
             libelle_lecture: "Promulgation",
             code_acte: "PROM",
-            actes_legislatifs: [{
+            actes_legislatifs: [
+                {
                     code_acte: "PROM-PUB",
                     date: dossier["date_publication_JO"],
                     titre_JO: dossier["titre_JO"],
                     date_publication_JO: dossier["date_publication_JO"],
                     numero_JO: dossier["numero_JO"],
-                    url_JO: dossier["url_JO"]
-                }]
+                    url_JO: dossier["url_JO"],
+                },
+            ],
         });
     }
     return actesLegislatifs;
@@ -327,22 +327,31 @@ export function getCodeActeTexte(codeParent, texteOrigine) {
         if (texteOrigine === "de la commission") {
             return "CMP-DEBATS-AN";
         }
-        else if (texteOrigine === "adopté par l'Assemblée Nationale" || texteOrigine === "adopté par l'Assemblée nationale") {
+        else if (texteOrigine === "adopté par l'Assemblée Nationale" ||
+            texteOrigine === "adopté par l'Assemblée nationale") {
             return "CMP-DEBATS-SN";
         }
     }
-    if (texteOrigine === "transmis au Sénat" || texteOrigine === "déposé au Sénat" ||
-        texteOrigine === "transmis à l'Assemblée nationale" || texteOrigine === "déposé à l'Assemblée nationale" ||
-        texteOrigine === "transmis à l'Assemblée Nationale" || texteOrigine === "déposé à l'Assemblée Nationale") {
+    if (texteOrigine === "transmis au Sénat" ||
+        texteOrigine === "déposé au Sénat" ||
+        texteOrigine === "transmis à l'Assemblée nationale" ||
+        texteOrigine === "déposé à l'Assemblée nationale" ||
+        texteOrigine === "transmis à l'Assemblée Nationale" ||
+        texteOrigine === "déposé à l'Assemblée Nationale") {
         return `${codeParent}-DEPOT`;
     }
-    if (texteOrigine === "de la commission" || texteOrigine === "de la commission (AN)" || texteOrigine === "résultat des travaux de la commission") {
+    if (texteOrigine === "de la commission" ||
+        texteOrigine === "de la commission (AN)" ||
+        texteOrigine === "résultat des travaux de la commission") {
         return `${codeParent}-DEBATS-SEANCE`;
     }
     if (texteOrigine === "retiré par l'auteur") {
         return `${codeParent}-RTRINI`;
     }
-    if (texteOrigine.includes("adopté") || texteOrigine.includes("rejeté") || texteOrigine.includes("modifié") || texteOrigine === "devenu résolution du Sénat") {
+    if (texteOrigine.includes("adopté") ||
+        texteOrigine.includes("rejeté") ||
+        texteOrigine.includes("modifié") ||
+        texteOrigine === "devenu résolution du Sénat") {
         return `${codeParent}-DEBATS-DEC`;
     }
     return null;

package/lib/model/index.d.ts

@@ -1,7 +1,7 @@
 export { findAllAmendements } from "./ameli";
 export { findAll as findAllDebats } from "./debats";
-export { findAllDossiers, } from "./dosleg";
+export { findAllDossiers } from "./dosleg";
 export { findSenatTexteUrls, findSenatRapportUrls } from "./documents";
 export { findAllScrutins } from "./scrutins";
 export { findAll as findAllQuestions } from "./questions";
-export { findAll as findAllSens, findAllCirconscriptions, findAllOrganismes, } from "./sens";
+export { findAll as findAllSens, findAllCirconscriptions, findAllOrganismes } from "./sens";

package/lib/model/index.js

@@ -1,7 +1,7 @@
 export { findAllAmendements } from "./ameli";
 export { findAll as findAllDebats } from "./debats";
-export { findAllDossiers, } from "./dosleg";
+export { findAllDossiers } from "./dosleg";
 export { findSenatTexteUrls, findSenatRapportUrls } from "./documents";
 export { findAllScrutins } from "./scrutins";
 export { findAll as findAllQuestions } from "./questions";
-export { findAll as findAllSens, findAllCirconscriptions, findAllOrganismes, } from "./sens";
+export { findAll as findAllSens, findAllCirconscriptions, findAllOrganismes } from "./sens";

package/lib/model/questions.js

@@ -16,7 +16,7 @@ function reponses(questionId) {
         "tam_reponses.txtrep as texte",
         "tam_reponses.txterrrep as texte_erratum",
     ])
-        .orderBy("tam_reponses.datejorep asc"));
+        .orderBy("tam_reponses.datejorep", "asc"));
 }
 function themes(questionId) {
     return jsonArrayFrom(dbSenat
@@ -25,15 +25,13 @@ function themes(questionId) {
         .selectFrom("tam_questions")
         .select(({ eb, ref, val }) => [
         "id as question_id",
-        eb
-            .cast(expandToRows(ref("tam_questions.themes"), val("#(\\d+)")), "smallint")
-            .as("theme_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"));
+        .orderBy("the.thenouidt", "asc"));
 }
 const findAllQuery = dbSenat
     .withSchema("questions")

package/lib/model/scrutins.js

@@ -13,7 +13,7 @@ function votes(scrutinNum, scrutinSession, scrutinDate) {
         .onRef("sens.memgrppol.memgrppoldatdeb", "<=", scrutinDate)
         .on((eb) => eb.or([
         eb("sens.memgrppol.memgrppoldatfin", ">=", scrutinDate),
-        eb("sens.memgrppol.memgrppoldatfin", "is", null)
+        eb("sens.memgrppol.memgrppoldatfin", "is", null),
     ])))
         .where("dosleg.votsen.scrnum", "=", scrutinNum)
         .where("dosleg.votsen.sesann", "=", scrutinSession)
@@ -39,7 +39,7 @@ function groupesVotants(scrutinNum, scrutinSession, scrutinDate) {
         .onRef("sens.memgrppol.memgrppoldatdeb", "<=", scrutinDate)
         .on((eb) => eb.or([
         eb("sens.memgrppol.memgrppoldatfin", ">=", scrutinDate),
-        eb("sens.memgrppol.memgrppoldatfin", "is", null)
+        eb("sens.memgrppol.memgrppoldatfin", "is", null),
     ])))
         .where("dosleg.votsen.scrnum", "=", scrutinNum)
         .where("dosleg.votsen.sesann", "=", scrutinSession)
@@ -51,31 +51,17 @@ function groupesVotants(scrutinNum, scrutinSession, scrutinDate) {
         "sens.memgrppol.grppolcod",
     ])
         .as("unique_votes"))
-        .groupBy([
-        "unique_votes.grppolcod",
-    ])
+        .groupBy(["unique_votes.grppolcod"])
         .select(({ fn, eb }) => [
         "unique_votes.grppolcod as groupe_politique_code",
-        fn.sum(eb.case()
-            .when("unique_votes.posvotlib", "=", "pour")
-            .then(1)
-            .else(0)
-            .end()).as("nombre_pour"),
-        fn.sum(eb.case()
-            .when("unique_votes.posvotlib", "=", "contre")
-            .then(1)
-            .else(0)
-            .end()).as("nombre_contre"),
-        fn.sum(eb.case()
-            .when("unique_votes.posvotlib", "=", "abstention")
-            .then(1)
-            .else(0)
-            .end()).as("nombre_abstentions"),
-        fn.sum(eb.case()
-            .when("unique_votes.posvotlib", "=", "non-votant")
-            .then(1)
-            .else(0)
-            .end()).as("nombre_non_votants"),
+        fn.sum(eb.case().when("unique_votes.posvotlib", "=", "pour").then(1).else(0).end()).as("nombre_pour"),
+        fn.sum(eb.case().when("unique_votes.posvotlib", "=", "contre").then(1).else(0).end()).as("nombre_contre"),
+        fn
+            .sum(eb.case().when("unique_votes.posvotlib", "=", "abstention").then(1).else(0).end())
+            .as("nombre_abstentions"),
+        fn
+            .sum(eb.case().when("unique_votes.posvotlib", "=", "non-votant").then(1).else(0).end())
+            .as("nombre_non_votants"),
         fn.count("unique_votes.senmat").as("nombre_votants"),
     ]));
 }
@@ -84,11 +70,7 @@ function misesAuPoint(scrutinNum) {
         .withSchema("dosleg")
         .selectFrom("corscr")
         .where("corscr.scrnum", "=", scrutinNum)
-        .select([
-        "corscr.corscrtxt as texte",
-        "corscr.corscrord as ordre",
-        "corscr.corscrurl as url",
-    ]));
+        .select(["corscr.corscrtxt as texte", "corscr.corscrord as ordre", "corscr.corscrurl as url"]));
 }
 const findAllScrutinsQuery = dbSenat
     .withSchema("dosleg")
@@ -124,9 +106,7 @@ const findAllScrutinsQuery = dbSenat
     .$narrowType();
 export function findAllScrutins(fromSession) {
     if (fromSession !== undefined) {
-        return findAllScrutinsQuery
-            .where("scr.sesann", ">=", fromSession)
-            .stream();
+        return findAllScrutinsQuery.where("scr.sesann", ">=", fromSession).stream();
     }
     return findAllScrutinsQuery.stream();
 }