Merge branch 'dev' of github.com:C7F/C7F-Backend into dev

Author: roerohan

sample.env

@@ -1,9 +1,6 @@
 NODE_ENV=dev
 PORT=3001
-DB_HOST=localhost
-DB_USER=c7f
-DB_PASSWORD=c7f
-DB_NAME=c7f
 JWT_SECRET=secret
 ALLOW_CORS=true
-ALLOWED_ORIGINS=http://localhost:3001,http://locahost:5000
+ALLOWED_ORIGINS=http://localhost:3001,http://locahost:5000
+DATABASE_URL=postgres://c7f:c7f@localhost:5432/c7f

src/knexfile.ts

@@ -5,13 +5,7 @@ dotenv.config();
 
 const config = {
     client: 'postgres',
-    connection: {
-        host: process.env.DB_HOST || '127.0.0.1',
-        port: parseInt(process.env.DB_PORT, 10) || 5432,
-        user: process.env.DB_USER || 'c7f',
-        password: process.env.DB_PASSWORD || 'c7f',
-        database: process.env.DB_NAME || 'c7f',
-    },
+    connection: process.env.DATABASE_URL,
 };
 
 export default config;

src/models/db.ts

@@ -10,6 +10,7 @@ knex.raw("SELECT 'test connection';").then(() => {
     logger.info(database.connectionSuccess);
 }).catch((err) => {
     logger.error(database.connectionFailure);
+    process.exit(1);
     throw err;
 });