@tricoteuses/senat 2.5.4 → 2.5.6

package/README.md

@@ -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/scripts/convert_data.js

@@ -192,7 +192,9 @@ async function convertDatasetSens(dataDir) {
             console.log(`Converting ${organisme.code} file…`);
         }
         const organismeFileName = `${organisme.code}.json`;
-        fs.writeJSONSync(path.join(organismesReorganizedDir, organismeFileName), organisme, { spaces: 2 });
+        const organismeDir = path.join(organismesReorganizedDir, organisme.type_code);
+        fs.ensureDirSync(organismeDir);
+        fs.writeJSONSync(path.join(organismeDir, organismeFileName), organisme, { spaces: 2 });
     }
 }
 convertData()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tricoteuses/senat",
-  "version": "2.5.4",
+  "version": "2.5.6",
   "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",