@tricoteuses/senat 2.5.5 → 2.5.7

package/README.md

@@ -48,16 +48,16 @@ Data from other sources is also available :
 # Retrieval of textes and rapports from Sénat's website
 # Available options for optional `formats` parameter : xml, html, pdf
 # Available options for optional `types` parameter : textes, rapports
-npm run data:retrieve_documents ../senat-data -- --fromSession 2023 [--formats xml pdf] [--types textes]
+npm run data:retrieve_documents ../senat-data -- --fromSession 2022 [--formats xml pdf] [--types textes]
 
 # Retrieval & parsing (textes in xml format only for now)
-npm run data:retrieve_documents ../senat-data -- --fromSession 2023 --parseDocuments
+npm run data:retrieve_documents ../senat-data -- --fromSession 2022 --parseDocuments
 
 # Parsing only
 npm run data:parse_textes_lois ../senat-data
 
 # Retrieval (& parsing) of agenda from Sénat's website
-npm run data:retrieve_agenda ../senat-data -- --fromSession 2023 [--parseAgenda]
+npm run data:retrieve_agenda ../senat-data -- --fromSession 2022 [--parseAgenda]
 
 # Retrieval of sénateurs' pictures from Sénat's website
 npm run data:retrieve_senateurs_photos ../senat-data
@@ -97,3 +97,18 @@ for (const { item: question } of iterLoadSenatQuestions("../senat-data", 17)) {
 ```bash
 npm run data:generate_schemas ../senat-data
 ```
+
+## Publishing
+
+To publish a new version of this package onto npm, bump the package version and publish.
+
+```bash
+npm version x.y.z # Bumps version in package.json and creates a new tag x.y.z
+npm publish
+```
+
+The Docker image will be automatically built during a CI Workflow if you push the tag to the remote repository.
+
+```bash
+git push --tags
+```

package/lib/model/agenda.js

@@ -49,12 +49,12 @@ function getStartAndEndTimes(timeStr) {
     if (timeMatches?.groups) {
         const { startTime, endTime } = timeMatches.groups;
         return {
-            startTime: startTime ? DateTime.fromFormat(startTime, "H'h'mm").setZone(FR_TZ).toISOTime() : null,
-            endTime: endTime ? DateTime.fromFormat(endTime, "H'h'mm").setZone(FR_TZ).toISOTime() : null,
+            startTime: startTime ? DateTime.fromFormat(startTime, "H'h'mm", { zone: FR_TZ }).toISOTime() : null,
+            endTime: endTime ? DateTime.fromFormat(endTime, "H'h'mm", { zone: FR_TZ }).toISOTime() : null,
         };
     }
     return {
-        startTime: normalizedTime ? DateTime.fromFormat(normalizedTime, "H'h'mm").setZone(FR_TZ).toISOTime() : null,
+        startTime: normalizedTime ? DateTime.fromFormat(normalizedTime, "H'h'mm", { zone: FR_TZ }).toISOTime() : null,
         endTime: null,
     };
 }

package/lib/model/dosleg.d.ts

@@ -104,6 +104,7 @@ declare const findAllQuery: import("kysely").SelectQueryBuilder<{
             libelle_organisme: string | null;
             code_organisme: string | null;
             ordre_lecture_assemblee: string;
+            session: string | null;
             textes: {
                 url: string;
                 date: string;
@@ -169,6 +170,7 @@ export declare function findAll(): AsyncIterableIterator<{
             libelle_organisme: string | null;
             code_organisme: string | null;
             ordre_lecture_assemblee: string;
+            session: string | null;
             textes: {
                 url: string;
                 date: string;

package/lib/model/dosleg.js

@@ -106,6 +106,7 @@ function lecturesAssemblee(lectureId) {
         "org.orgnom as libelle_organisme",
         "org.senorgcod as code_organisme",
         "lecass.ordreass as ordre_lecture_assemblee",
+        "lecass.sesann as session",
         textes(ref("lecass.lecassidt")).as("textes"),
         rapports(ref("lecass.lecassidt")).as("rapports"),
         datesSeances(ref("lecass.lecassidt")).as("dates_seances"),

package/lib/scripts/shared/cli_helpers.js

@@ -13,8 +13,8 @@ export const dataDirDefaultOption = {
     type: String,
 };
 export const fromSessionOption = {
-    defaultValue: 2023,
-    help: "session year to retrieve data from; default 2023",
+    defaultValue: 2022,
+    help: "session year to retrieve data from; default 2022",
     name: "fromSession",
     type: Number,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tricoteuses/senat",
-  "version": "2.5.5",
+  "version": "2.5.7",
   "description": "Handle French Sénat's open data",
   "keywords": [
     "France",
@@ -45,7 +45,7 @@
     "data:convert_data": "tsx src/scripts/convert_data.ts",
     "data:download": "bash -c 'npm run data:retrieve_open_data -- $@ && npm run data:convert_data -- $@' bash",
     "data:generate_schemas": "tsx src/scripts/retrieve_open_data.ts --schema",
-    "data:retrieve_agenda": "tsx src/scripts/retrieve_agenda.ts",
+    "data:retrieve_agenda": "TZ='Etc/UTC' tsx src/scripts/retrieve_agenda.ts",
     "data:retrieve_documents": "tsx src/scripts/retrieve_documents.ts",
     "data:retrieve_open_data": "tsx src/scripts/retrieve_open_data.ts --all",
     "data:retrieve_senateurs_photos": "tsx src/scripts/retrieve_senateurs_photos.ts --fetch",