@tricoteuses/senat 2.16.7 → 2.16.8

package/lib/loaders.js

@@ -42,8 +42,15 @@ function* iterLoadSenatItems(dataDir, dataName, legislatureOrSession, subDir, {
         if (log) {
             console.log(`Loading file: ${filePath}…`);
         }
-        const itemJson = fs.readFileSync(filePath, { encoding: "utf8" });
-        const item = JSON.parse(itemJson);
+        let item;
+        try {
+            const itemJson = fs.readFileSync(filePath, { encoding: "utf8" });
+            item = JSON.parse(itemJson);
+        }
+        catch (err) {
+            console.warn(`[iterLoadSenatItems] skipped invalid JSON: ${filePath} (${err.message})`);
+            continue;
+        }
         const filePathFromDataset = filePath.substring(filePath.indexOf(dataName) + dataName.length);
         yield {
             item,

package/lib/model/ameli.js

@@ -114,20 +114,13 @@ const findAllAmendementsQuery = dbSenat
     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"),
     "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"),
-    auteurs(ref("ameli.amd.id")).as("auteurs")
-]);
+    eb.case().when("ameli.cab.entid", "is not", null).then(true).else(false).end().as("auteur_est_gouvernement"),
+    auteurs(ref("ameli.amd.id")).as("auteurs"),
+])
+    .distinctOn("ameli.amd.id");
 export function findAllAmendements(fromSession) {
     if (fromSession !== undefined) {
-        return findAllAmendementsQuery
-            .where("ameli.ses.ann", ">=", fromSession)
-            .stream();
+        return findAllAmendementsQuery.where("ameli.ses.ann", ">=", fromSession).stream();
     }
     return findAllAmendementsQuery.stream();
 }

package/package.json

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