@tricoteuses/senat 2.19.3 → 2.19.5

package/README.md

@@ -25,9 +25,6 @@ npm install
 
 ```bash
 docker run --name local-postgres -d -p 5432:5432 -e POSTGRES_PASSWORD=$YOUR_CUSTOM_DB_PASSWORD postgres
-# Default Postgres user is postgres
-# But scripts require an "opendata" role
-docker exec -it local-postgres psql -U postgres -c "CREATE ROLE opendata;"
 ```
 
 ## Download data

package/lib/scripts/retrieve_open_data.js

@@ -2,7 +2,6 @@ import assert from "assert";
 import { execSync } from "child_process";
 import commandLineArgs from "command-line-args";
 import fs from "fs-extra";
-// import fetch from "node-fetch"
 import path from "path";
 import StreamZip from "node-stream-zip";
 import readline from "readline";
@@ -79,7 +78,11 @@ async function copyToSenat(dataset, dataDir, options) {
     // Write the header and then stream the rest of the SQL file
     const schemaSqlWriter = fs.createWriteStream(schemaDumpFile, { encoding: "utf8" });
     // Add CREATE SCHEMA statement at the top
+    schemaSqlWriter.write(`DROP SCHEMA IF EXISTS ${dataset.database} CASCADE;\n`);
     schemaSqlWriter.write(`CREATE SCHEMA IF NOT EXISTS ${dataset.database};\n`);
+    schemaSqlWriter.write(`GRANT USAGE ON SCHEMA ${dataset.database} TO ${config.db.user};\n`);
+    schemaSqlWriter.write(`GRANT SELECT ON ALL TABLES IN SCHEMA ${dataset.database} TO ${config.db.user};\n`);
+    schemaSqlWriter.write(`ALTER DEFAULT PRIVILEGES IN SCHEMA ${dataset.database} GRANT SELECT ON TABLES TO ${config.db.user};\n`);
     const lineReader = readline.createInterface({
         input: fs.createReadStream(sqlFilePath, { encoding: "utf8" }),
         crlfDelay: Infinity,
@@ -270,12 +273,13 @@ async function retrieveOpenData() {
         process.env["PGUSER"] &&
         process.env["PGPASSWORD"], "Missing database configuration: environment variables PGHOST, PGPORT, PGUSER and PGPASSWORD or TRICOTEUSES_SENAT_DB_* in .env file");
     console.time("data extraction time");
-    execSync(`${options["sudo"] ? `sudo -u ${options["sudo"]} ` : ""}psql --quiet -c "DROP DATABASE IF EXISTS senat"`, {
+    // Create role 'opendata' if it does not exist
+    execSync(`${options["sudo"] ? `sudo -u ${options["sudo"]} ` : ""}psql --quiet -c "CREATE ROLE opendata" || true`, {
         cwd: dataDir,
         env: process.env,
         encoding: "utf-8",
     });
-    execSync(`${options["sudo"] ? `sudo -u ${options["sudo"]} ` : ""}psql --quiet -c "CREATE DATABASE senat WITH OWNER opendata"`, {
+    execSync(`${options["sudo"] ? `sudo -u ${options["sudo"]} ` : ""}psql --quiet -c "CREATE DATABASE senat WITH OWNER opendata" || true`, {
         cwd: dataDir,
         env: process.env,
         encoding: "utf-8",

package/lib/scripts/retrieve_videos.js

@@ -451,7 +451,7 @@ async function processGroupedReunion(agenda, session, dataDir) {
         }
     }
     else {
-        console.warn(`[warn] The video url could not be built`);
+        console.warn(`[warn] The video url could not be built for reunion `, reunionUid);
     }
 }
 async function processAll(dataDir, sessions) {

package/package.json

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