@tricoteuses/senat 2.5.8 → 2.6.1

package/lib/model/questions.d.ts

@@ -1,16 +1,16 @@
 import { InferResult } from "kysely";
+export type QuestionResult = InferResult<typeof findAllQuery>[0];
 declare const findAllQuery: import("kysely").SelectQueryBuilder<{
     the: import("../raw_types/questions").The;
-    tam_reponses: import("../raw_types/questions").TamReponses;
+    tam_questions: import("../raw_types/questions").TamQuestions;
     etatquestion: import("kysely").Nullable<import("../raw_types/questions").Etatquestion>;
     legquestion: import("../raw_types/questions").Legquestion;
     naturequestion: import("kysely").Nullable<import("../raw_types/questions").Naturequestion>;
     sortquestion: import("kysely").Nullable<import("../raw_types/questions").Sortquestion>;
     tam_ministeres: import("kysely").Nullable<import("../raw_types/questions").TamMinisteres>;
-    tam_questions: import("../raw_types/questions").TamQuestions;
-}, "etatquestion" | "naturequestion" | "sortquestion" | "tam_ministeres" | "tam_questions", {
+    tam_reponses: import("../raw_types/questions").TamReponses;
+}, "tam_questions" | "etatquestion" | "naturequestion" | "sortquestion" | "tam_ministeres", {
     date_publication_JO: string;
-    date_reponse_JO: string;
     republique: string | null;
     legislature: string | null;
     sort: string | null;
@@ -29,13 +29,13 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
     ministere_depot_date_debut: string;
     date_transmission: string;
     ministere_transmission: string | null;
+    date_reponse_JO: string;
     ministere_reponse: string | null;
     date_cloture: string;
     reference_question_rappelee: string | null;
     texte: string | null;
     texte_erratum: string | null;
     rubrique: string | null;
-} & {
     themes: {
         libelle: string;
     }[];
@@ -46,10 +46,8 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
         texte_erratum: string | null;
     }[];
 }>;
-export type QuestionResult = InferResult<typeof findAllQuery>[0];
 export declare function findAll(): AsyncIterableIterator<{
     date_publication_JO: string;
-    date_reponse_JO: string;
     republique: string | null;
     legislature: string | null;
     sort: string | null;
@@ -68,13 +66,13 @@ export declare function findAll(): AsyncIterableIterator<{
     ministere_depot_date_debut: string;
     date_transmission: string;
     ministere_transmission: string | null;
+    date_reponse_JO: string;
     ministere_reponse: string | null;
     date_cloture: string;
     reference_question_rappelee: string | null;
     texte: string | null;
     texte_erratum: string | null;
     rubrique: string | null;
-} & {
     themes: {
         libelle: string;
     }[];

package/lib/model/questions.js

@@ -63,8 +63,6 @@ const findAllQuery = dbQuestions
     "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"),
 ]);

package/lib/model/sens.d.ts

@@ -1,4 +1,7 @@
 import { InferResult } from "kysely";
+export type SenateurResult = InferResult<typeof findAllQuery>[0];
+export type CirconscriptionResult = InferResult<typeof findAllCirconscriptionsQuery>[0];
+export type OrganismeResult = InferResult<typeof findAllOrganismesQuery>[0];
 declare const findAllQuery: import("kysely").SelectQueryBuilder<{
     qua: import("../raw_types/sens").Qua;
     bur: import("../raw_types/sens").Bur;
@@ -121,15 +124,14 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
     description_profession: string | null;
     siege: string | null;
     url_hatvp: string | null;
-} & {
     urls: {
         code_url: string;
         url: string;
     }[];
     mandats_senateur: {
+        code_circonscription: string;
         date_debut: string;
         date_fin: string;
-        code_circonscription: string;
         etat: string | null;
         etat_debut: string | null;
         etat_fin: string | null;
@@ -282,13 +284,13 @@ declare const findAllCirconscriptionsQuery: import("kysely").SelectQueryBuilder<
     typvoi: import("../raw_types/sens").Typvoi;
     zongeo: import("../raw_types/sens").Zongeo;
 }, "dpt" | "reg", {
-    code: string;
-    libelle_departement: string;
-    libelle_region: string | null;
     date_debut: string;
     date_fin: string;
     identifiant: string;
+    code: string;
+    libelle_departement: string;
     article: string | null;
+    libelle_region: string | null;
     etat: string | null;
     nombre_senateurs: string | null;
     url: string | null;
@@ -415,9 +417,6 @@ declare const findAllOrganismesQuery: import("kysely").SelectQueryBuilder<{
     type_libelle: string;
     etat: string | null;
 }>;
-export type SenateurResult = InferResult<typeof findAllQuery>[0];
-export type CirconscriptionResult = InferResult<typeof findAllCirconscriptionsQuery>[0];
-export type OrganismeResult = InferResult<typeof findAllOrganismesQuery>[0];
 export declare function findAll(): AsyncIterableIterator<{
     matricule: string;
     qualite: string;
@@ -441,15 +440,14 @@ export declare function findAll(): AsyncIterableIterator<{
     description_profession: string | null;
     siege: string | null;
     url_hatvp: string | null;
-} & {
     urls: {
         code_url: string;
         url: string;
     }[];
     mandats_senateur: {
+        code_circonscription: string;
         date_debut: string;
         date_fin: string;
-        code_circonscription: string;
         etat: string | null;
         etat_debut: string | null;
         etat_fin: string | null;
@@ -503,13 +501,13 @@ export declare function findAll(): AsyncIterableIterator<{
     }[];
 }>;
 export declare function findAllCirconscriptions(): AsyncIterableIterator<{
-    code: string;
-    libelle_departement: string;
-    libelle_region: string | null;
     date_debut: string;
     date_fin: string;
     identifiant: string;
+    code: string;
+    libelle_departement: string;
     article: string | null;
+    libelle_region: string | null;
     etat: string | null;
     nombre_senateurs: string | null;
     url: string | null;

package/lib/model/sens.js

@@ -16,7 +16,9 @@ function textes(actId) {
     return jsonArrayFrom(dbSens
         .selectFrom("activite_loi")
         .where("actid", "=", actId)
-        .select(({ ref }) => [rtrim(ref("loicod")).as("loicod")]));
+        .select(({ ref }) => [
+        rtrim(ref("loicod")).as("loicod"),
+    ]));
 }
 function delegations(actId) {
     return jsonArrayFrom(dbSens
@@ -157,8 +159,6 @@ function mandatsMembreCommission(senMat) {
         toDateString(ref("memcom.memcomdatdeb")).as("date_debut"),
         toDateString(ref("memcom.memcomdatfin")).as("date_fin"),
         "memcom.temvalcod as etat",
-    ])
-        .select(({ ref }) => [
         fonctionsMembreCommission(ref("memcom.memcomid")).as("fonctions"),
     ])
         .orderBy("memcom.memcomdatdeb desc"));
@@ -190,8 +190,6 @@ function mandatsMembreDelegation(senMat) {
         toDateString(ref("memdelega.memdelegadatdeb")).as("date_debut"),
         toDateString(ref("memdelega.memdelegadatfin")).as("date_fin"),
         "memdelega.temvalcod as etat",
-    ])
-        .select(({ ref }) => [
         fonctionsMembreDelegation(ref("memdelega.memdelegaid")).as("fonctions"),
     ])
         .orderBy("memdelega.memdelegadatdeb desc"));
@@ -231,8 +229,6 @@ function mandatsMembreGroupePolitique(senMat) {
         toDateString(ref("memgrppol.memgrppoldatdeb")).as("date_debut"),
         toDateString(ref("memgrppol.memgrppoldatfin")).as("date_fin"),
         "memgrppol.temvalcod as etat",
-    ])
-        .select(({ ref }) => [
         fonctionsMembreGroupePolitique(ref("memgrppol.memgrppolid")).as("fonctions"),
     ])
         .orderBy("memgrppol.memgrppoldatdeb desc"));
@@ -293,7 +289,10 @@ function urls(senMat) {
     return jsonArrayFrom(dbSens
         .selectFrom("senurl")
         .where("senurl.senmat", "=", senMat)
-        .select(["senurl.typurlcod as code_url", "senurl.senurlurl as url"])
+        .select([
+        "senurl.typurlcod as code_url",
+        "senurl.senurlurl as url",
+    ])
         .orderBy("senurl.senurlnumtri asc"));
 }
 const findAllQuery = dbSens
@@ -328,8 +327,6 @@ const findAllQuery = dbSens
     "sen.sendespro as description_profession",
     "sen.sennumsie as siege",
     "sen.sendaiurl as url_hatvp",
-])
-    .select(({ ref }) => [
     urls(ref("sen.senmat")).as("urls"),
     mandatsEluSenateur(ref("sen.senmat")).as("mandats_senateur"),
     mandatsMembreCommission(ref("sen.senmat")).as("commissions"),

package/lib/model/texte.js

@@ -195,10 +195,10 @@ export function transformExposeDesMotifs(document) {
                 continue;
             }
             else {
-                sectionElement.removeChild(secondParagraph);
+                secondParagraph.remove();
             }
         }
-        sectionElement.removeChild(firstParagraph);
+        firstParagraph.remove();
         return {
             text: sectionElement.textContent?.trim() ?? null,
             html: sectionElement.innerHTML?.trim() ?? null,
@@ -231,14 +231,26 @@ export async function parseTexteFromFile(xmlFilePath) {
     return null;
 }
 export function parseExposeDesMotifs(exposeDesMotifsHtml) {
-    const { document } = new JSDOM(exposeDesMotifsHtml, {
-        contentType: "text/html",
-    }).window;
-    return transformExposeDesMotifs(document);
+    try {
+        const { document } = new JSDOM(exposeDesMotifsHtml, {
+            contentType: "text/html",
+        }).window;
+        return transformExposeDesMotifs(document);
+    }
+    catch (error) {
+        console.error(`Could not parse exposé des motifs with error ${error}`);
+    }
+    return null;
 }
 // Prevent from memory leak
 // https://github.com/jsdom/jsdom/issues/2583#issuecomment-559520814
 export async function parseExposeDesMotifsFromFile(htmlFilePath) {
-    const { document } = (await JSDOM.fromFile(htmlFilePath, { contentType: "text/html" })).window;
-    return transformExposeDesMotifs(document);
+    try {
+        const { document } = (await JSDOM.fromFile(htmlFilePath, { contentType: "text/html" })).window;
+        return transformExposeDesMotifs(document);
+    }
+    catch (error) {
+        console.error(`Could not parse exposé des motifs with error ${error}`);
+    }
+    return null;
 }

package/lib/model/util.d.ts

@@ -5,4 +5,4 @@ export declare function nullIf(expr: Expression<number | string | null | undefin
 export declare function removeSubstring(expr: Expression<string | null | undefined>, pattern: Expression<string>): import("kysely").RawBuilder<string>;
 export declare function replace(expr: Expression<string | null | undefined>, pattern: Expression<string>, replacement: Expression<string>): import("kysely").RawBuilder<string>;
 export declare function rtrim(expr: Expression<string | null | undefined>): import("kysely").RawBuilder<string>;
-export declare function toDateString(expr: Expression<Date | null | undefined>): import("kysely").RawBuilder<string>;
+export declare function toDateString(expr: Expression<Date | null | undefined>, format?: Expression<string>): import("kysely").RawBuilder<string>;

package/lib/model/util.js

@@ -1,4 +1,5 @@
 import { sql } from "kysely";
+import { STANDARD_DATE_FORMAT } from "../scripts/datautil";
 export function concat(...exprs) {
     return sql.join(exprs, sql `||`).$castTo();
 }
@@ -17,6 +18,6 @@ export function replace(expr, pattern, replacement) {
 export function rtrim(expr) {
     return sql `rtrim(${expr})`;
 }
-export function toDateString(expr) {
-    return sql `to_char(${expr}, 'yyyy-MM-dd')`;
+export function toDateString(expr, format = sql.val(STANDARD_DATE_FORMAT)) {
+    return sql `to_char(${expr}, ${format})`;
 }

package/lib/scripts/convert_data.js

@@ -3,11 +3,10 @@ import commandLineArgs from "command-line-args";
 import fs from "fs-extra";
 import path from "path";
 import { datasets, EnabledDatasets, getEnabledDatasets } from "../datasets";
-import { DOCUMENT_METADATA_FILE, DOSLEG_DOSSIERS_FOLDER, RAPPORT_FOLDER, SENS_CIRCONSCRIPTIONS_FOLDER, SENS_ORGANISMES_FOLDER, SENS_SENATEURS_FOLDER, TEXTE_FOLDER, DATA_ORIGINAL_FOLDER, } from "../loaders";
-import { findAllAmendements, findAllCirconscriptions, findAllLois, findAllOrganismes, findAllQuestions, findAllSens, } from "../model";
-import { findSenatRapportUrls, findSenatTexteUrls } from "../model/dosleg";
-import { getSessionsFromStart, UNDEFINED_SESSION } from "../types/sessions";
-import { formatToFourDigitSession, SIGNET_STRUCTURE_REGEXP, } from "./datautil";
+import { DATA_ORIGINAL_FOLDER, DOCUMENT_METADATA_FILE, DOSLEG_DOSSIERS_FOLDER, RAPPORT_FOLDER, SENS_CIRCONSCRIPTIONS_FOLDER, SENS_ORGANISMES_FOLDER, SENS_SENATEURS_FOLDER, TEXTE_FOLDER, } from "../loaders";
+import { findAllAmendements, findAllCirconscriptions, findAllDebats, findAllLois, findAllOrganismes, findAllQuestions, findAllSens, findAuteur, findSenatRapportUrls, findSenatTexteUrls, } from "../model";
+import { UNDEFINED_SESSION } from "../types/sessions";
+import { getSessionFromDate, getSessionFromSignet } from "./datautil";
 import { commonOptions } from "./shared/cli_helpers";
 import { ensureAndClearDir } from "./shared/util";
 const optionsDefinitions = [...commonOptions];
@@ -20,13 +19,15 @@ async function convertData() {
     const dataDir = options["dataDir"];
     assert(dataDir, "Missing argument: data directory");
     const enabledDatasets = getEnabledDatasets(options["categories"]);
-    const sessions = getSessionsFromStart(options["fromSession"]);
     console.time("data transformation time");
     if (enabledDatasets & EnabledDatasets.Ameli) {
         await convertDatasetAmeli(dataDir);
     }
+    if (enabledDatasets & EnabledDatasets.Debats) {
+        await convertDatasetDebats(dataDir);
+    }
     if (enabledDatasets & EnabledDatasets.DosLeg) {
-        await convertDatasetDosLeg(dataDir, sessions);
+        await convertDatasetDosLeg(dataDir);
     }
     if (enabledDatasets & EnabledDatasets.Questions) {
         await convertDatasetQuestions(dataDir);
@@ -58,7 +59,40 @@ async function convertDatasetAmeli(dataDir) {
         fs.writeJSONSync(path.join(ameliReorganizedDir, amendementFileName), amendement, { spaces: 2 });
     }
 }
-async function convertDatasetDosLeg(dataDir, sessions) {
+async function convertDatasetDebats(dataDir) {
+    const dataset = datasets.debats;
+    if (!options["silent"]) {
+        console.log(`Converting database ${dataset.database} data into files…`);
+    }
+    const debatsReorganizedRootDir = path.join(dataDir, dataset.database);
+    ensureAndClearDir(debatsReorganizedRootDir);
+    for await (const debat of findAllDebats()) {
+        if (options["verbose"]) {
+            console.log(`Converting ${debat.id} file…`);
+        }
+        const enrichedDebat = await enrichDebat(debat);
+        const session = getSessionFromDate(enrichedDebat.date_seance);
+        const debatsReorganizedDir = path.join(debatsReorganizedRootDir, String(session));
+        fs.ensureDirSync(debatsReorganizedDir);
+        const debatFileName = `${enrichedDebat.id}.json`;
+        fs.writeJSONSync(path.join(debatsReorganizedDir, debatFileName), enrichedDebat, { spaces: 2 });
+    }
+}
+async function enrichDebat(debat) {
+    const enrichedDebat = { ...debat };
+    for (const section of enrichedDebat.sections) {
+        for (const intervention of section.interventions) {
+            intervention.auteur = await findAuteur(intervention.auteur_code);
+        }
+    }
+    for (const section of enrichedDebat.sections_divers) {
+        for (const intervention of section.interventions) {
+            intervention.auteur = await findAuteur(intervention.auteur_code);
+        }
+    }
+    return enrichedDebat;
+}
+async function convertDatasetDosLeg(dataDir) {
     const dataset = datasets.dosleg;
     if (!options["silent"]) {
         console.log(`Converting database ${dataset.database} data into files…`);
@@ -72,20 +106,16 @@ async function convertDatasetDosLeg(dataDir, sessions) {
             console.log(`Converting ${loi.signet} file…`);
         }
         let loiReorganizedDir = path.join(dossiersReorganizedDir, String(UNDEFINED_SESSION));
-        const signetParts = SIGNET_STRUCTURE_REGEXP.exec(loi.signet)?.groups;
-        if (signetParts && "session" in signetParts) {
-            const { session } = signetParts;
-            const formattedSession = formatToFourDigitSession(session);
-            loiReorganizedDir = path.join(dossiersReorganizedDir, String(formattedSession));
-        }
+        const session = getSessionFromSignet(loi.signet) || UNDEFINED_SESSION;
+        loiReorganizedDir = path.join(dossiersReorganizedDir, String(session));
         fs.ensureDirSync(loiReorganizedDir);
         const loiFileName = `${loi.signet}.json`;
         fs.writeJSONSync(path.join(loiReorganizedDir, loiFileName), loi, {
             spaces: 2,
         });
     }
-    await convertTexteUrls(dataDir, sessions);
-    await convertRapportUrls(dataDir, sessions);
+    await convertTexteUrls(dataDir);
+    await convertRapportUrls(dataDir);
 }
 async function convertDatasetQuestions(dataDir) {
     const dataset = datasets.questions;
@@ -105,11 +135,11 @@ async function convertDatasetQuestions(dataDir) {
         fs.writeJSONSync(path.join(questionReorganizedDir, questionFileName), question, { spaces: 2 });
     }
 }
-async function convertTexteUrls(dataDir, sessions) {
+async function convertTexteUrls(dataDir) {
     const textesDir = path.join(dataDir, TEXTE_FOLDER);
     fs.ensureDirSync(textesDir);
     const originalTextesDir = path.join(textesDir, DATA_ORIGINAL_FOLDER);
-    for await (const texte of findSenatTexteUrls(sessions)) {
+    for await (const texte of findSenatTexteUrls()) {
         const texteName = path.parse(texte.url).name;
         const texteDir = path.join(originalTextesDir, `${texte.session ?? UNDEFINED_SESSION}`, texteName);
         fs.ensureDirSync(texteDir);
@@ -128,11 +158,11 @@ async function convertTexteUrls(dataDir, sessions) {
         });
     }
 }
-async function convertRapportUrls(dataDir, sessions) {
+async function convertRapportUrls(dataDir) {
     const rapportsDir = path.join(dataDir, RAPPORT_FOLDER);
     fs.ensureDirSync(rapportsDir);
     const originalTextesDir = path.join(rapportsDir, DATA_ORIGINAL_FOLDER);
-    for await (const rapport of findSenatRapportUrls(sessions)) {
+    for await (const rapport of findSenatRapportUrls()) {
         const parsedRapportUrl = path.parse(rapport.url);
         const rapportName = parsedRapportUrl.name;
         const rapportDir = path.join(originalTextesDir, `${rapport.session ?? UNDEFINED_SESSION}`, rapportName);

package/lib/scripts/datautil.d.ts

@@ -1,4 +1,8 @@
-export declare const SIGNET_STRUCTURE_REGEXP: RegExp;
+import { Session } from "../types/sessions";
+export declare const STANDARD_DATE_FORMAT = "yyyy-MM-dd";
+export declare const ID_DATE_FORMAT = "yyyyMMdd";
 export declare const AKN_IDENTIFICATION_STRUCTURE_REGEXP: RegExp;
 export declare const AKN_WORKFLOW_IDENTIFICATION_STRUCTURE_REGEXP: RegExp;
-export declare function formatToFourDigitSession(session: string): string | 0;
+export declare const SIGNET_STRUCTURE_REGEXP: RegExp;
+export declare function getSessionFromSignet(signet: string): Session | null;
+export declare function getSessionFromDate(date: string, format?: string): Session;

package/lib/scripts/datautil.js

@@ -1,17 +1,34 @@
 import { DateTime, Settings } from "luxon";
-import { UNDEFINED_SESSION } from "../types/sessions";
 Settings.twoDigitCutoffYear = 50;
-export const SIGNET_STRUCTURE_REGEXP = /^(?<type>[a-z]+)(?<session>\d{2,4})-?(?<numTexte>\d+)?/;
+export const STANDARD_DATE_FORMAT = "yyyy-MM-dd";
+export const ID_DATE_FORMAT = "yyyyMMdd";
 export const AKN_IDENTIFICATION_STRUCTURE_REGEXP = /^\/akn\/fr\/(?<type>[a-z]+)\/(?<session>\d{4}-\d{4})\/?(?<numTexte>\d+)\/fr@(?<version>\b(?:RECT|RECT_BIS|RECT_TER|RECT_QUATER|RECT_QUINQUIES)\b)?/;
 export const AKN_WORKFLOW_IDENTIFICATION_STRUCTURE_REGEXP = /^\/akn\/fr\/(?<type>[a-z]+)\/(?<session>\d{2,4})\/?(?<numTexte>[a-zA-Z0-9]+)\/fr@(?<version>\b(?:RECT|RECT_BIS|RECT_TER|RECT_QUATER|RECT_QUINQUIES)\b)?/;
-export function formatToFourDigitSession(session) {
+export const SIGNET_STRUCTURE_REGEXP = /^(?<type>[a-z]+)(?<session>\d{2,4})-?(?<numTexte>\d+)?/;
+export function getSessionFromSignet(signet) {
+    const signetParts = SIGNET_STRUCTURE_REGEXP.exec(signet)?.groups;
+    if (signetParts && "session" in signetParts) {
+        const { session } = signetParts;
+        return formatToFourDigitSession(session);
+    }
+    return null;
+}
+function formatToFourDigitSession(session) {
     if (session.length >= 2) {
         const sessionFirstTwoDigits = session.substring(0, 2);
         const sessionLastTwoDigits = session.substring(session.length - 2);
         const twoDigitSession = parseInt(sessionFirstTwoDigits) === parseInt(sessionLastTwoDigits) - 1
             ? sessionFirstTwoDigits
             : sessionLastTwoDigits;
-        return DateTime.fromFormat(String(twoDigitSession), "yy").toFormat("yyyy");
+        return parseInt(DateTime.fromFormat(String(twoDigitSession), "yy").toFormat("yyyy"));
+    }
+    return null;
+}
+export function getSessionFromDate(date, format = STANDARD_DATE_FORMAT) {
+    const parsedDate = DateTime.fromFormat(date, format);
+    const endSessionDate = DateTime.fromObject({ year: parsedDate.year, month: 9, day: 30 });
+    if (parsedDate < endSessionDate) {
+        return parsedDate.year - 1;
     }
-    return UNDEFINED_SESSION;
+    return parsedDate.year;
 }

package/lib/scripts/retrieve_agenda.js

@@ -6,6 +6,7 @@ import path from "path";
 import { AGENDA_FOLDER, DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER } from "../loaders";
 import { parseAgendaFromFile } from "../model/agenda";
 import { getSessionsFromStart } from "../types/sessions";
+import { ID_DATE_FORMAT } from "./datautil";
 import { commonOptions } from "./shared/cli_helpers";
 import { ensureAndClearDir } from "./shared/util";
 const optionsDefinitions = [
@@ -18,6 +19,12 @@ const optionsDefinitions = [
 ];
 const options = commandLineArgs(optionsDefinitions);
 const SENAT_GLOBAL_AGENDA_URL_ROOT = "https://www.senat.fr/aglae/Global";
+const EVENT_DATE_FORMAT = "ddMMyyyy";
+class AgendaError extends Error {
+    constructor(message, agendaName) {
+        super(`An error occurred while retrieving Agenda ${agendaName}: ${message}`);
+    }
+}
 async function retrieveAgendas(dataDir, sessions) {
     const agendaRootDir = path.join(dataDir, AGENDA_FOLDER);
     ensureAndClearDir(agendaRootDir);
@@ -28,9 +35,6 @@ async function retrieveAgendas(dataDir, sessions) {
         fs.ensureDirSync(transformedAgendaDir);
     }
     for (const session of sessions) {
-        if (!options["silent"]) {
-            console.log(`Retrieving Agenda for session ${session}…`);
-        }
         const originalAgendaSessionDir = path.join(originalAgendaDir, `${session}`);
         fs.ensureDirSync(originalAgendaSessionDir);
         const transformedAgendaSessionDir = path.join(transformedAgendaDir, `${session}`);
@@ -39,40 +43,53 @@ async function retrieveAgendas(dataDir, sessions) {
         }
         const fifteenDaysFromNow = new Date();
         fifteenDaysFromNow.setDate(fifteenDaysFromNow.getDate() + 15);
-        for (const date = new Date(session, 0, 1); date <= new Date(session, 11, 31) && date <= fifteenDaysFromNow; date.setDate(date.getDate() + 1)) {
-            const agendaName = DateTime.fromJSDate(date).toFormat("ddMMyyyy");
-            const agendaFileName = DateTime.fromJSDate(date).toFormat("yyyyMMdd");
-            const agendaPath = path.join(originalAgendaSessionDir, agendaFileName);
+        for (const date = new Date(session, 9, 1); date <= new Date(session + 1, 8, 30) && date <= fifteenDaysFromNow; date.setDate(date.getDate() + 1)) {
+            const agendaName = DateTime.fromJSDate(date).toFormat(EVENT_DATE_FORMAT);
+            const agendaFileName = DateTime.fromJSDate(date).toFormat(ID_DATE_FORMAT);
+            const agendaPath = path.join(originalAgendaSessionDir, `${agendaFileName}.html`);
             try {
-                const response = await fetch(`${SENAT_GLOBAL_AGENDA_URL_ROOT}/agl${agendaName}.html`);
-                if (!response.ok) {
-                    if (response.status === 404) {
-                        console.warn(`Agenda ${agendaName} not found`);
-                    }
-                    else {
-                        console.error(`An error occurred while retrieving Agenda ${agendaName}: ${response.status}`);
-                    }
-                    return;
+                await downloadAgenda(agendaName, agendaPath);
+                if (options["parseAgenda"]) {
+                    await parseAgenda(transformedAgendaSessionDir, agendaFileName, agendaPath);
                 }
-                const agendaContent = await response.arrayBuffer();
-                if (!agendaContent) {
-                    return;
-                }
-                fs.writeFileSync(agendaPath, Buffer.from(agendaContent));
             }
             catch (error) {
-                console.error(error.message);
-            }
-            if (options["parseAgenda"]) {
-                const parsedAgendaEvents = await parseAgendaFromFile(agendaPath);
-                if (!parsedAgendaEvents || parsedAgendaEvents.length === 0) {
-                    continue;
-                }
-                fs.writeJSONSync(path.join(transformedAgendaSessionDir, `${agendaFileName}.json`), parsedAgendaEvents, { spaces: 2 });
+                console.error(error);
             }
         }
     }
 }
+async function downloadAgenda(agendaName, agendaPath) {
+    const agendaUrl = `${SENAT_GLOBAL_AGENDA_URL_ROOT}/agl${agendaName}.html`;
+    if (!options["silent"]) {
+        console.log(`Downloading Agenda ${agendaUrl}…`);
+    }
+    const response = await fetch(agendaUrl);
+    if (!response.ok) {
+        if (response.status === 404) {
+            console.warn(`Agenda ${agendaUrl} not found`);
+        }
+        else {
+            throw new AgendaError(String(response.status), agendaName);
+        }
+        return;
+    }
+    const agendaContent = await response.arrayBuffer();
+    if (!agendaContent) {
+        return;
+    }
+    fs.writeFileSync(agendaPath, Buffer.from(agendaContent));
+}
+async function parseAgenda(transformedAgendaSessionDir, agendaFileName, agendaPath) {
+    if (!options["silent"]) {
+        console.log(`Parsing Agenda ${agendaPath}…`);
+    }
+    const parsedAgendaEvents = await parseAgendaFromFile(agendaPath);
+    if (!parsedAgendaEvents || parsedAgendaEvents.length === 0) {
+        return;
+    }
+    fs.writeJSONSync(path.join(transformedAgendaSessionDir, `${agendaFileName}.json`), parsedAgendaEvents, { spaces: 2 });
+}
 async function main() {
     const dataDir = options["dataDir"];
     assert(dataDir, "Missing argument: data directory");

package/lib/scripts/retrieve_comptes_rendus.d.ts

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