@tricoteuses/senat 2.6.1 → 2.6.2

package/lib/model/dosleg.d.ts

@@ -231,6 +231,12 @@ declare const findAuteursQuery: import("kysely").SelectQueryBuilder<import("../r
     prenom: string | null;
     matricule: string | null;
 }>;
+export declare function findAuteurs(): Promise<{
+    code: string;
+    nom: string;
+    prenom: string | null;
+    matricule: string | null;
+}[]>;
 export declare function findAuteur(auteurCode: string): Promise<{
     code: string;
     nom: string;

package/lib/model/dosleg.js

@@ -215,6 +215,10 @@ const findAuteursQuery = dbDosleg
     "prenom as prenom",
     "autmat as matricule",
 ]);
+export async function findAuteurs() {
+    return findAuteursQuery
+        .execute();
+}
 export async function findAuteur(auteurCode) {
     return findAuteursQuery
         .where("autcod", "=", auteurCode)

package/lib/model/index.d.ts

@@ -1,5 +1,5 @@
 export { findAll as findAllAmendements } from "./ameli";
 export { findAll as findAllDebats } from "./debats";
-export { findAll as findAllLois, findAuteur, findSenatRapportUrls, findSenatTexteUrls, } from "./dosleg";
+export { findAll as findAllLois, findAuteur, findAuteurs, findSenatRapportUrls, findSenatTexteUrls, } from "./dosleg";
 export { findAll as findAllQuestions } from "./questions";
 export { findAll as findAllSens, findAllCirconscriptions, findAllOrganismes, } from "./sens";

package/lib/model/index.js

@@ -1,5 +1,5 @@
 export { findAll as findAllAmendements } from "./ameli";
 export { findAll as findAllDebats } from "./debats";
-export { findAll as findAllLois, findAuteur, findSenatRapportUrls, findSenatTexteUrls, } from "./dosleg";
+export { findAll as findAllLois, findAuteur, findAuteurs, findSenatRapportUrls, findSenatTexteUrls, } from "./dosleg";
 export { findAll as findAllQuestions } from "./questions";
 export { findAll as findAllSens, findAllCirconscriptions, findAllOrganismes, } from "./sens";

package/lib/scripts/convert_data.js

@@ -4,7 +4,7 @@ import fs from "fs-extra";
 import path from "path";
 import { datasets, EnabledDatasets, getEnabledDatasets } from "../datasets";
 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 { findAllAmendements, findAllCirconscriptions, findAllDebats, findAllLois, findAllOrganismes, findAllQuestions, findAllSens, findAuteurs, findSenatRapportUrls, findSenatTexteUrls, } from "../model";
 import { UNDEFINED_SESSION } from "../types/sessions";
 import { getSessionFromDate, getSessionFromSignet } from "./datautil";
 import { commonOptions } from "./shared/cli_helpers";
@@ -66,11 +66,12 @@ async function convertDatasetDebats(dataDir) {
     }
     const debatsReorganizedRootDir = path.join(dataDir, dataset.database);
     ensureAndClearDir(debatsReorganizedRootDir);
+    const allAuteurs = await findAuteurs();
     for await (const debat of findAllDebats()) {
         if (options["verbose"]) {
             console.log(`Converting ${debat.id} file…`);
         }
-        const enrichedDebat = await enrichDebat(debat);
+        const enrichedDebat = await enrichDebat(debat, allAuteurs);
         const session = getSessionFromDate(enrichedDebat.date_seance);
         const debatsReorganizedDir = path.join(debatsReorganizedRootDir, String(session));
         fs.ensureDirSync(debatsReorganizedDir);
@@ -78,20 +79,23 @@ async function convertDatasetDebats(dataDir) {
         fs.writeJSONSync(path.join(debatsReorganizedDir, debatFileName), enrichedDebat, { spaces: 2 });
     }
 }
-async function enrichDebat(debat) {
+async function enrichDebat(debat, auteurs) {
     const enrichedDebat = { ...debat };
     for (const section of enrichedDebat.sections) {
         for (const intervention of section.interventions) {
-            intervention.auteur = await findAuteur(intervention.auteur_code);
+            intervention.auteur = findAuteur(intervention.auteur_code, auteurs);
         }
     }
     for (const section of enrichedDebat.sections_divers) {
         for (const intervention of section.interventions) {
-            intervention.auteur = await findAuteur(intervention.auteur_code);
+            intervention.auteur = findAuteur(intervention.auteur_code, auteurs);
         }
     }
     return enrichedDebat;
 }
+function findAuteur(auteurCode, auteurs) {
+    return auteurs.find(auteur => auteur.code === auteurCode);
+}
 async function convertDatasetDosLeg(dataDir) {
     const dataset = datasets.dosleg;
     if (!options["silent"]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tricoteuses/senat",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "Handle French Sénat's open data",
   "keywords": [
     "France",