node_env update

boscoseries · Jan 20, 2019 · 2fb1623 · 2fb1623
1 parent f9b9245
commit 2fb1623
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,15 @@
 language: "node_js"
 node_js:
   - "10.15.0"
-  deploy:
-    provider: heroku
+deploy:
+  - provider: heroku
     api_key:
-      secure
+      secure: Tj/RWO+NhDpk2T+h/9ecTaXwOvMQ8MjeewB9IqYTINUbwPwNJp96e9R3roiWVfLHibH8ZZ8tnF4vV38H4ZKTAt6dkqOnylnNjppQi+RuSJ2pbMD7+i14VcTgcIkKqob+/UhLAIYKdpIfLTnrL0K33wp0YyEik4oPC79l4cASPeJsZxd1sUYOk2S0hcAcexMZlVxCH80Q7qc4R6GfykE8TVABj6PGgqtZOj67HzQYITe6w/Npt7jKE4TmeyaJLhLKJddX4Y329br0k0JnUtt0bcFZPO+6ByJAl6RAkpxFvZg012bkowEKZNgmKS9YD70idMNsgBopbOxfLPJtgolIFL7jLdT9U5pSkHX6sWIavcq6yyH7NL7MsApvcdSfGDXrpGMu8+wYsYP1nlmbXNjrxFZhOth6RubGmdqGSOTZ2dTnAAEFeYPjU0bYj6BU8mwldw60QNH5cBuPjXuiz8j1WaWw5NZ2am7lZC8duCkd5rL1/7XduL9/XpTVqLrhBsam13EWLSZ7xqKx2JkBmSrZqkPSRvgWKFVGSEts4sjBAdLJEUpulOFa4NVUgpqU5Ho/DlHgj42ORJBvKAqMudTCF5aTdeiW0xYvaNLIrI31lhtdJft4QvNMBGaXEbE58T++nklqF4BI35h9cLUYYga43GSa4VMABjTkZyOln8IzxDQ=
+    app: i-repoterjb
+    on:
+      branch: develop
+    run:
+      - "npm run create"
 services:
   - postgresql
 before_script:

diff --git a/server/database/database.js b/server/database/database.js
@@ -1,11 +1,24 @@
 const { Pool } = require('pg');
-const dotenv = require('dotenv');
+const env = require('dotenv');
 
-dotenv.config();
+env.config();
 
-const pool = new Pool({
-	connectionString: process.env.NODE_ENV
-});
+let connectionString;
+
+switch (process.env.NODE_ENV) {
+  case 'Test':
+		connectionString=process.env.TEST_DATABASE_URL
+    break;
+  case 'Production':
+		connectionString=process.env.PROD_DATABASE_URL
+    break;
+  case 'Development':
+		connectionString=process.env.DEV_DATABASE_URL
+    break;
+}
+console.log(process.env.NODE_ENV);
+
+const pool = new Pool({connectionString});
 
 pool.on('connect', () => {
 	console.log('connected to the database');

diff --git a/server/models/incidentModel.js b/server/models/incidentModel.js
@@ -1,9 +1,24 @@
 const { Pool } = require('pg');
-const dotenv = require('dotenv').config();
+const env = require('dotenv');
 
-const pool = new Pool({
-	connectionString: process.env.NODE_ENV
-});
+env.config();
+
+let connectionString;
+
+switch (process.env.NODE_ENV) {
+  case 'Test':
+		connectionString=process.env.TEST_DATABASE_URL
+    break;
+  case 'Production':
+		connectionString=process.env.PROD_DATABASE_URL
+    break;
+  case 'Development':
+		connectionString=process.env.DEV_DATABASE_URL
+    break;
+}
+console.log(process.env.NODE_ENV);
+
+const pool = new Pool({connectionString});
 
 pool.on('connect', () => {
 	console.log('connected to the database');

diff --git a/server/models/userModel.js b/server/models/userModel.js
@@ -1,10 +1,24 @@
 const { Pool } = require('pg');
-const dotenv = require('dotenv').config();
+const env = require('dotenv');
 
+env.config();
 
-const pool = new Pool({
-	connectionString: process.env.NODE_ENV
-});
+let connectionString;
+
+switch (process.env.NODE_ENV) {
+  case 'Test':
+		connectionString=process.env.TEST_DATABASE_URL
+    break;
+  case 'Production':
+		connectionString=process.env.PROD_DATABASE_URL
+    break;
+  case 'Development':
+		connectionString=process.env.DEV_DATABASE_URL
+    break;
+}
+console.log(process.env.NODE_ENV);
+
+const pool = new Pool({connectionString});
 
 pool.on('connect', () => {
 	console.log('connected to the database');