@tricoteuses/senat 3.1.0 → 3.1.2

package/lib/model/ameli.mjs

@@ -1,84 +0,0 @@
-import { jsonArrayFrom } from "kysely/helpers/postgres";
-import { dbAmeli } from "../databases";
-import { concat, toDateString } from "./util";
-function auteurs(amendementId) {
-    return jsonArrayFrom(dbAmeli.selectFrom("amdsen")
-        .leftJoin("sen_ameli", "amdsen.senid", "sen_ameli.entid")
-        .where("amdsen.amdid", "=", amendementId)
-        .select([
-        "amdsen.prenomuse as prenom",
-        "amdsen.nomuse as nom",
-        "sen_ameli.mat as matricule",
-    ])
-        .orderBy("amdsen.rng asc"));
-}
-const findAllQuery = dbAmeli
-    .selectFrom("amd")
-    .leftJoin("sub", "amd.subid", "sub.id")
-    .leftJoin("typsub", "sub.typid", "typsub.id")
-    .leftJoin("txt_ameli", "amd.txtid", "txt_ameli.id")
-    .leftJoin("ses", "txt_ameli.sesdepid", "ses.id")
-    .leftJoin("nat", "txt_ameli.natid", "nat.id")
-    .leftJoin("lec_ameli", "txt_ameli.lecid", "lec_ameli.id")
-    .leftJoin("avicom", "amd.avcid", "avicom.id")
-    .leftJoin("avigvt", "amd.avgid", "avigvt.id")
-    .leftJoin("sor", "amd.sorid", "sor.id")
-    .leftJoin("irr", "amd.irrid", "irr.id")
-    .leftJoin("grppol_ameli", "amd.nomentid", "grppol_ameli.entid")
-    .leftJoin("com_ameli", "amd.nomentid", "com_ameli.entid")
-    .leftJoin("cab", "amd.nomentid", "cab.entid")
-    .select(({ eb, ref, val }) => [
-    "ses.ann as session",
-    "txt_ameli.doslegsignet as signet_dossier_legislatif",
-    "nat.libcourt as nature_texte",
-    "txt_ameli.numabs as numero_texte",
-    "txt_ameli.int as intitule_texte",
-    "lec_ameli.lib as lecture",
-    eb.case()
-        .when("amd.typ", "=", "A")
-        .then(val("Amendement"))
-        .when("amd.typ", "=", "M")
-        .then(val("Motion"))
-        .when("amd.typ", "=", "S")
-        .then(val("Sous-amendement"))
-        .else("'")
-        .end()
-        .as("nature"),
-    "amd.id as id",
-    "amd.amdperid as parent_id",
-    "amd.num as numero",
-    "amd.numabs as numero_absolu",
-    "amd.ord as ordre",
-    "sub.lib as subdivision_libelle",
-    "sub.lic as subdivision_libelle_court",
-    "typsub.lib as subdivision_type",
-    "amd.alinea as alinea",
-    toDateString(ref("amd.datdep")).as("date_depot"),
-    eb.case()
-        .when("amd.etaid", "=", 8)
-        .then(val("Cet amendement a été retiré avant séance."))
-        .else(ref("amd.dis"))
-        .end()
-        .as("dispositif"),
-    "amd.obj as objet",
-    "amd.etaid as etat_id",
-    "avicom.lib as avis_commission",
-    "avigvt.lib as avis_gouvernement",
-    eb.fn.coalesce("sor.lib", "irr.libirr").as("sort"),
-    "amd.rev as revision",
-    concat(val("https://www.senat.fr/amendements/"), ref("ses.lil"), val("/"), ref("txt_ameli.numabs"), val("/Amdt_"), ref("amd.numabs"), val(".html")).as("url"),
-    "grppol_ameli.lilcou as au_nom_de_groupe_politique",
-    "com_ameli.lil as au_nom_de_commission",
-    eb.case()
-        .when("cab.entid", "is not", null)
-        .then(true)
-        .else(false)
-        .end()
-        .as("auteur_est_gouvernement"),
-])
-    .select(({ ref }) => [
-    auteurs(ref("amd.id")).as("auteurs"),
-]);
-export function findAll() {
-    return findAllQuery.stream();
-}

package/lib/model/ameli.ts

@@ -1,100 +0,0 @@
-import { Expression, InferResult } from "kysely"
-import { jsonArrayFrom } from "kysely/helpers/postgres"
-import { dbAmeli } from "../databases"
-import { concat, toDateString } from "./util"
-
-function auteurs (amendementId: Expression<number>) {
-  return jsonArrayFrom(
-    dbAmeli.selectFrom("amdsen")
-      .leftJoin("sen_ameli", "amdsen.senid", "sen_ameli.entid")
-      .where("amdsen.amdid", "=", amendementId)
-      .select([
-        "amdsen.prenomuse as prenom",
-        "amdsen.nomuse as nom",
-        "sen_ameli.mat as matricule",
-      ])
-      .orderBy("amdsen.rng asc"),
-  )
-}
-
-const findAllQuery = dbAmeli
-  .selectFrom("amd")
-  .leftJoin("sub", "amd.subid", "sub.id")
-  .leftJoin("typsub", "sub.typid", "typsub.id")
-  .leftJoin("txt_ameli", "amd.txtid", "txt_ameli.id")
-  .leftJoin("ses", "txt_ameli.sesdepid", "ses.id")
-  .leftJoin("nat", "txt_ameli.natid", "nat.id")
-  .leftJoin("lec_ameli", "txt_ameli.lecid", "lec_ameli.id")
-  .leftJoin("avicom", "amd.avcid", "avicom.id")
-  .leftJoin("avigvt", "amd.avgid", "avigvt.id")
-  .leftJoin("sor", "amd.sorid", "sor.id")
-  .leftJoin("irr", "amd.irrid", "irr.id")
-  .leftJoin("grppol_ameli", "amd.nomentid", "grppol_ameli.entid")
-  .leftJoin("com_ameli", "amd.nomentid", "com_ameli.entid")
-  .leftJoin("cab", "amd.nomentid", "cab.entid")
-  .select(({ eb, ref, val }) => [
-    "ses.ann as session",
-    "txt_ameli.doslegsignet as signet_dossier_legislatif",
-    "nat.libcourt as nature_texte",
-    "txt_ameli.numabs as numero_texte",
-    "txt_ameli.int as intitule_texte",
-    "lec_ameli.lib as lecture",
-    eb.case()
-      .when("amd.typ", "=", "A")
-      .then(val("Amendement"))
-      .when("amd.typ", "=", "M")
-      .then(val("Motion"))
-      .when("amd.typ", "=", "S")
-      .then(val("Sous-amendement"))
-      .else("'")
-      .end()
-      .as("nature"),
-    "amd.id as id",
-    "amd.amdperid as parent_id",
-    "amd.num as numero",
-    "amd.numabs as numero_absolu",
-    "amd.ord as ordre",
-    "sub.lib as subdivision_libelle",
-    "sub.lic as subdivision_libelle_court",
-    "typsub.lib as subdivision_type",
-    "amd.alinea as alinea",
-    toDateString(ref("amd.datdep")).as("date_depot"),
-    eb.case()
-      .when("amd.etaid", "=", 8)
-      .then(val("Cet amendement a été retiré avant séance."))
-      .else(ref("amd.dis"))
-      .end()
-      .as("dispositif"),
-    "amd.obj as objet",
-    "amd.etaid as etat_id",
-    "avicom.lib as avis_commission",
-    "avigvt.lib as avis_gouvernement",
-    eb.fn.coalesce("sor.lib", "irr.libirr").as("sort"),
-    "amd.rev as revision",
-    concat(
-      val("https://www.senat.fr/amendements/"),
-      ref("ses.lil"),
-      val("/"),
-      ref("txt_ameli.numabs"),
-      val("/Amdt_"),
-      ref("amd.numabs"),
-      val(".html")
-    ).as("url"),
-    "grppol_ameli.lilcou as au_nom_de_groupe_politique",
-    "com_ameli.lil as au_nom_de_commission",
-    eb.case()
-      .when("cab.entid", "is not", null)
-      .then(true)
-      .else(false)
-      .end()
-      .as("auteur_est_gouvernement"),
-  ])
-  .select(({ ref }) => [
-    auteurs(ref("amd.id")).as("auteurs"),
-  ])
-
-export type AmendementResult = InferResult<typeof findAllQuery>[0]
-
-export function findAll () {
-  return findAllQuery.stream()
-}

package/lib/model/commission.d.ts

@@ -1,18 +0,0 @@
-import * as cheerio from "cheerio";
-import { CompteRendu } from "../types/compte_rendu";
-import { Reunion } from "../types/agenda";
-export declare function getRemainingTextAfterSpeakerHeader($: cheerio.CheerioAPI, $p: cheerio.Cheerio<any>): string;
-export type DaySection = {
-    title: string;
-    $start: cheerio.Cheerio<any>;
-    time?: string;
-};
-export declare function cleanTitle(t: string): string;
-export declare function extractDayH3Sections($: cheerio.CheerioAPI, dateISO: string): DaySection[];
-export declare function parseCommissionCRSectionFromDom($: cheerio.CheerioAPI, htmlFilePath: string, opts: {
-    dateISO: string;
-    hourShort: string | null;
-    organe?: string | null;
-    section: DaySection;
-    matched?: Reunion;
-}): CompteRendu | null;

package/lib/model/commission.js

@@ -1,269 +0,0 @@
-import * as cheerio from "cheerio";
-import path from "path";
-import { makeReunionUid } from "../utils/reunion_parsing";
-import { norm } from "../utils/string_cleaning";
-import { frDateToISO, hourShortToStartTime } from "../utils/date";
-import { toCRDate } from "./util";
-const PARA_h3_SEL = "p.sh_justify, p.sh_center, p.sh_marge, p[align], li, h3";
-function findDayRoot($, targetISO) {
-    let $root = $();
-    $("h2").each((_, el) => {
-        const txt = norm($(el).text());
-        const m = txt.match(/(?:Lundi|Mardi|Mercredi|Jeudi|Vendredi|Samedi|Dimanche)\s+(.+)$/i);
-        const iso = m ? frDateToISO(m[1]) : undefined;
-        if (iso === targetISO && $root.length === 0)
-            $root = $(el);
-    });
-    return $root;
-}
-function normalizeSpaces(s) {
-    return s.replace(/[\u00A0\u202F\u2009]/g, " ");
-}
-function stripIntroPunct(s) {
-    return s.replace(/^[\s]*[.:;]?\s*(?:[–—-]\s*)+/u, "");
-}
-function collectLeadingHeaderStrongEls($, $clone) {
-    const els = [];
-    const nodes = $clone.contents().toArray();
-    for (const node of nodes) {
-        if (node.type === "text") {
-            if (norm(node.data || ""))
-                break;
-            continue;
-        }
-        if (node.type === "tag") {
-            const $n = $(node);
-            if ($n.is("strong, b")) {
-                els.push(node);
-                continue;
-            }
-            if ($n.is("a") && $n.children("strong, b").length) {
-                $n.children("strong, b").each((_, el) => {
-                    els.push($(el));
-                });
-                continue;
-            }
-            break;
-        }
-    }
-    return els;
-}
-// Remove orateur's name from text and clean intro punct
-export function getRemainingTextAfterSpeakerHeader($, $p) {
-    const $clone = $p.clone();
-    // 1) Remove <strong> at start
-    const headerStrongEls = collectLeadingHeaderStrongEls($, $clone);
-    for (const el of headerStrongEls)
-        $(el).remove();
-    // 2) normalize + clean intro punct
-    let remainingHtml = $clone.html() || "";
-    remainingHtml = normalizeSpaces(cheerio.load(remainingHtml).text());
-    remainingHtml = stripIntroPunct(remainingHtml);
-    const remainingText = norm(remainingHtml || "");
-    return remainingText;
-}
-function buildPointsFromParagraphs($, paras) {
-    const points = [];
-    let ordreAbsoluSeance = 0;
-    const normSpeaker = (s) => s
-        .normalize("NFKC")
-        .replace(/\s+/g, " ")
-        .replace(/[:\.]\s*$/, "")
-        .trim();
-    const normQual = (s) => s
-        .normalize("NFKC")
-        .replace(/\s+/g, " ")
-        .replace(/^\s*,\s*|\s+$/g, "")
-        .replace(/[\s\u00A0]*[.,;:–—-]+$/u, "")
-        .trim();
-    let currentOrateur = null;
-    let currentQualite = "";
-    let currentTexte = "";
-    function isPresidentQual(qual) {
-        return /\bprésident(e)?\b/i.test(qual);
-    }
-    // Flush the buffered speaker’s text into points[] if any.
-    function flush() {
-        if (!currentOrateur || !currentTexte.trim())
-            return;
-        ordreAbsoluSeance++;
-        points.push({
-            code_grammaire: "PAROLE_GENERIQUE",
-            roledebat: isPresidentQual(currentQualite) ? "président" : "",
-            ordre_absolu_seance: String(ordreAbsoluSeance),
-            orateurs: { orateur: { nom: currentOrateur, id: "", qualite: currentQualite || "" } },
-            texte: { _: currentTexte.trim() },
-        });
-        currentOrateur = null;
-        currentQualite = "";
-        currentTexte = "";
-    }
-    function addPoint(payload) {
-        ordreAbsoluSeance++;
-        points.push({ ...payload, ordre_absolu_seance: String(ordreAbsoluSeance) });
-    }
-    for (const $p of paras) {
-        if ($p.closest("table").length)
-            continue;
-        const tagName = ($p.prop("tagName") || "").toString().toLowerCase();
-        const rawText = ($p.text() || "").replace(/\u00a0/g, " ").trim();
-        const text = norm(rawText);
-        if (!text || text.length <= 3)
-            continue;
-        const html = ($p.html() || "").trim();
-        const italicSpans = $p.find("i, em, span[style*='italic']");
-        const firstItalicOuter = italicSpans.length ? $(italicSpans[0]).prop("outerHTML") || "" : "";
-        const htmlBeforeFirstItalic = firstItalicOuter ? html.split(firstItalicOuter)[0].trim() : "";
-        const isPureItalic = italicSpans.length > 0 && italicSpans.length === $p.find("span,i,em").length && htmlBeforeFirstItalic === "";
-        if (tagName === "h3") {
-            flush();
-            addPoint({
-                code_style: "Titre",
-                code_grammaire: "TITRE_TEXTE_DISCUSSION",
-                texte: { _: text },
-            });
-            continue;
-        }
-        const boldSpans = $p.find("strong, b");
-        const joinedBold = norm(boldSpans
-            .map((_, el) => $(el).text() || "")
-            .get()
-            .join(""));
-        const [namePartRaw, qualPartRaw] = joinedBold.split(/\s*,\s+/, 2);
-        const namePart = namePartRaw ? normSpeaker(namePartRaw) : "";
-        const qualPart = qualPartRaw ? normQual(qualPartRaw) : "";
-        const looksLikeName = namePart.length > 3 && /^(M\.|Mme)[\s\u00A0\u202F]+/i.test(namePart);
-        const startsWithName = namePart && text.startsWith(namePart);
-        const isNewSpeaker = looksLikeName && startsWithName && namePart !== currentOrateur;
-        if (isNewSpeaker) {
-            flush();
-            currentOrateur = namePart;
-            currentQualite = qualPart;
-            const remainingText = getRemainingTextAfterSpeakerHeader($, $p);
-            currentTexte = remainingText;
-            continue;
-        }
-        if (isPureItalic || (!joinedBold && !currentOrateur && text)) {
-            flush();
-            addPoint({
-                code_style: "Info Italiques",
-                code_grammaire: "PAROLE_GENERIQUE",
-                texte: { _: "<i>" + text + "</i>" },
-            });
-            continue;
-        }
-        // concat text because same orateur
-        if (currentOrateur) {
-            const removeOrateurFromText = getRemainingTextAfterSpeakerHeader($, $p);
-            currentTexte += (currentTexte ? "<br/><br/>" : "") + removeOrateurFromText;
-            continue;
-        }
-    }
-    flush();
-    return points;
-}
-const TIME_RE = /(?:\b[àa]\s*)?(\d{1,2})\s*(?:h|heures?)\s*(?:([0-5]\d))?/i;
-export function cleanTitle(t) {
-    return (t || "").replace(/\s+/g, " ").trim();
-}
-function parseTimeToHHmm(text) {
-    const m = normalizeSpaces(text).match(TIME_RE);
-    if (!m)
-        return undefined;
-    const hh = m[1]?.padStart(2, "0");
-    const mm = (m[2] ?? "00").padStart(2, "0");
-    const h = Number(hh);
-    if (h >= 0 && h <= 23)
-        return `${hh}:${mm}`;
-    return undefined;
-}
-function findNearbyTime($, $h3) {
-    let cur = $h3.prev();
-    for (let i = 0; i < 3 && cur.length; i++, cur = cur.prev()) {
-        const direct = parseTimeToHHmm(cur.text());
-        if (direct)
-            return direct;
-        const italic = parseTimeToHHmm(cur.find("i, em").first().text());
-        if (italic)
-            return italic;
-    }
-    return undefined;
-}
-export function extractDayH3Sections($, dateISO) {
-    const sections = [];
-    const $dayRoot = findDayRoot($, dateISO);
-    if ($dayRoot.length === 0)
-        return sections;
-    const $range = $dayRoot.nextUntil("h2");
-    const $h3s = $range.filter("h3").add($range.find("h3"));
-    $h3s.each((_, el) => {
-        const $h3 = $(el);
-        const title = cleanTitle($h3.text());
-        if (!title)
-            return;
-        const time = findNearbyTime($, $h3);
-        sections.push({ title, $start: $h3, time });
-    });
-    return sections;
-}
-export function parseCommissionCRSectionFromDom($, htmlFilePath, opts) {
-    try {
-        const { dateISO, hourShort, organe, section, matched } = opts;
-        const seanceRef = matched?.uid ?? makeReunionUid(dateISO, "COM", matched?.events[0].id ?? hourShort ?? "", organe ?? undefined);
-        const uid = seanceRef.replace(/^RU/, "CRC");
-        const dateSeance = toCRDate(dateISO, matched?.startTime ?? hourShortToStartTime(hourShort));
-        const $dayRoot = findDayRoot($, dateISO);
-        if ($dayRoot.length === 0) {
-            console.warn(`[COM-CR][parse] day root not found for ${dateISO} in ${path.basename(htmlFilePath)}`);
-            return null;
-        }
-        const paras = [];
-        let $cursor = section.$start;
-        // Jump title if we do not want to add it to paragraphes
-        $cursor = $cursor.next();
-        while ($cursor.length && !$cursor.is("h2") && !$cursor.is("h3")) {
-            if ($cursor.is(PARA_h3_SEL)) {
-                paras.push($cursor);
-            }
-            else {
-                const $ps = $cursor.find(PARA_h3_SEL);
-                if ($ps.length)
-                    $ps.each((_, p) => {
-                        paras.push($(p));
-                    });
-            }
-            $cursor = $cursor.next();
-        }
-        const points = buildPointsFromParagraphs($, paras);
-        if (points.length < 4 || !points.some((pt) => pt.code_grammaire === "PAROLE_GENERIQUE" && pt.orateurs)) {
-            console.warn(`[COM-CR][parse] Insufficient points or no interventions found for a section in ${path.basename(htmlFilePath)}`);
-            return null;
-        }
-        const session = dateISO.slice(5, 7) >= "10" ? `${dateISO.slice(0, 4)}` : `${Number(dateISO.slice(0, 4)) - 1}`;
-        const contenu = {
-            quantiemes: { journee: dateISO, session },
-            point: points,
-        };
-        const metadonnees = {
-            dateSeance,
-            dateSeanceJour: dateISO,
-            numSeanceJour: "",
-            numSeance: "",
-            typeAssemblee: "SN",
-            legislature: "",
-            session,
-            nomFichierJo: path.basename(htmlFilePath),
-            validite: "non-certifie",
-            etat: "definitif",
-            diffusion: "publique",
-            version: "1",
-            environnement: "prod",
-            heureGeneration: new Date(),
-        };
-        return { uid, seanceRef, sessionRef: session, metadonnees, contenu };
-    }
-    catch (e) {
-        console.error(`[COM-CR][parse] error section file=${path.basename(htmlFilePath)}:`, e);
-        return null;
-    }
-}

package/lib/model/debats.d.ts

@@ -1,67 +0,0 @@
-import { InferResult } from "kysely";
-export type DebatResult = InferResult<typeof findAllQuery>[0];
-declare const findAllQuery: import("kysely").SelectQueryBuilder<any, "debats.debats", {
-    [x: string]: any;
-    id: string;
-    date_seance: string;
-    sections: {
-        [x: string]: any;
-        interventions: {
-            [x: string]: any;
-            auteur: {
-                code: any;
-                nom: any;
-                prenom: any;
-                matricule: any;
-            };
-        }[];
-    }[];
-    sections_divers: {
-        [x: string]: any;
-        interventions: {
-            [x: string]: any;
-            auteur: {
-                code: any;
-                nom: any;
-                prenom: any;
-                matricule: any;
-            };
-        }[];
-    }[];
-    lectures: {
-        id: any;
-    }[];
-}>;
-export declare function findAll(fromSession?: number): AsyncIterableIterator<{
-    [x: string]: any;
-    id: string;
-    date_seance: string;
-    sections: {
-        [x: string]: any;
-        interventions: {
-            [x: string]: any;
-            auteur: {
-                code: any;
-                nom: any;
-                prenom: any;
-                matricule: any;
-            };
-        }[];
-    }[];
-    sections_divers: {
-        [x: string]: any;
-        interventions: {
-            [x: string]: any;
-            auteur: {
-                code: any;
-                nom: any;
-                prenom: any;
-                matricule: any;
-            };
-        }[];
-    }[];
-    lectures: {
-        id: any;
-    }[];
-}>;
-export {};

package/lib/model/debats.js

@@ -1,95 +0,0 @@
-import { jsonArrayFrom, jsonBuildObject } from "kysely/helpers/postgres";
-import { dbSenat } from "../databases";
-import { ID_DATE_FORMAT } from "../scripts/datautil";
-import { toDateString } from "./util";
-function sectionsLegislatives(dateSeance) {
-    return jsonArrayFrom(dbSenat
-        .selectFrom("debats.secdis")
-        .leftJoin("debats.typsec", "debats.secdis.typseccod", "debats.typsec.typseccod")
-        .where("debats.secdis.datsea", "=", dateSeance)
-        .select(({ ref }) => [
-        "debats.secdis.secdisordid as id",
-        "debats.secdis.secdisnum as numero",
-        "debats.secdis.secdisobj as objet",
-        "debats.secdis.secdisurl as url",
-        "debats.typsec.typseclib as type",
-        "debats.typsec.typseccat as categorie",
-        interventionsLegislatives(ref("debats.secdis.secdiscle")).as("interventions"),
-        "debats.secdis.lecassidt as lecture_id",
-    ])
-        .orderBy("debats.secdis.secdisordid", "asc"));
-}
-function interventionsLegislatives(sectionId) {
-    return jsonArrayFrom(dbSenat
-        .selectFrom("debats.intpjl")
-        .leftJoin("dosleg.auteur", "debats.intpjl.autcod", "dosleg.auteur.autcod")
-        .where("debats.intpjl.secdiscle", "=", sectionId)
-        .select(({ ref, val, fn }) => [
-        "debats.intpjl.intordid as id",
-        "debats.intpjl.autcod as auteur_code",
-        "debats.intpjl.intfon as fonction_intervenant",
-        "debats.intpjl.inturl as url",
-        "debats.intpjl.intana as analyse",
-        jsonBuildObject({
-            code: ref("dosleg.auteur.autcod"),
-            nom: ref("dosleg.auteur.nomuse"),
-            prenom: ref("dosleg.auteur.prenom"),
-            matricule: ref("dosleg.auteur.autmat"),
-        }).as("auteur"),
-    ])
-        .orderBy("debats.intpjl.intordid", "asc"));
-}
-function sectionsNonLegislatives(dateSeance) {
-    return jsonArrayFrom(dbSenat
-        .selectFrom("debats.secdivers")
-        .leftJoin("debats.typsec", "debats.secdivers.typseccod", "debats.typsec.typseccod")
-        .where("debats.secdivers.datsea", "=", dateSeance)
-        .select(({ ref }) => [
-        "debats.secdivers.secdiverslibelle as libelle",
-        "debats.secdivers.secdiversobj as objet",
-        "debats.typsec.typseclib as type",
-        "debats.typsec.typseccat as categorie",
-        interventionsNonLegislatives(ref("debats.secdivers.secdiverscle")).as("interventions"),
-    ]));
-}
-function interventionsNonLegislatives(sectionId) {
-    return jsonArrayFrom(dbSenat
-        .selectFrom("debats.intdivers")
-        .leftJoin("dosleg.auteur", "debats.intdivers.autcod", "dosleg.auteur.autcod")
-        .where("debats.intdivers.intdiverscle", "=", sectionId)
-        .select(({ ref, val }) => [
-        "debats.intdivers.intdiversordid as id",
-        "debats.intdivers.autcod as auteur_code",
-        "debats.intdivers.intfon as fonction_intervenant",
-        "debats.intdivers.inturl as url",
-        "debats.intdivers.intana as analyse",
-        jsonBuildObject({
-            code: ref("dosleg.auteur.autcod"),
-            nom: ref("dosleg.auteur.nomuse"),
-            prenom: ref("dosleg.auteur.prenom"),
-            matricule: ref("dosleg.auteur.autmat"),
-        }).as("auteur"),
-    ])
-        .orderBy("debats.intdivers.intdiversordid", "asc"));
-}
-function lecturesAssemblee(dateSeance) {
-    return jsonArrayFrom(dbSenat
-        .selectFrom("debats.lecassdeb")
-        .where("debats.lecassdeb.datsea", "=", dateSeance)
-        .select("debats.lecassdeb.lecassidt as id"));
-}
-const findAllQuery = dbSenat
-    .selectFrom("debats.debats")
-    .select(({ ref, val }) => [
-    toDateString(ref("debats.debats.datsea"), val(ID_DATE_FORMAT)).as("id"),
-    toDateString(ref("debats.debats.datsea")).as("date_seance"),
-    "debats.debats.numero as numero",
-    "debats.debats.deburl as url",
-    "debats.debats.debsyn as etat_synchronisation",
-    sectionsLegislatives(ref("debats.debats.datsea")).as("sections"),
-    sectionsNonLegislatives(ref("debats.debats.datsea")).as("sections_divers"),
-    lecturesAssemblee(ref("debats.debats.datsea")).as("lectures"),
-]);
-export function findAll(fromSession) {
-    return findAllQuery.stream();
-}

package/lib/model/debats.mjs

@@ -1,43 +0,0 @@
-import { debatsFieldsToTrim, lecassdebFieldsToTrim, } from "../types/debats";
-import { dbByName } from "../databases";
-import { trimFieldsRight } from "../fields";
-export const getDebats = async (ids) => {
-    if (ids.length === 0) {
-        return [];
-    }
-    return (await dbByName.debats.any(`
-      SELECT *
-      FROM debats
-      WHERE datsea IN ($<ids:list>)
-    `, {
-        ids,
-    })).map((debat) => trimFieldsRight(debatsFieldsToTrim, debat));
-};
-export const getDebatsFromLecassidts = async (ids) => {
-    if (ids.length === 0) {
-        return [];
-    }
-    return (await dbByName.debats.any(`
-      SELECT *
-      FROM debats
-      WHERE datsea IN (
-        SELECT datsea
-        FROM lecassdeb
-        WHERE lecassidt IN ($<ids:list>)
-      )
-    `, {
-        ids,
-    })).map((debat) => trimFieldsRight(debatsFieldsToTrim, debat));
-};
-export const getLecAssDebsFromDatseas = async (ids) => {
-    if (ids.length === 0) {
-        return [];
-    }
-    return (await dbByName.debats.any(`
-      SELECT *
-      FROM lecassdeb
-      WHERE datsea IN ($<ids:list>)
-    `, {
-        ids,
-    })).map((lecassdeb) => trimFieldsRight(lecassdebFieldsToTrim, lecassdeb));
-};