refacto in utils

index.js

@@ -2,10 +2,8 @@
 // imports
 import utils from "./utils.ts";
 import parserConfig from "./config.ts";
-import { v4 as uuidv4 } from "uuid";
 import { htmlEscape } from "escape-goat";
 import Parser from "rss-parser";
-import { Client } from "pg";
 const fetch = require("node-fetch");
 let parser = new Parser();
 
@@ -37,65 +35,20 @@ const doesThisEventAlreadyExistInLocalEvents = (rssEvent) => {
 
 let createEventQueries = "";
 let counterOfEventsToAdd = 0;
-const addEventQuery = (rssEvent) => {
+const addEventQuery = utilsTools.agendadulibre.addQuery;
-  if (!createEventQueries) {
+const runCreationQuery = utilsTools.runCreationQuery;
-    createEventQueries =
-      "INSERT INTO events(title, description, organizer_actor_id,inserted_at,updated_at, uuid, url, status, category, options,participants_stats, begins_on, ends_on) VALUES ";
-  }
-  if (counterOfEventsToAdd) {
-    createEventQueries += ` , `;
-  }
 
-  let title = "'" + htmlEscape(rssEvent.title) + "'";
-  let content = "'" + htmlEscape(rssEvent.content) + "'";
-  let uuid = uuidv4();
-  let uuidString = "'" + uuid + "'";
-  let eventUrl =
-    "'" + parserConfig.mobilizon_public_url + "/events/" + uuid + "'";
-  let begins_on = "'" + utilsTools.convertRssDate(rssEvent.date) + "'";
-  let ends_on = "'" + utilsTools.convertRssDate(rssEvent.date) + "'";
-  let baseOptions =
-    '{"offers": [], "program": null, "attendees": [], "show_end_time": true, "show_start_time": true, "comment_moderation": "allow_all", "anonymous_participation": true, "participation_condition": [], "show_participation_price": false, "maximum_attendee_capacity": 0, "remaining_attendee_capacity": 0, "hide_organizer_when_group_event": false, "show_remaining_attendee_capacity": false}';
-  let baseStats =
-    '{"creator": 1, "rejected": 0, "moderator": 0, "participant": 0, "not_approved": 0, "administrator": 0, "not_confirmed": 0}';
-  // TODO complete with date conversion
-  //  begins_on , ends_on expecting date format like this: "2020-12-17 23:00:00"
 
-  createEventQueries += `( ${title}, ${content}, ${parserConfig.feeder_mobilizon_user_id}, 'now()','now()', ${uuidString}, ${eventUrl}, 'confirmed' , 'meeting', ${baseOptions}, ${baseStats}, ${begins_on} , ${ends_on} )`;
-
-  counterOfEventsToAdd++;
-};
-const runCreationQuery = async () => {
-  createEventQueries = createEventQueries + ";";
-  utilsTools.writeFile("event_creation_query.psql", createEventQueries);
-
-  if (createEventQueries) {
-    console.log("     ");
-    console.log(" ⚙️⚙️⚙️ ");
-    console.log("     ");
-    console.log(" createEventQueries");
-    console.log(createEventQueries);
-
-    const res = await client.query(createEventQueries);
-    console.log("res", res);
-    return res;
-  }
-};
-
-const client = new Client({
-  host: "localhost",
-  user: parserConfig.db_user,
-  password: parserConfig.db_pass,
-  database: parserConfig.db_name,
-});
 
 (async () => {
   console.log("⌛ interroger la BDD mobilizon postgresql");
 
-  await client.connect();
+  utilsTools.setupClientPostgresql()
+
+  await utilsTools.client.connect();
   console.log("✅ OK connecté à postgresql");
   console.log(" ");
-  const res = await client.query("SELECT * from events");
+  const res = await utilsTools.client.query("SELECT * from events");
   console.log("💾 évènements enregistrés dans mobilizon : ", res.rows.length); // Hello world!
 
   utilsTools.postgresEventsExisting = res.rows;
@@ -142,7 +95,7 @@ const client = new Client({
         arrayOfEvents.forEach((eventFound) => {
           console.log(eventFound.name);
           // console.log('item', item)
-          utilsTools.osmCal.doesEventExists(eventFound);
+          utilsTools.osmcal.doesEventExists(eventFound);
         });
       });
   }
@@ -153,7 +106,8 @@ const client = new Client({
       "➕ rajouter les évènements manquants à la base mobilizon".blue
     );
 
-    await runCreationQuery();
+     utilsTools.makeQuery();
+     utilsTools.runCreationQuery();
     // @ts-ignore
     console.log(" ---------- ".green);
     // @ts-ignore
@@ -163,7 +117,7 @@ const client = new Client({
     // @ts-ignore
     console.log("✅ ça c'est fait ".green);
   }
-  await client.end();
+  await utilsTools.client.end();
 })();
 
 exports = () => {

utils.ts

@@ -1,8 +1,38 @@
+// @ts-ignore
+import parserConfig from "./config.ts";
+import {v4 as uuidv4} from "uuid";
+import {Client} from "pg";
+import {htmlEscape} from "escape-goat";
+
 const moment = require("moment");
 
 const fs = require("fs");
 
 class utils {
+    client;
+    makeQuery = () => {
+        this.createEventQueries = `INSERT INTO events(title, description, organizer_actor_id,inserted_at,updated_at, uuid, url, status, category, options,participants_stats, begins_on, ends_on) VALUES ${this.agendadulibre.queryToAdd} ${this.osmcal.queryToAdd};`;
+        this.writeFile("event_creation_query.psql", this.createEventQueries);
+    }
+    runCreationQuery = async () => {
+        if (this.createEventQueries) {
+            console.log("     ");
+            console.log(" ⚙️⚙️⚙️ ");
+            console.log("     ");
+            console.log(" createEventQueries");
+            console.log(this.createEventQueries);
+
+            const res = await this.client.query(this.createEventQueries);
+            console.log("res", res);
+            return res;
+        } else {
+            console.log(" DISABLED createEventQueries");
+        }
+    };
+    createEventQueries = "";
+    counterOfEventsToAdd = 0;
+
+
     convertRssDate(rssDate) {
         let converted = moment(rssDate)
             .format("YYYY-MM-DD LTS")
@@ -35,16 +65,57 @@ class utils {
             }
         );
     };
-  osmCal = {
+    osmcal = {
         queryToAdd: "",
-    doesEventExists: (event) => {},
+        counterOfEventsToAdd: 0,
-    addQuery: (event) => {},
+        doesEventExists: (event) => {
+        },
+        addQuery: (event) => {
+
+            this.agendadulibre.counterOfEventsToAdd++;
+            this.counterOfEventsToAdd++;
+
+        },
     };
     agendadulibre = {
         queryToAdd: "",
-    doesEventExists: (event) => {},
+        counterOfEventsToAdd: 0,
-    addQuery: (event) => {},
+        doesEventExists: (event) => {
+        },
+        addQuery: (rssEvent) => {
+            if (this.agendadulibre.queryToAdd) {
+                this.agendadulibre.queryToAdd += ` , `;
+            }
+
+            let title = "'" + htmlEscape(rssEvent.title) + "'";
+            let content = "'" + htmlEscape(rssEvent.content) + "'";
+            let uuid = uuidv4();
+            let uuidString = "'" + uuid + "'";
+            let eventUrl =
+                "'" + parserConfig.mobilizon_public_url + "/events/" + uuid + "'";
+            let begins_on = "'" + this.convertRssDate(rssEvent.date) + "'";
+            let ends_on = "'" + this.convertRssDate(rssEvent.date) + "'";
+            let baseOptions =
+                '{"offers": [], "program": null, "attendees": [], "show_end_time": true, "show_start_time": true, "comment_moderation": "allow_all", "anonymous_participation": true, "participation_condition": [], "show_participation_price": false, "maximum_attendee_capacity": 0, "remaining_attendee_capacity": 0, "hide_organizer_when_group_event": false, "show_remaining_attendee_capacity": false}';
+            let baseStats =
+                '{"creator": 1, "rejected": 0, "moderator": 0, "participant": 0, "not_approved": 0, "administrator": 0, "not_confirmed": 0}';
+            //  begins_on , ends_on expecting date format like this: "2020-12-17 23:00:00"
+
+            this.agendadulibre.queryToAdd += `( ${title}, ${content}, ${parserConfig.feeder_mobilizon_user_id}, 'now()','now()', ${uuidString}, ${eventUrl}, 'confirmed' , 'meeting', ${baseOptions}, ${baseStats}, ${begins_on} , ${ends_on} )`;
+
+            this.agendadulibre.counterOfEventsToAdd++;
+            this.counterOfEventsToAdd++;
+        }
     };
+
+    setupClientPostgresql = () => {
+        this.client = new Client({
+            host: "localhost",
+            user: parserConfig.db_user,
+            password: parserConfig.db_pass,
+            database: parserConfig.db_name,
+        });
+    }
 }
 
 export default utils;