@tricoteuses/senat 3.1.16 → 3.1.18

package/lib/src/rich_types/dosleg.js

@@ -118,7 +118,7 @@ export function buildActesLegislatifs(dossier) {
                 const commissionRaps = rapports.filter((r) => r.code_organisme === commission.code_organisme);
                 const firstRapDate = commissionRaps.find((r) => r.date)?.date;
                 const firstReunionDate = commission.reunions?.find((r) => r.date)?.date;
-                const acteDate = firstRapDate ?? firstReunionDate;
+                const acteDate = firstRapDate ?? firstReunionDate ?? lecAss.date_publication_amendements_commission;
                 if (acteDate) {
                     const rap = commissionRaps.find((r) => r.date);
                     actes.push({

package/lib/src/server/dosleg.js

@@ -407,6 +407,26 @@ function mergeCommissionsSaisies(lectures) {
                         }
                     }
                 }
+                // Rapports avec une commission qui n'est pas encore dans commissions_saisies.
+                // Les avis de commission (ex: DEVE) peuvent être absents des saisines ameli
+                // (table ameli.sai) alors qu'un rapport a déjà été déposé. On les ajoute
+                // comme saisines "avis" pour que buildActesLegislatifs puisse créer l'acte.
+                if (lecAss.rapports) {
+                    for (const rap of lecAss.rapports) {
+                        if (!rap.code_organisme || knownOrgs.has(rap.code_organisme))
+                            continue;
+                        const rapType = (rap.type || "").toLowerCase();
+                        if (rapType.includes("avis") || rapType.includes("information")) {
+                            commissionsSaisies.push({
+                                code_organisme: rap.code_organisme,
+                                libelle_organisme: null,
+                                type_saisine: "avis",
+                                deleguee_au_fond: null,
+                            });
+                            knownOrgs.add(rap.code_organisme);
+                        }
+                    }
+                }
                 for (const commission of commissionsSaisies) {
                     commission.reunions = reunions_commission
                         ?.filter((r) => r.code_organisme === commission.code_organisme)

package/lib/src/server/loaders.d.ts

@@ -44,7 +44,7 @@ export declare function loadSenatTexteContent(dataDir: string, session: number |
 export declare function loadSenatCompteRenduContent(dataDir: string, session: number, debatId: string | number): {
     item: CompteRendu | null;
 };
-export declare function iterLoadSenatAgendas(dataDir: string, session: number | undefined): Generator<IterItem<Reunion>>;
+export declare function iterLoadSenatAgendas(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<Reunion>>;
 export declare function iterLoadSenatCirconscriptions(dataDir: string, options?: {}): Generator<IterItem<CirconscriptionResult>>;
 export declare function iterLoadSenatOrganismes(dataDir: string, options?: {}): Generator<IterItem<OrganismeResult>>;
 export declare function iterLoadSenatSenateurs(dataDir: string, options?: {}): Generator<IterItem<SenateurResult>>;

package/lib/src/server/loaders.js

@@ -1,4 +1,3 @@
-import fsex from "fs-extra";
 import fs from "fs";
 import path from "path";
 import * as git from "./git.js";
@@ -207,30 +206,16 @@ export function loadSenatCompteRenduContent(dataDir, session, debatId) {
     const json = fs.readFileSync(fullPath, { encoding: "utf8" });
     return { item: JSON.parse(json) };
 }
-export function* iterLoadSenatAgendas(dataDir, session) {
-    const baseDir = path.join(dataDir, AGENDA_FOLDER, DATA_TRANSFORMED_FOLDER, String(session ?? ""));
-    if (!fs.existsSync(baseDir))
-        return;
-    const files = (fs.readdirSync(baseDir) || []).filter((f) => f.startsWith("RUSN") && f.endsWith(".json")).sort();
-    for (const fileName of files) {
-        const filePath = path.join(baseDir, fileName);
-        let raw;
-        try {
-            raw = fsex.readJSONSync(filePath);
-        }
-        catch {
-            continue; // JSON invalide
-        }
-        if (!raw || typeof raw !== "object")
-            continue;
-        const gr = raw;
+export function* iterLoadSenatAgendas(dataDir, session, options = {}) {
+    for (const reunionItem of iterLoadSenatItems(dataDir, AGENDA_FOLDER, session, DATA_TRANSFORMED_FOLDER, options)) {
+        const gr = reunionItem.item;
         if (!gr.uid || !gr.date || !gr.titre)
             continue;
-        const reunion = {
+        reunionItem.item = {
             ...gr,
             events: Array.isArray(gr.events) ? gr.events : [],
         };
-        yield { item: reunion };
+        yield reunionItem;
     }
 }
 export function* iterLoadSenatCirconscriptions(dataDir, options = {}) {

package/package.json

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