dry db conection

server/app.js

@@ -6,7 +6,6 @@ const logger = require("morgan");
 const cors = require("cors");
 
 const auth = require("./lib/auth");
-
 const fetch_tweets = require("./lib/fetch");
 const log_tweets = require("./lib/log");
 

server/db/db.js

@@ -0,0 +1,7 @@
+const pgPromise = require("pg-promise");
+const config = require("../lib/config");
+
+const pgp = pgPromise({});
+const DB = pgp(config.dbConnectionString);
+
+module.exports = DB;

server/db/qualtrics.mjs

@@ -4,7 +4,6 @@
  * Ignore treatment group for now
  */
 import { assert } from "console";
-import { parse } from "csv-parse/sync";
 import fs from "fs";
 import decompress from "decompress";
 
@@ -13,9 +12,9 @@ import { default as config } from "../lib/config.js";
 import pgPromise from "pg-promise";
 
 const pgp = pgPromise({});
+import { default as DB } from "./db.js";
 
 // todo fix this
-const DB = pgp("postgres://testuser:password@localhost:5432/server-dev");
 
 const downloadSurveyResponses = async function (survey_id) {
   console.log("downloading responses from qualtrics...");

server/db/scraper.mjs

@@ -12,8 +12,7 @@ import pgPromise from "pg-promise";
 
 const pgp = pgPromise({});
 
-// todo fix this
-const DB = pgp("postgres://testuser:password@localhost:5432/server-dev");
+import { default as DB } from "./db.js";
 
 const BEARER_TOKEN = process.env.BEARER_TOKEN;
 

server/lib/auth.js

@@ -1,6 +1,4 @@
-const pgp = require("pg-promise")(/* options */);
-const db = pgp("postgres://testuser:password@localhost:5432/server-dev");
-// TODO dRy this
+const db = require("../db/db.js");
 
 const cache = {};
 

server/lib/fetch.js

@@ -1,5 +1,4 @@
-const pgp = require("pg-promise")(/* options */);
-const db = pgp("postgres://testuser:password@localhost:5432/server-dev");
+const db = require("../db/db.js");
 
 const DUMMY_TWEET = {
   text: `All the more so when you consider that Biddle himself then went on to oversee the "Great Sedition Trial" of 1944 (30 fascist and pro-Nazi defendants accused of conspiring with the Hitler government), which also ended in a mistrial...`,