@tricoteuses/senat 2.20.34 → 2.20.35

package/lib/config.d.ts

@@ -1,3 +1,21 @@
 import "dotenv/config";
-declare const validConfig: any;
-export default validConfig;
+import { z } from "zod";
+export declare const configSchema: z.ZodObject<{
+    db: z.ZodObject<{
+        host: z.ZodString;
+        name: z.ZodString;
+        password: z.ZodString;
+        port: z.ZodCoercedNumber<unknown>;
+        user: z.ZodString;
+    }, z.core.$strip>;
+}, z.core.$strip>;
+declare const _default: {
+    db: {
+        host: string;
+        name: string;
+        password: string;
+        port: number;
+        user: string;
+    };
+};
+export default _default;

package/lib/config.js

@@ -1,16 +1,27 @@
 import "dotenv/config";
-import { validateConfig } from "./validators/config";
+import { z } from "zod";
+const dbSchema = z.object({
+    host: z.string().trim().min(1, "Must not be empty"),
+    name: z.string().trim().min(1, "Must not be empty"),
+    password: z.string().trim().min(1, "Must not be empty"),
+    port: z.coerce.number().int().min(0).max(65535),
+    user: z.string().trim().min(1, "Must not be empty"),
+});
+export const configSchema = z.object({
+    db: dbSchema,
+});
 const config = {
     db: {
         host: process.env["TRICOTEUSES_SENAT_DB_HOST"] || "localhost",
+        name: process.env["TRICOTEUSES_SENAT_DB_NAME"] || "postgres",
         password: process.env["TRICOTEUSES_SENAT_DB_PASSWORD"] || "opendata",
         port: process.env["TRICOTEUSES_SENAT_DB_PORT"] || 5432,
         user: process.env["TRICOTEUSES_SENAT_DB_USER"] || "opendata",
     },
 };
-const [validConfig, error] = validateConfig(config);
-if (error !== null) {
-    console.error(`Error in configuration:\n${JSON.stringify(validConfig, null, 2)}\nError:\n${JSON.stringify(error, null, 2)}`);
+const result = configSchema.safeParse(config);
+if (!result.success) {
+    console.error(`Error in configuration:\n${JSON.stringify(config, null, 2)}\nError:\n${JSON.stringify(result.error.issues, null, 2)}`);
     process.exit(-1);
 }
-export default validConfig;
+export default result.data;

package/lib/loaders.d.ts

@@ -5,9 +5,11 @@ import { QuestionResult } from "./model/questions";
 import { ScrutinResult } from "./model/scrutins";
 import { CirconscriptionResult, OrganismeResult, SenateurResult } from "./model/sens";
 import { Reunion } from "./types/agenda";
-import { FlatTexte } from "./types/texte";
+import { FlatTexte, DocumentMetadata } from "./types/texte";
 import { CompteRendu } from "./types/compte_rendu";
+import { DocumentResult } from "./model/documents";
 export { EnabledDatasets } from "./datasets";
+export type { DocumentResult } from "./model/documents";
 export declare const AGENDA_FOLDER = "agenda";
 export declare const COMPTES_RENDUS_FOLDER = "seances";
 export declare const COMMISSION_FOLDER = "commissions";
@@ -27,46 +29,6 @@ export type IterItem<T> = {
     legislature?: number;
     gitStatus?: "A" | "M" | "D" | "R" | "C" | "T" | "U";
 };
-export interface TexteMetadata {
-    name: string;
-    session: number | null | undefined;
-    date?: string | null;
-    url_expose_des_motifs?: URL;
-    url_xml: URL;
-    url_html: URL;
-    url_pdf: URL;
-}
-export interface RapportMetadata {
-    name: string;
-    session: number | null | undefined;
-    date?: string | null;
-    url_html: URL;
-    url_pdf: URL;
-}
-export interface DossierLegislatifDocumentResult {
-    signet_dossier: string;
-    url_dossier_senat: string;
-    url_dossier_assemblee_nationale: string | null;
-    type_lecture: string;
-    libelle_lecture: string;
-    libelle_organisme: string | null;
-    code_organisme: string | null;
-    numero: number | null;
-    id: string | null;
-    url: string;
-    origine?: string | null | undefined;
-    type: string;
-    date: string;
-    session: number | null;
-    auteurs: {
-        prenom: string | null;
-        nom_usuel: string;
-        matricule: string | null;
-    }[];
-    organismes?: {
-        libelle: string;
-    }[] | undefined;
-}
 export declare function iterFilePaths(dirPath: string): Generator<string>;
 export declare function iterLoadSenatAmendements(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<AmendementResult>>;
 export declare function iterLoadSenatDebats(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<DebatResult>>;
@@ -79,11 +41,11 @@ export declare function iterLoadSenatComptesRendusCommissions(dataDir: string, s
     session: number;
 }>;
 export declare function iterLoadSenatDossiersLegislatifs(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<DossierLegislatifResult>>;
-export declare function iterLoadSenatDossiersLegislatifsRapportUrls(dataDir: string, session: number | undefined): Generator<IterItem<RapportMetadata>>;
-export declare function iterLoadSenatDossiersLegislatifsTexteUrls(dataDir: string, session: number | undefined): Generator<IterItem<TexteMetadata>>;
-export declare function iterLoadSenatDossiersLegislatifsDocuments(dataDir: string, session: number | undefined, documentType: "textes" | "rapports", options?: {}): Generator<IterItem<DossierLegislatifDocumentResult>>;
-export declare function iterLoadSenatDossiersLegislatifsRapports(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<DossierLegislatifDocumentResult>>;
-export declare function iterLoadSenatDossiersLegislatifsTextes(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<DossierLegislatifDocumentResult>>;
+export declare function iterLoadSenatRapportUrls(dataDir: string, session: number | undefined): Generator<IterItem<DocumentMetadata>>;
+export declare function iterLoadSenatTexteUrls(dataDir: string, session: number | undefined): Generator<IterItem<DocumentMetadata>>;
+export declare function iterLoadSenatDocuments(dataDir: string, session: number | undefined, documentType: "textes" | "rapports", options?: {}): Generator<IterItem<DocumentResult>>;
+export declare function iterLoadSenatRapports(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<DocumentResult>>;
+export declare function iterLoadSenatTextes(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<DocumentResult>>;
 export declare function loadSenatTexteContent(dataDir: string, textePathFromDataset: string): IterItem<FlatTexte | null>;
 export declare function loadSenatCompteRenduContent(dataDir: string, session: number, debatId: string | number): {
     item: CompteRendu | null;

package/lib/loaders.js

@@ -50,6 +50,9 @@ function* iterLoadSenatItems(dataDir, dataName, legislatureOrSession, subDir, {
         console.log(`Found ${changedFiles?.size || 0} changed files (AMR)`);
     }
     for (const filePath of iterFilePaths(itemsDir)) {
+        if (!filePath.endsWith(".json")) {
+            continue;
+        }
         const relativePath = path.relative(path.join(dataDir, dataName), filePath);
         const gitStatus = changedFiles?.get(relativePath);
         // Filter by changed files if sinceCommit is specified
@@ -147,7 +150,7 @@ export function* iterLoadSenatDossiersLegislatifs(dataDir, session, options = {}
         yield dossierLegislatifItem;
     }
 }
-export function* iterLoadSenatDossiersLegislatifsRapportUrls(dataDir, session) {
+export function* iterLoadSenatRapportUrls(dataDir, session) {
     let itemsDir = path.join(dataDir, RAPPORT_FOLDER, DATA_ORIGINAL_FOLDER);
     if (session) {
         itemsDir = path.join(itemsDir, session.toString());
@@ -163,7 +166,7 @@ export function* iterLoadSenatDossiersLegislatifsRapportUrls(dataDir, session) {
         }
     }
 }
-export function* iterLoadSenatDossiersLegislatifsTexteUrls(dataDir, session) {
+export function* iterLoadSenatTexteUrls(dataDir, session) {
     let itemsDir = path.join(dataDir, TEXTE_FOLDER, DATA_ORIGINAL_FOLDER);
     if (session) {
         itemsDir = path.join(itemsDir, session.toString());
@@ -179,7 +182,7 @@ export function* iterLoadSenatDossiersLegislatifsTexteUrls(dataDir, session) {
         }
     }
 }
-export function* iterLoadSenatDossiersLegislatifsDocuments(dataDir, session, documentType, options = {}) {
+export function* iterLoadSenatDocuments(dataDir, session, documentType, options = {}) {
     for (const { item: dossierLegislatif } of iterLoadSenatDossiersLegislatifs(dataDir, session, options)) {
         for (const lecture of dossierLegislatif["lectures"]) {
             const lecturesSenat = lecture.lectures_assemblee.filter((lectureAssemblee) => lectureAssemblee.assemblee === "Sénat");
@@ -187,11 +190,6 @@ export function* iterLoadSenatDossiersLegislatifsDocuments(dataDir, session, doc
                 for (const document of lectureSenat[documentType]) {
                     const enrichedDocument = {
                         signet_dossier: dossierLegislatif["signet"],
-                        url_dossier_senat: dossierLegislatif["url"],
-                        url_dossier_assemblee_nationale: dossierLegislatif["url_dossier_assemblee_nationale"],
-                        type_lecture: lecture.type_lecture,
-                        libelle_lecture: lecture.libelle,
-                        libelle_organisme: lectureSenat.libelle_organisme,
                         ...document,
                     };
                     const documentItem = {
@@ -207,13 +205,15 @@ export function* iterLoadSenatDossiersLegislatifsDocuments(dataDir, session, doc
         }
     }
 }
-export function* iterLoadSenatDossiersLegislatifsRapports(dataDir, session, options = {}) {
-    for (const iterItem of iterLoadSenatDossiersLegislatifsDocuments(dataDir, session, "rapports", options)) {
-        yield iterItem;
+export function* iterLoadSenatRapports(dataDir, session, options = {}) {
+    for (const iterItem of iterLoadSenatItems(dataDir, RAPPORT_FOLDER, session, "original", options)) {
+        if (iterItem.item?.["id"]) {
+            yield iterItem;
+        }
     }
 }
-export function* iterLoadSenatDossiersLegislatifsTextes(dataDir, session, options = {}) {
-    for (const iterItem of iterLoadSenatDossiersLegislatifsDocuments(dataDir, session, "textes", options)) {
+export function* iterLoadSenatTextes(dataDir, session, options = {}) {
+    for (const iterItem of iterLoadSenatDocuments(dataDir, session, "textes", options)) {
         yield iterItem;
     }
 }

package/lib/model/ameli.js

@@ -47,9 +47,7 @@ const findAllAmendementsQuery = dbSenat
     .leftJoin("ameli.typses", "ameli.typses.id", "ameli.ses.typid")
     .leftJoin("ameli.nat", "ameli.txt_ameli.natid", "ameli.nat.id")
     .leftJoin("ameli.lec_ameli", "ameli.txt_ameli.lecid", "ameli.lec_ameli.id")
-    .leftJoin("dosleg.texte", (join) => join
-    .onRef("ameli.ses.ann", "=", "dosleg.texte.sesann")
-    .onRef("ameli.txt_ameli.numabs", "=", "dosleg.texte.texnum"))
+    .leftJoin("dosleg.texte", (join) => join.onRef("ameli.ses.ann", "=", "dosleg.texte.sesann").onRef("ameli.txt_ameli.numabs", "=", "dosleg.texte.texnum"))
     .leftJoin("dosleg.lecass", "dosleg.texte.lecassidt", "dosleg.lecass.lecassidt")
     .leftJoin("ameli.mot", "ameli.amd.motid", "ameli.mot.id")
     .leftJoin("ameli.avicom", "ameli.amd.avcid", "ameli.avicom.id")

package/lib/model/documents.d.ts

@@ -1,2 +1,12 @@
-export declare function findSenatTexteUrls(sessions?: number[]): any;
-export declare function findSenatRapportUrls(sessions?: number[]): any;
+import { Expression, InferResult, SelectQueryBuilder } from "kysely";
+export declare function rapports(lectureAssembleeId: Expression<string>): import("kysely").RawBuilder<{
+    [x: string]: any;
+}[]>;
+declare const queryTextes: SelectQueryBuilder<any, any, any>;
+export declare function textes(lectureAssembleeId: Expression<string>): import("kysely").RawBuilder<{
+    [x: string]: any;
+}[]>;
+export declare function findAllTextes(): AsyncIterableIterator<DocumentResult>;
+export declare function findAllRapports(): AsyncIterableIterator<DocumentResult>;
+export type DocumentResult = InferResult<typeof queryTextes>[0];
+export {};

package/lib/model/documents.js

@@ -1,33 +1,138 @@
+import { sql } from "kysely";
 import { dbSenat } from "../databases";
-import { rtrim, toDateString } from "./util";
-export function findSenatTexteUrls(sessions = []) {
-    return dbSenat
+import { concat, rtrim, toDateString } from "./util";
+import { jsonArrayFrom } from "kysely/helpers/postgres";
+function orderOrdreOrigineTexte(expr) {
+    return sql `array_position(array['0','2','1'], ${expr})`;
+}
+function auteursRapport(rapportId) {
+    return jsonArrayFrom(dbSenat
         .withSchema("dosleg")
-        .selectFrom("texte")
-        .where("texurl", "is not", null)
-        .where("typurl", "=", "I")
-        .$if(sessions.length > 0, (qb) => qb.where("sesann", "in", sessions))
-        .select(({ eb, ref }) => [
-        "sesann as session",
-        rtrim(ref("texurl")).as("url"),
-        toDateString(ref("txtoritxtdat")).as("date"),
-        eb.case().when("oritxtcod", "=", "1").then(true).else(false).end().as("hasExposeDesMotifs"),
+        .selectFrom("dosleg.auteur")
+        .leftJoin("dosleg.ecr", "dosleg.ecr.autcod", "dosleg.auteur.autcod")
+        .leftJoin("dosleg.rolsig", "dosleg.rolsig.signataire", "dosleg.ecr.signataire")
+        .where("dosleg.ecr.rapcod", "=", rapportId)
+        .select([
+        "dosleg.auteur.prenom as prenom",
+        "dosleg.auteur.nomuse as nom_usuel",
+        "dosleg.auteur.autmat as matricule",
+        "dosleg.ecr.ecrnumtri as ordre",
+        "dosleg.rolsig.rolsiglib as role",
+        "dosleg.ecr.ecrqua as qualite",
     ])
-        .$narrowType()
-        .stream();
+        .orderBy("dosleg.ecr.ecrnumtri", "asc"));
+}
+function documentsAttaches(rapportId) {
+    return jsonArrayFrom(dbSenat
+        .withSchema("dosleg")
+        .selectFrom("docatt")
+        .leftJoin("typatt", "docatt.typattcod", "typatt.typattcod")
+        .where("docatt.rapcod", "=", rapportId)
+        .select(["docatt.docatturl as url", "typatt.typattlib as type_document"]));
+}
+function selectRapportAttributes({ eb, ref, val }) {
+    return [
+        "rap.rapnum as numero",
+        "raporg.orgcod as code_organisme",
+        eb
+            .case()
+            .when("rap.rapurl", "is not", null)
+            .then(sql `regexp_replace(trim(${ref("rap.rapurl")}), '^(.*/)?(.*?)(\\.html)?$', '\\2')`)
+            .else(null)
+            .end()
+            .as("id"),
+        eb
+            .case()
+            .when("rap.typurl", "=", "I")
+            .then(concat(val("https://www.senat.fr/rap/"), rtrim(ref("rap.rapurl"))))
+            .else(rtrim(ref("rap.rapurl")))
+            .end()
+            .as("url"),
+        rtrim(ref("denrap.libdenrap")).as("type"),
+        rtrim(rtrim(ref("rap.raptil"))).as("titre"),
+        rtrim(rtrim(ref("rap.rapsoustit"))).as("sous_titre"),
+        toDateString(ref("rap.date_depot")).as("date"),
+        "rap.sesann as session",
+        auteursRapport(ref("rap.rapcod")).as("auteurs"),
+        documentsAttaches(ref("rap.rapcod")).as("documents_annexes"),
+    ];
+}
+const baseQueryRapports = dbSenat
+    .withSchema("dosleg")
+    .selectFrom("rap")
+    .leftJoin("raporg", "raporg.rapcod", "rap.rapcod")
+    .leftJoin("denrap", "denrap.coddenrap", "rap.coddenrap")
+    .leftJoin("lecassrap", "lecassrap.rapcod", "rap.rapcod");
+const queryRapports = baseQueryRapports
+    .leftJoin("lecass", "lecass.lecassidt", "lecassrap.lecassidt")
+    .leftJoin("lecture", "lecture.lecidt", "lecass.lecidt")
+    .leftJoin("loi", "loi.loicod", "lecture.loicod")
+    .select((args) => ["loi.signet as signet_dossier", ...selectRapportAttributes(args)]);
+export function rapports(lectureAssembleeId) {
+    return jsonArrayFrom(baseQueryRapports.select(selectRapportAttributes).where("lecassrap.lecassidt", "=", lectureAssembleeId));
 }
-export function findSenatRapportUrls(sessions = []) {
-    return dbSenat
+function auteursTexte(texteId) {
+    return jsonArrayFrom(dbSenat
         .withSchema("dosleg")
-        .selectFrom("rap")
-        .where("rapurl", "is not", null)
-        .where("typurl", "=", "I")
-        .$if(sessions.length > 0, (qb) => qb.where("sesann", "in", sessions))
-        .select(({ ref }) => [
-        "sesann as session",
-        rtrim(ref("rapurl")).as("url"),
-        toDateString(ref("date_depot")).as("date"),
+        .selectFrom("auteur")
+        .leftJoin("ecr", "ecr.autcod", "auteur.autcod")
+        .leftJoin("rolsig", "rolsig.signataire", "ecr.signataire")
+        .where("ecr.texcod", "=", texteId)
+        .select([
+        "auteur.prenom as prenom",
+        "auteur.nomuse as nom_usuel",
+        "auteur.autmat as matricule",
+        "ecr.ecrnumtri as ordre",
+        "rolsig.rolsiglib as role",
+        "ecr.ecrqua as qualite",
     ])
-        .$narrowType()
-        .stream();
+        .orderBy("ecr.ecrnumtri", "asc"));
+}
+function selectTexteAttributes({ eb, ref, val }) {
+    return [
+        "texte.texnum as numero",
+        "texte.orgcod as code_organisme",
+        eb
+            .case()
+            .when("texte.texurl", "is not", null)
+            .then(sql `regexp_replace(trim(${ref("texte.texurl")}), '^(.*/)?(.*?)(\\.html)?$', '\\2')`)
+            .else(null)
+            .end()
+            .as("id"),
+        eb
+            .case()
+            .when("texte.typurl", "=", "I")
+            .then(concat(val("https://www.senat.fr/leg/"), rtrim(ref("texte.texurl"))))
+            .else(rtrim(ref("texte.texurl")))
+            .end()
+            .as("url"),
+        rtrim(ref("oritxt.oritxtlib")).as("origine"),
+        "oritxt.oriordre as ordre_origine",
+        "oritxt.oritxtado as code_adoption",
+        "oritxt.oritxtmod as modification",
+        rtrim(ref("typtxt.typtxtlib")).as("type"),
+        toDateString(ref("texte.txtoritxtdat")).as("date"),
+        "texte.sesann as session",
+        auteursTexte(ref("texte.texcod")).as("auteurs"),
+    ];
+}
+const baseQueryTextes = dbSenat
+    .withSchema("dosleg")
+    .selectFrom("texte")
+    .leftJoin("oritxt", "oritxt.oritxtcod", "texte.oritxtcod")
+    .leftJoin("typtxt", "typtxt.typtxtcod", "texte.typtxtcod")
+    .orderBy(({ ref }) => orderOrdreOrigineTexte(ref("oritxt.oriordre")));
+const queryTextes = baseQueryTextes
+    .leftJoin("lecass", "lecass.lecassidt", "texte.lecassidt")
+    .leftJoin("lecture", "lecture.lecidt", "lecass.lecidt")
+    .leftJoin("loi", "loi.loicod", "lecture.loicod")
+    .select((args) => ["loi.signet as signet_dossier", ...selectTexteAttributes(args)]);
+export function textes(lectureAssembleeId) {
+    return jsonArrayFrom(baseQueryTextes.select(selectTexteAttributes).where("texte.lecassidt", "=", lectureAssembleeId));
+}
+export function findAllTextes() {
+    return queryTextes.stream();
+}
+export function findAllRapports() {
+    return queryRapports.stream();
 }

package/lib/model/dosleg.js

@@ -1,10 +1,8 @@
 import { sql } from "kysely";
 import { jsonArrayFrom } from "kysely/helpers/postgres";
 import { dbSenat } from "../databases";
-import { concat, removeSubstring, rtrim, toDateString } from "./util";
-function orderOrdreOrigineTexte(expr) {
-    return sql `array_position(array['0','2','1'], ${expr})`;
-}
+import { concat, rtrim, toDateString } from "./util";
+import { textes, rapports } from "./documents";
 function datesSeances(lectureAssembleeId) {
     return jsonArrayFrom(dbSenat
         .withSchema("dosleg")
@@ -12,120 +10,6 @@ function datesSeances(lectureAssembleeId) {
         .where("dosleg.date_seance.lecidt", "=", lectureAssembleeId)
         .select(({ ref }) => [toDateString(ref("dosleg.date_seance.date_s")).as("date")]));
 }
-function auteursRapport(rapportId) {
-    return jsonArrayFrom(dbSenat
-        .withSchema("dosleg")
-        .selectFrom("dosleg.auteur")
-        .leftJoin("dosleg.ecr", "dosleg.ecr.autcod", "dosleg.auteur.autcod")
-        .leftJoin("dosleg.rolsig", "dosleg.rolsig.signataire", "dosleg.ecr.signataire")
-        .where("dosleg.ecr.rapcod", "=", rapportId)
-        .select([
-        "dosleg.auteur.prenom as prenom",
-        "dosleg.auteur.nomuse as nom_usuel",
-        "dosleg.auteur.autmat as matricule",
-        "dosleg.ecr.ecrnumtri as ordre",
-        "dosleg.rolsig.rolsiglib as role",
-        "dosleg.ecr.ecrqua as qualite",
-    ])
-        .orderBy("dosleg.ecr.ecrnumtri", "asc"));
-}
-function documentsAttaches(rapportId) {
-    return jsonArrayFrom(dbSenat
-        .withSchema("dosleg")
-        .selectFrom("docatt")
-        .leftJoin("typatt", "docatt.typattcod", "typatt.typattcod")
-        .where("docatt.rapcod", "=", rapportId)
-        .select([
-        "docatt.docatturl as url",
-        "typatt.typattlib as type_document"
-    ]));
-}
-function rapports(lectureAssembleeId) {
-    return jsonArrayFrom(dbSenat
-        .withSchema("dosleg")
-        .selectFrom("rap")
-        .leftJoin("lecassrap", "lecassrap.rapcod", "rap.rapcod")
-        .leftJoin("raporg", "raporg.rapcod", "rap.rapcod")
-        .leftJoin("denrap", "denrap.coddenrap", "rap.coddenrap")
-        .where("lecassrap.lecassidt", "=", lectureAssembleeId)
-        .select(({ eb, ref, val }) => [
-        "rap.rapnum as numero",
-        "raporg.orgcod as code_organisme",
-        eb
-            .case()
-            .when("rap.typurl", "=", "I")
-            .then(removeSubstring(ref("rap.rapurl"), val(".html")))
-            .else(null)
-            .end()
-            .as("id"),
-        eb
-            .case()
-            .when("rap.typurl", "=", "I")
-            .then(concat(val("https://www.senat.fr/rap/"), rtrim(ref("rap.rapurl"))))
-            .else(rtrim(ref("rap.rapurl")))
-            .end()
-            .as("url"),
-        rtrim(ref("denrap.libdenrap")).as("type"),
-        rtrim(ref("rap.raptil")).as("titre"),
-        rtrim(ref("rap.rapsoustit")).as("sous_titre"),
-        toDateString(ref("rap.date_depot")).as("date"),
-        "sesann as session",
-        auteursRapport(ref("rap.rapcod")).as("auteurs"),
-        documentsAttaches(ref("rap.rapcod")).as("documents_annexes"),
-    ]));
-}
-function auteursTexte(texteId) {
-    return jsonArrayFrom(dbSenat
-        .withSchema("dosleg")
-        .selectFrom("auteur")
-        .leftJoin("ecr", "ecr.autcod", "auteur.autcod")
-        .leftJoin("rolsig", "rolsig.signataire", "ecr.signataire")
-        .where("ecr.texcod", "=", texteId)
-        .select([
-        "auteur.prenom as prenom",
-        "auteur.nomuse as nom_usuel",
-        "auteur.autmat as matricule",
-        "ecr.ecrnumtri as ordre",
-        "rolsig.rolsiglib as role",
-        "ecr.ecrqua as qualite",
-    ])
-        .orderBy("ecr.ecrnumtri", "asc"));
-}
-function textes(lectureAssembleeId) {
-    return jsonArrayFrom(dbSenat
-        .withSchema("dosleg")
-        .selectFrom("texte")
-        .leftJoin("oritxt", "oritxt.oritxtcod", "texte.oritxtcod")
-        .leftJoin("typtxt", "typtxt.typtxtcod", "texte.typtxtcod")
-        .where("texte.lecassidt", "=", lectureAssembleeId)
-        .select(({ eb, ref, val }) => [
-        "texte.texnum as numero",
-        "texte.orgcod as code_organisme",
-        eb
-            .case()
-            .when("texte.typurl", "=", "I")
-            .then(removeSubstring(ref("texte.texurl"), val(".html")))
-            .else(null)
-            .end()
-            .as("id"),
-        eb
-            .case()
-            .when("texte.typurl", "=", "I")
-            .then(concat(val("https://www.senat.fr/leg/"), rtrim(ref("texte.texurl"))))
-            .else(rtrim(ref("texte.texurl")))
-            .end()
-            .as("url"),
-        rtrim(ref("oritxt.oritxtlib")).as("origine"),
-        "oritxt.oriordre as ordre_origine",
-        "oritxt.oritxtado as code_adoption",
-        "oritxt.oritxtmod as modification",
-        rtrim(ref("typtxt.typtxtlib")).as("type"),
-        toDateString(ref("texte.txtoritxtdat")).as("date"),
-        "sesann as session",
-        auteursTexte(ref("texte.texcod")).as("auteurs"),
-    ])
-        .orderBy(({ ref }) => orderOrdreOrigineTexte(ref("oritxt.oriordre"))));
-}
 function lecturesAssemblee(lectureId) {
     return jsonArrayFrom(dbSenat
         .withSchema("dosleg")
@@ -319,10 +203,10 @@ export function buildActesLegislatifs(dossier) {
                     numero: depotTexte.numero,
                     uid: `${loiSignet}-${phasePrefix}-DEPOT`,
                     session: lecAss.session,
-                    chambre: 'SN',
+                    chambre: "SN",
                     signet_dossier: loiSignet,
                     texte_url: depotTexte.url,
-                    code_organisme: null
+                    code_organisme: null,
                 });
             }
             // =================================================================
@@ -341,7 +225,7 @@ export function buildActesLegislatifs(dossier) {
                         adoption: rap.adoption,
                         uid: `${loiSignet}-${phasePrefix}-COM`,
                         session: lecAss.session,
-                        chambre: 'SN',
+                        chambre: "SN",
                         signet_dossier: loiSignet,
                         texte_url: rap.url,
                     });
@@ -363,9 +247,9 @@ export function buildActesLegislatifs(dossier) {
                         libelle: `Discussion en séance publique`,
                         uid: `${loiSignet}-${phasePrefix}-DEBATS-SEANCE`,
                         session: lecAss.session,
-                        chambre: 'SN',
+                        chambre: "SN",
                         signet_dossier: loiSignet,
-                        code_organisme: null
+                        code_organisme: null,
                     });
                 }
             }
@@ -397,10 +281,10 @@ export function buildActesLegislatifs(dossier) {
                     adoption: libelleStatut,
                     uid: `${loiSignet}-DEC-${texteFinal.numero}`,
                     session: lecAss.session,
-                    chambre: 'SN',
+                    chambre: "SN",
                     signet_dossier: loiSignet,
                     texte_url: texteFinal.url,
-                    code_organisme: null
+                    code_organisme: null,
                 });
             }
         }
@@ -410,19 +294,19 @@ export function buildActesLegislatifs(dossier) {
     // =================================================================
     if (dossier.date_decision_CoC) {
         actes.push({
-            code_acte: 'CC',
+            code_acte: "CC",
             date: dossier.date_decision_CoC,
             libelle: `Décision du Conseil constitutionnel`,
             id: dossier.url_decision_CoC,
             uid: `${loiSignet}-CC`,
-            chambre: 'AN',
+            chambre: "AN",
             signet_dossier: loiSignet,
             texte_url: dossier.url_decision_CoC || dossier.url_dossier_CoC,
         });
     }
     if (dossier.date_promulgation) {
         actes.push({
-            code_acte: 'PROM',
+            code_acte: "PROM",
             date: dossier.date_promulgation,
             libelle: `Promulgation de la loi`,
             date_publication_JO: dossier.date_publication_JO,
@@ -430,7 +314,7 @@ export function buildActesLegislatifs(dossier) {
             url_legifrance: dossier.url_JO,
             id: dossier.url_JO,
             uid: `${loiSignet}-PROM`,
-            chambre: 'AN',
+            chambre: "AN",
             signet_dossier: loiSignet,
         });
     }

package/lib/model/index.d.ts

@@ -1,7 +1,7 @@
 export { findAllAmendements } from "./ameli";
 export { findAll as findAllDebats } from "./debats";
 export { findAllDossiers } from "./dosleg";
-export { findSenatTexteUrls, findSenatRapportUrls } from "./documents";
+export { findAllTextes, findAllRapports } from "./documents";
 export { findAllScrutins } from "./scrutins";
 export { findAll as findAllQuestions } from "./questions";
 export { findAll as findAllSens, findAllCirconscriptions, findAllOrganismes } from "./sens";

package/lib/model/index.js

@@ -1,7 +1,7 @@
 export { findAllAmendements } from "./ameli";
 export { findAll as findAllDebats } from "./debats";
 export { findAllDossiers } from "./dosleg";
-export { findSenatTexteUrls, findSenatRapportUrls } from "./documents";
+export { findAllTextes, findAllRapports } from "./documents";
 export { findAllScrutins } from "./scrutins";
 export { findAll as findAllQuestions } from "./questions";
 export { findAll as findAllSens, findAllCirconscriptions, findAllOrganismes } from "./sens";

package/lib/raw_types/questions.d.ts

@@ -113,6 +113,10 @@ export interface TamMinisteres {
     titreministre: string | null;
 }
 export interface TamQuestions {
+    /**
+     * Question caduque redéposée
+     */
+    caduque_redeposee: string | null;
     /**
      * Libellé de la circonscription
      */

package/lib/raw_types/senat.d.ts

@@ -2735,6 +2735,10 @@ export interface QuestionsTamMinisteres {
     titreministre: string | null;
 }
 export interface QuestionsTamQuestions {
+    /**
+     * Question caduque redéposée
+     */
+    caduque_redeposee: string | null;
     /**
      * Libellé de la circonscription
      */