@tricoteuses/senat 2.20.1 → 2.20.3

package/lib/model/dosleg.js

@@ -227,24 +227,35 @@ export function createActesLegislatifs(dossier) {
                 ...texte,
             }));
             // Ajout étape -COM-FOND après chaque -DEPOT
-            let textesWithComFond = [];
+            let acteLegislatifsLecture = [];
             for (let i = 0; i < textesWithCodeActe.length; i++) {
                 const t = textesWithCodeActe[i];
-                textesWithComFond.push(t);
-                if (t.code_acte && t.code_acte.endsWith("-DEPOT")) {
-                    textesWithComFond.push({
+                acteLegislatifsLecture.push(t);
+                if (t.code_acte?.endsWith("-DEPOT") && t.type === "texte de loi") {
+                    acteLegislatifsLecture.push({
                         ...t,
                         code_acte: t.code_acte.replace("-DEPOT", "-COM-FOND"),
                     });
                 }
             }
+            if (lectureAss["dates_seances"]?.length > 0) {
+                acteLegislatifsLecture.push({
+                    session: lectureAss["session"],
+                    type_lecture: lecture["type_lecture"],
+                    libelle_lecture: "Discussion en séance publique",
+                    code_acte: `${codeParent}-DEBATS-SEANCE`,
+                    date: lectureAss["dates_seances"][0]?.["date"],
+                    id: lectureAss["id"],
+                    numero: lectureAss["numero"]
+                });
+            }
             const { textes, rapports, ...lectureAssWithoutTextes } = lectureAss;
             return {
                 type_lecture: lecture["type_lecture"],
                 ordre_lecture: lecture["ordre_lecture"],
                 libelle_lecture: lecture["libelle"],
                 code_acte: codeParent,
-                actes_legislatifs: textesWithComFond,
+                actes_legislatifs: acteLegislatifsLecture,
                 ...lectureAssWithoutTextes,
             };
         });
@@ -337,7 +348,8 @@ export function getCodeActeTexte(codeParent, texteOrigine) {
         texteOrigine === "transmis à l'Assemblée nationale" ||
         texteOrigine === "déposé à l'Assemblée nationale" ||
         texteOrigine === "transmis à l'Assemblée Nationale" ||
-        texteOrigine === "déposé à l'Assemblée Nationale") {
+        texteOrigine === "déposé à l'Assemblée Nationale" ||
+        texteOrigine === "transmis en application de l'article 47-1, alinéa 2, de la Constitution") {
         return `${codeParent}-DEPOT`;
     }
     if (texteOrigine === "de la commission" ||

package/lib/model/scrutins.d.ts

@@ -4,7 +4,7 @@ declare const findAllScrutinsQuery: import("kysely").SelectQueryBuilder<{
     [x: string]: any;
     [x: number]: any;
     [x: symbol]: any;
-}, "date_seance" | "lecass" | "lecture" | "scr" | "typlec", {
+}, "date_seance" | "lecass" | "lecture" | "loi" | "scr" | "typlec", {
     [x: string]: any;
 }>;
 export declare function findAllScrutins(fromSession?: number): AsyncIterableIterator<{

package/lib/model/scrutins.js

@@ -78,12 +78,14 @@ const findAllScrutinsQuery = dbSenat
     .leftJoin("date_seance", "scr.code", "date_seance.code")
     .leftJoin("lecass", "date_seance.lecidt", "lecass.lecassidt")
     .leftJoin("lecture", "lecture.lecidt", "lecass.lecidt")
+    .leftJoin("loi", "loi.loicod", "lecture.loicod")
     .leftJoin("typlec", "typlec.typleccod", "lecture.typleccod")
     .select(({ eb, ref, val }) => [
     "scr.sesann as session",
     "scr.scrnum as numero",
     rtrim(ref("date_seance.lecidt")).as("lecture_id"),
     rtrim(ref("lecture.leccom")).as("lecture_libelle"),
+    "loi.signet as signet_dossier",
     rtrim(ref("typlec.typleclib")).as("type_lecture"),
     toDateString(ref("scr.scrdat")).as("date_scrutin"),
     toDateString(ref("scr.scrdateff")).as("date_scrutin_effective"),

package/lib/scripts/test_iter_load.js

@@ -1,4 +1,4 @@
-import { iterLoadSenatScrutins, iterLoadSenatAmendements } from "../loaders";
+import { iterLoadSenatScrutins, iterLoadSenatAmendements, iterLoadSenatDossiersLegislatifs } from "../loaders";
 import commandLineArgs from "command-line-args";
 import { dataDirDefaultOption } from "./shared/cli_helpers";
 const optionsDefinitions = [dataDirDefaultOption];
@@ -11,3 +11,6 @@ for (const { item: scrutin } of iterLoadSenatScrutins(options["dataDir"], sessio
 for (const { item: amendement } of iterLoadSenatAmendements(options["dataDir"], session, { noValidation: noValidation })) {
     console.log(amendement["numero"]);
 }
+for (const { item: dossierLegislatif } of iterLoadSenatDossiersLegislatifs(options["dataDir"], session, { noValidation: noValidation })) {
+    console.log(dossierLegislatif["numero"]);
+}

package/package.json

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