@tricoteuses/senat 2.22.11 → 2.22.12

package/lib/src/model/sens.d.ts

@@ -54,6 +54,24 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
         date_fin: string;
         libelle: unknown;
     }[];
+    points_contact: {
+        [x: string]: any;
+        adresses: {
+            numero_voie: any;
+            nom_voie: any;
+            complement: any;
+            complement2: any;
+            code_postal: any;
+            commune: any;
+            code_cedex: any;
+            libelle_cedex: any;
+            bureau_distributeur: any;
+        }[];
+        telephones: {
+            type: any;
+            numero: any;
+        }[];
+    }[];
 }>;
 declare const findAllCirconscriptionsQuery: import("kysely").SelectQueryBuilder<{
     [x: string]: any;
@@ -124,6 +142,24 @@ export declare function findAll(): AsyncIterableIterator<{
         date_fin: string;
         libelle: unknown;
     }[];
+    points_contact: {
+        [x: string]: any;
+        adresses: {
+            numero_voie: any;
+            nom_voie: any;
+            complement: any;
+            complement2: any;
+            code_postal: any;
+            commune: any;
+            code_cedex: any;
+            libelle_cedex: any;
+            bureau_distributeur: any;
+        }[];
+        telephones: {
+            type: any;
+            numero: any;
+        }[];
+    }[];
 }>;
 export declare function findAllCirconscriptions(): AsyncIterableIterator<{
     [x: string]: any;

package/lib/src/model/sens.js

@@ -290,14 +290,44 @@ function mandatsMinistre(senMat) {
         .where("minind.senmat", "=", senMat)
         .orderBy("minind.mindatdeb", "desc"));
 }
-function contacts(senMat) {
+function adressesPoicon(poiconId) {
+    return jsonArrayFrom(dbSenat
+        .withSchema("sens")
+        .selectFrom("adresse")
+        .where("adresse.poiconid", "=", poiconId)
+        .select([
+        "adresse.adrnumvoi as numero_voie",
+        "adresse.adrnomvoi as nom_voie",
+        "adresse.adrcmp as complement",
+        "adresse.adrcmp2 as complement2",
+        "adresse.adrcodpos as code_postal",
+        "adresse.adrcom as commune",
+        "adresse.adrcdxcod as code_cedex",
+        "adresse.adrcdxlib as libelle_cedex",
+        "adresse.adrburdis as bureau_distributeur",
+    ])
+        .orderBy("adresse.adrnumtri", "asc"));
+}
+function telephonesPoicon(poiconId) {
+    return jsonArrayFrom(dbSenat
+        .withSchema("sens")
+        .selectFrom("telephone")
+        .where("telephone.poiconid", "=", poiconId)
+        .select(["telephone.typtelcod as type", "telephone.telnum as numero"])
+        .orderBy("telephone.telnumtri", "asc"));
+}
+function pointsContact(senMat) {
     return jsonArrayFrom(dbSenat
         .withSchema("sens")
         .selectFrom("poicon")
-        .leftJoin("adresse", "poicon.poiconid", "adresse.poiconid")
-        .leftJoin("mel", "poicon.poiconid", "mel.poiconid")
-        .leftJoin("telephone", "poicon.poiconid", "telephone.poiconid")
         .where("poicon.senmat", "=", senMat)
+        .select(({ ref }) => [
+        "poicon.poiconid as id",
+        "poicon.typpoiconcod as type",
+        "poicon.poiconlib as libelle",
+        adressesPoicon(ref("poicon.poiconid")).as("adresses"),
+        telephonesPoicon(ref("poicon.poiconid")).as("telephones"),
+    ])
         .orderBy("poicon.poiconnumtri", "asc"));
 }
 function urls(senMat) {
@@ -347,6 +377,7 @@ const findAllQuery = dbSenat
     mandatsMembreDelegation(ref("sen.senmat")).as("delegations"),
     mandatsMembreGroupePolitique(ref("sen.senmat")).as("groupes"),
     fonctionsBureau(ref("sen.senmat")).as("fonctions_bureau"),
+    pointsContact(ref("sen.senmat")).as("points_contact"),
 ]);
 const findAllCirconscriptionsQuery = dbSenat
     .withSchema("sens")

package/package.json

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