From 114ab582b5a9b8793a0e7a78aa2f54504ec7c4bd Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Mon, 19 Dec 2022 12:05:17 +0000
Subject: [PATCH] Update database.configs to get values from ENV

---
 README.md                       | 11 +++---
 src/configs/database.configs.js | 59 +++++++++++++++++++++++++++------
 2 files changed, 56 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index cee208b..b64cd5e 100644
--- a/README.md
+++ b/README.md
@@ -69,9 +69,12 @@ The app is designed to be run within Kubernetes or within a Docker container, as
 |OWL_SRV_LISTEN|0.0.0.0|NO|Web Server Listen Address|
 |OWL_DB_USER||YES|Database Username|
 |OWL_DB_PASS||YES|Database Password|
-|OWL_DB_NAME||YES|Database Name|
-|OWL_DB_PORT||YES|Database Server Port|
-|OWL_DB_HOST||YES|Database Server Host|
+|OWL_DB_NAME|owlboard|NO|Database Name|
+|OWL_DB_PORT|3306|NO|Database Server Port|
+|OWL_DB_HOST|database|NO|Database Server Host|
 |OWL_LDB_KEY||YES|National Rail LDBWS API Key|
 |OWL_LDB_SVKEY||NO|National Rail LDBSVWS API Key|
-     
\ No newline at end of file
+|OWL_LDB_CORPUSUSER||YES|Network Rail CORPUS API Username|
+|OWL_LDB_CORPUSPASS||YES|Network Rail CORPUS API Password|
+
+In the case that OWL_LDB_SVKEY is not available, staff versions of departure board, etc. will not be available.
\ No newline at end of file
diff --git a/src/configs/database.configs.js b/src/configs/database.configs.js
index 1980ccf..4884b41 100644
--- a/src/configs/database.configs.js
+++ b/src/configs/database.configs.js
@@ -1,15 +1,54 @@
-OWL_DB_USER
-OWL_DB_PASS
-OWL_DB_NAME
-OWL_DB_PORT
-OWL_DB_HOST
+function getUser(){
+    if (process.env.OWL_DB_USER){
+        var dbUser = process.env.OWL_DB_USER;
+    } else {
+        var dbUser = "ERR";
+    };
+    return dbUser;
+}
+
+function getPass(){
+    if (process.env.OWL_DB_PASS){
+        var dbPass = process.env.OWL_DB_USER;
+    } else {
+        var dbPass = "ERR";
+    };
+    return dbPass;
+}
+
+function getName(){
+    if (process.env.OWL_DB_NAME){
+        var dbName = process.env.OWL_DB_NAME;
+    } else {
+        var dbName = "owlboard";
+    };
+    return dbName;
+}
+
+function getPort(){
+    if (process.env.OWL_DB_PORT){
+        var dbPort = process.env.OWL_DB_PORT;
+    } else {
+        var dbPort = 3306
+    }
+    return Number(dbPort);
+}
+
+function getHost(){
+    if (process.env.OWL_DB_HOST){
+        var dbHost = process.env.OWL_DB_HOST;
+    } else {
+        var dbHost = "database";
+    }
+    return dbHost;
+}
 
 const database = {
-    user: 'owlboard',
-    password: 'owlboard',
-    database: 'owlboard',
-    port: 8460,
-    host: 'localhost'
+    user: getUser(),
+    password: getPass(),
+    database: getName(),
+    port: getPort(),
+    host: getHost()
 };
 
 module.exports = database;
\ No newline at end of file