Merge 7893596 into 676c4d4

chidimo · May 20, 2019 · ba28e47 · ba28e47
2 parents 676c4d4 + 7893596
commit ba28e47
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,7 @@ env:
     - PGPORT=5433
     - PGUSER=postgres
     - PGHOST=localhost
+    - DBNAME=testdb
 services:
   - postgresql
 addons:

diff --git a/models/Model.js b/models/Model.js
@@ -10,7 +10,7 @@ const config = {
     user: Settings.dbSettings().dbUser,
     host: Settings.dbSettings().dbHost,
     port: Settings.dbSettings().dbPort,
-    database: Settings.dbSettings().databaseName,
+    database: Settings.dbSettings().dbName,
     password: Settings.dbSettings().dbPassword
 };
 

diff --git a/notes.md b/notes.md
@@ -182,4 +182,10 @@ Warm tones
 ```
 router.get('/repayments', LoansController.get_all_repayments
 );
-```
+```
+
+## Heroku postgres DATABASE_URL
+
+postgres://fgpyagsuzwxcnb:e08fb62b310448400dc8d4b61366191a58876dd4a81861b5125344852492c872@ec2-54-83-36-37.compute-1.amazonaws.com:5432/dfjtmn74eqgvn7
+
+postgres://username:password@localhost/<db-name>
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
         "start": "set NODE_ENV=production&node --require @babel/register ./bin/www ",
         "devstart": "set NODE_ENV=development&set DEBUG=dev&nodemon --exec babel-node ./bin/www",
         "lint": "./node_modules/.bin/eslint ./",
-        "test": "set NODE_ENV=test&set DEBUG=test&nyc --reporter=html --reporter=text mocha -r @babel/register -r should",
+        "test": "set NODE_ENV=test&set DEBUG=test&set DBNMAE=testdb&nyc --reporter=html --reporter=text mocha -r @babel/register -r should",
         "cover": "nyc report --reporter=text-lcov | coveralls",
         "coverage": "nyc report --reporter=text-lcov | coveralls && rm -rf ./.nyc_output && rm -rf coverage/"
     },

diff --git a/settings.js b/settings.js
@@ -7,21 +7,8 @@ const Settings = {
     jwtSecret: process.env.JWT_SECRET,
     s3_bucket: 'quick-credit',
     dbSettings: () => {
-        let databaseName;
-        switch (process.env.NODE_ENV.trim()) {
-        case 'development':
-            databaseName = 'quick_credit';
-            break;
-        case 'test':
-            databaseName = 'testdb';
-            break;
-        case 'production':
-            databaseName = 'quick_credit';
-            break;
-        }
-
         const db_settings = {
-            databaseName,
+            dbName: process.env.DBNAME.trim(),
             dbHost: process.env.PGHOST.trim(),
             dbUser: process.env.PGUSER.trim(),
             dbPort: process.env.PGPORT,