@tricoteuses/senat 2.20.6 → 2.20.8

package/lib/model/ameli.js

@@ -1,3 +1,4 @@
+import { sql } from "kysely";
 import { jsonArrayFrom } from "kysely/helpers/postgres";
 import { dbSenat } from "../databases";
 import { concat, toDateString } from "./util";
@@ -122,7 +123,7 @@ const findAllAmendementsQuery = dbSenat
     "ameli.avigvt.lib as avis_gouvernement",
     eb.fn.coalesce("ameli.sor.lib", "ameli.irr.libirr").as("sort"),
     "ameli.amd.rev as revision",
-    concat(val("https://www.senat.fr/amendements/"), ref("ameli.ses.lil"), val("/"), ref("ameli.txt_ameli.numabs"), val("/Amdt_"), ref("ameli.amd.numabs"), val(".html")).as("url"),
+    concat(val("https://www.senat.fr/amendements/"), ref("ameli.ses.ann"), val("-"), sql `(ameli.ses.ann + 1)`, val("/"), ref("ameli.txt_ameli.numabs"), val("/Amdt_"), ref("ameli.amd.numabs"), val(".html")).as("url"),
     "ameli.grppol_ameli.lilcou as au_nom_de_groupe_politique",
     "ameli.com_ameli.lil as au_nom_de_commission",
     eb.case().when("ameli.cab.entid", "is not", null).then(true).else(false).end().as("auteur_est_gouvernement"),

package/lib/model/commission.js

@@ -234,8 +234,8 @@ export function parseCommissionCRSectionFromDom($, htmlFilePath, opts) {
             $cursor = $cursor.next();
         }
         const points = buildPointsFromParagraphs($, paras);
-        if (points.length < 4) {
-            console.warn(`[COM-CR][parse] Insufficient points found for section="${section.title}" date=${dateISO} in ${path.basename(htmlFilePath)}`);
+        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}`;

package/lib/scripts/convert_data.js

@@ -122,22 +122,18 @@ async function convertDatasetScrutins(dataDir, options) {
     }
     const scrutinsReorganizedDir = path.join(dataDir, SCRUTINS_FOLDER);
     ensureAndClearDir(scrutinsReorganizedDir);
-    const limit = pLimit(10);
-    const tasks = [];
     for await (const scrutin of findAllScrutins(options["fromSession"])) {
-        tasks.push(limit(async () => {
-            if (options["verbose"]) {
-                console.log(`Converting ${scrutin["numero"]} file…`);
-            }
-            let scrutinReorganizedDir = path.join(scrutinsReorganizedDir, String(UNDEFINED_SESSION));
-            const session = scrutin["session"] || UNDEFINED_SESSION;
-            scrutinReorganizedDir = path.join(scrutinsReorganizedDir, String(session));
-            await fs.ensureDir(scrutinReorganizedDir);
-            const scrutinFileName = `${scrutin["numero"]}.json`;
-            await fs.writeJSON(path.join(scrutinReorganizedDir, scrutinFileName), scrutin, {
-                spaces: 2,
-            });
-        }));
+        if (options["verbose"]) {
+            console.log(`Converting ${scrutin["numero"]} file…`);
+        }
+        let scrutinReorganizedDir = path.join(scrutinsReorganizedDir, String(UNDEFINED_SESSION));
+        const session = scrutin["session"] || UNDEFINED_SESSION;
+        scrutinReorganizedDir = path.join(scrutinsReorganizedDir, String(session));
+        await fs.ensureDir(scrutinReorganizedDir);
+        const scrutinFileName = `${scrutin["numero"]}.json`;
+        await fs.writeJSON(path.join(scrutinReorganizedDir, scrutinFileName), scrutin, {
+            spaces: 2,
+        });
     }
 }
 async function convertDatasetQuestions(dataDir) {

package/package.json

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