@tricoteuses/senat 2.4.2 → 2.5.2

package/lib/model/dosleg.js

@@ -112,7 +112,7 @@ function lecturesAssemblee(lectureId) {
         .select(({ ref }) => [
         rtrim(ref("ass.libass")).as("assemblee"),
         "org.orgnom as libelle_organisme",
-        "org.orgcod as code_organisme",
+        "org.senorgcod as code_organisme",
         "lecass.ordreass as ordre_lecture_assemblee",
         textes(ref("lecass.lecassidt")).as("textes"),
         rapports(ref("lecass.lecassidt")).as("rapports"),

package/lib/model/sens.d.ts

@@ -130,6 +130,7 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
         date_debut: string;
         date_fin: string;
         code_circonscription: string;
+        etat: string | null;
         etat_debut: string | null;
         etat_fin: string | null;
     }[];
@@ -140,10 +141,11 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
         code_organisme: string;
         type_organisme: string | null;
         libelle: string | null;
+        etat: string | null;
         fonctions: {
             date_debut: string;
             date_fin: string;
-            libelle: string | null;
+            libelle: unknown;
         }[];
     }[];
     delegations: {
@@ -153,28 +155,31 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
         type_code_organisme: string | null;
         code_organisme: string;
         libelle: string | null;
+        etat: string | null;
         fonctions: {
             date_debut: string;
             date_fin: string;
-            libelle: string | null;
+            libelle: unknown;
         }[];
     }[];
     groupes: {
         date_debut: string;
         date_fin: string;
-        code: string;
+        type_organisme: string | null;
+        type_code_organisme: string | null;
+        code_organisme: string;
         libelle: string | null;
-        fonction: string | null;
+        etat: string | null;
         fonctions: {
             date_debut: string;
             date_fin: string;
-            libelle: string | null;
+            libelle: unknown;
         }[];
     }[];
     fonctions_bureau: {
         date_debut: string;
         date_fin: string;
-        libelle: string | null;
+        libelle: unknown;
     }[];
 }>;
 declare const findAllCirconscriptionsQuery: import("kysely").SelectQueryBuilder<{
@@ -445,6 +450,7 @@ export declare function findAll(): AsyncIterableIterator<{
         date_debut: string;
         date_fin: string;
         code_circonscription: string;
+        etat: string | null;
         etat_debut: string | null;
         etat_fin: string | null;
     }[];
@@ -455,10 +461,11 @@ export declare function findAll(): AsyncIterableIterator<{
         code_organisme: string;
         type_organisme: string | null;
         libelle: string | null;
+        etat: string | null;
         fonctions: {
             date_debut: string;
             date_fin: string;
-            libelle: string | null;
+            libelle: unknown;
         }[];
     }[];
     delegations: {
@@ -468,28 +475,31 @@ export declare function findAll(): AsyncIterableIterator<{
         type_code_organisme: string | null;
         code_organisme: string;
         libelle: string | null;
+        etat: string | null;
         fonctions: {
             date_debut: string;
             date_fin: string;
-            libelle: string | null;
+            libelle: unknown;
         }[];
     }[];
     groupes: {
         date_debut: string;
         date_fin: string;
-        code: string;
+        type_organisme: string | null;
+        type_code_organisme: string | null;
+        code_organisme: string;
         libelle: string | null;
-        fonction: string | null;
+        etat: string | null;
         fonctions: {
             date_debut: string;
             date_fin: string;
-            libelle: string | null;
+            libelle: unknown;
         }[];
     }[];
     fonctions_bureau: {
         date_debut: string;
         date_fin: string;
-        libelle: string | null;
+        libelle: unknown;
     }[];
 }>;
 export declare function findAllCirconscriptions(): AsyncIterableIterator<{

package/lib/model/sens.js

@@ -1,6 +1,6 @@
 import { jsonArrayFrom, jsonObjectFrom } from "kysely/helpers/postgres";
 import { dbSens } from "../databases";
-import { concat, rtrim, toDateString } from "./util";
+import { concat, nullIf, rtrim, toDateString } from "./util";
 function circonscription(dptNum) {
     return jsonObjectFrom(dbSens
         .selectFrom("dpt")
@@ -49,10 +49,10 @@ function fonctionsBureau(senMat) {
         .selectFrom("senbur")
         .leftJoin("bur", "senbur.burcod", "bur.burcod")
         .where("senbur.senmat", "=", senMat)
-        .select(({ ref }) => [
+        .select(({ eb, ref }) => [
         toDateString(ref("senbur.senburdatdeb")).as("date_debut"),
         toDateString(ref("senbur.senburdatfin")).as("date_fin"),
-        "bur.burlib as libelle",
+        eb.fn.coalesce(nullIf(ref("bur.burlib")), nullIf(ref("bur.burlil")), nullIf(ref("bur.burlic"))).as("libelle"),
     ])
         .orderBy("senbur.senburdatdeb desc"));
 }
@@ -110,6 +110,7 @@ function mandatsEluSenateur(senMat) {
         "elusen.dptnum as code_circonscription",
         toDateString(ref("elusen.eludatdeb")).as("date_debut"),
         toDateString(ref("elusen.eludatfin")).as("date_fin"),
+        "elusen.temvalcod as etat",
         "etadebman.etadebmanlib as etat_debut",
         "etafinman.etafinman as etat_fin",
     ])
@@ -135,10 +136,10 @@ function fonctionsMembreCommission(memComId) {
         .selectFrom("fonmemcom")
         .leftJoin("foncom", "fonmemcom.foncomcod", "foncom.foncomcod")
         .where("fonmemcom.memcomid", "=", memComId)
-        .select(({ ref }) => [
+        .select(({ eb, ref }) => [
         toDateString(ref("fonmemcom.fonmemcomdatdeb")).as("date_debut"),
         toDateString(ref("fonmemcom.fonmemcomdatfin")).as("date_fin"),
-        "foncom.foncomlib as libelle",
+        eb.fn.coalesce(nullIf(ref("foncom.foncomlib")), nullIf(ref("foncom.foncomlil")), nullIf(ref("foncom.foncomlic"))).as("libelle"),
     ])
         .orderBy("fonmemcom.fonmemcomdatdeb desc"));
 }
@@ -155,6 +156,7 @@ function mandatsMembreCommission(senMat) {
         "com.comlilmin as libelle",
         toDateString(ref("memcom.memcomdatdeb")).as("date_debut"),
         toDateString(ref("memcom.memcomdatfin")).as("date_fin"),
+        "memcom.temvalcod as etat",
     ])
         .select(({ ref }) => [
         fonctionsMembreCommission(ref("memcom.memcomid")).as("fonctions"),
@@ -166,10 +168,10 @@ function fonctionsMembreDelegation(memDelegaId) {
         .selectFrom("fonmemdelega")
         .leftJoin("fondelega", "fonmemdelega.fondelcod", "fondelega.fondelcod")
         .where("fonmemdelega.memdelegaid", "=", memDelegaId)
-        .select(({ ref }) => [
+        .select(({ eb, ref }) => [
         toDateString(ref("fonmemdelega.fonmemdeldatdeb")).as("date_debut"),
         toDateString(ref("fonmemdelega.fonmemdeldatfin")).as("date_fin"),
-        "fondelega.fondellib as libelle",
+        eb.fn.coalesce(nullIf(ref("fondelega.fondellib")), nullIf(ref("fondelega.fondellil")), nullIf(ref("fondelega.fondellic"))).as("libelle"),
     ])
         .orderBy("fonmemdelega.fonmemdeldatdeb desc"));
 }
@@ -187,6 +189,7 @@ function mandatsMembreDelegation(senMat) {
         "delega.evelib as libelle",
         toDateString(ref("memdelega.memdelegadatdeb")).as("date_debut"),
         toDateString(ref("memdelega.memdelegadatfin")).as("date_fin"),
+        "memdelega.temvalcod as etat",
     ])
         .select(({ ref }) => [
         fonctionsMembreDelegation(ref("memdelega.memdelegaid")).as("fonctions"),
@@ -206,10 +209,10 @@ function fonctionsMembreGroupePolitique(memGrpPolId) {
         .selectFrom("fonmemgrppol")
         .leftJoin("fongrppol", "fonmemgrppol.fongrppolcod", "fongrppol.fongrppolcod")
         .where("fonmemgrppol.memgrppolid", "=", memGrpPolId)
-        .select(({ ref }) => [
+        .select(({ eb, ref }) => [
         toDateString(ref("fonmemgrppol.fonmemgrppoldatdeb")).as("date_debut"),
         toDateString(ref("fonmemgrppol.fonmemgrppoldatfin")).as("date_fin"),
-        "fongrppol.fongrppollib as libelle",
+        eb.fn.coalesce(nullIf(ref("fongrppol.fongrppollib")), nullIf(ref("fongrppol.fongrppollil")), nullIf(ref("fongrppol.fongrppollic"))).as("libelle"),
     ])
         .orderBy("fonmemgrppol.fonmemgrppoldatdeb desc"));
 }
@@ -218,13 +221,16 @@ function mandatsMembreGroupePolitique(senMat) {
         .selectFrom("memgrppol")
         .leftJoin("grppol", "memgrppol.grppolcod", "grppol.grppolcod")
         .leftJoin("typapppol", "memgrppol.typapppolcod", "typapppol.typapppolcod")
+        .leftJoin("typorg", "grppol.typorgcod", "typorg.typorgcod")
         .where("memgrppol.senmat", "=", senMat)
         .select(({ ref }) => [
-        "memgrppol.grppolcod as code",
+        "grppol.typorgcod as type_code_organisme",
+        "memgrppol.grppolcod as code_organisme",
+        "typorg.typorglib as type_organisme",
         "grppol.grppollibcou as libelle",
         toDateString(ref("memgrppol.memgrppoldatdeb")).as("date_debut"),
         toDateString(ref("memgrppol.memgrppoldatfin")).as("date_fin"),
-        "typapppol.typapppollib as fonction",
+        "memgrppol.temvalcod as etat",
     ])
         .select(({ ref }) => [
         fonctionsMembreGroupePolitique(ref("memgrppol.memgrppolid")).as("fonctions"),

package/lib/model/util.d.ts

@@ -1,6 +1,7 @@
 import { Expression } from "kysely";
 export declare function concat(...exprs: Expression<number | string | null | undefined>[]): import("kysely").RawBuilder<string>;
 export declare function expandToRows(expr: Expression<string | null | undefined>, regexp: Expression<string>): import("kysely").RawBuilder<unknown>;
+export declare function nullIf(expr: Expression<number | string | null | undefined>): import("kysely").RawBuilder<unknown>;
 export declare function removeSubstring(expr: Expression<string | null | undefined>, pattern: Expression<string>): import("kysely").RawBuilder<string>;
 export declare function replace(expr: Expression<string | null | undefined>, pattern: Expression<string>, replacement: Expression<string>): import("kysely").RawBuilder<string>;
 export declare function rtrim(expr: Expression<string | null | undefined>): import("kysely").RawBuilder<string>;

package/lib/model/util.js

@@ -5,6 +5,9 @@ export function concat(...exprs) {
 export function expandToRows(expr, regexp) {
     return sql `unnest(regexp_matches(${expr}, ${regexp}, 'g'))`;
 }
+export function nullIf(expr) {
+    return sql `nullif(trim(${expr}), '')`;
+}
 export function removeSubstring(expr, pattern) {
     return replace(expr, pattern, sql.val(""));
 }

package/package.json

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