From 92b1f55a22a73e6c6610f692d075d95453fc26f8 Mon Sep 17 00:00:00 2001
From: subnub <kyle.hoell@gmail.com>
Date: Mon, 25 May 2020 09:39:51 -0400
Subject: [PATCH] Updating docker and server utils

---
 Dockerfile                      |  2 +-
 package.json                    |  7 ++++---
 serverUtils/createIndexes.js    |  4 +++-
 serverUtils/getEnvVaribables.js | 10 ++++++++++
 serverUtils/mongoServerUtil.js  | 11 +++++++++++
 5 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 serverUtils/getEnvVaribables.js
 create mode 100644 serverUtils/mongoServerUtil.js

diff --git a/Dockerfile b/Dockerfile
index ef06fc6..8cf94bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ RUN npm install
 
 COPY . .
 
-RUN npm run build
+RUN npm run build:docker
 
 EXPOSE 8080
 EXPOSE 3000
diff --git a/package.json b/package.json
index 1fcb413..eefb267 100755
--- a/package.json
+++ b/package.json
@@ -8,15 +8,16 @@
   },
   "scripts": {
     "server": "live-server public/",
-    "build": "export NODE_OPTIONS=--max_old_space_size=8000 && tsc && webpack -p --env production && webpack --config webUI.config.js",
+    "build": "export NODE_OPTIONS=--max_old_space_size=8000 && tsc && webpack -p --env production && webpack --config webUI.config.js && node serverUtils/createIndexes.js",
+    "build:docker": "export NODE_OPTIONS=--max_old_space_size=8000 && tsc && webpack -p --env production && webpack --config webUI.config.js",
     "build:webUI": "webpack --config webUI.config.js",
     "build:dev": "tsc && webpack --env development",
     "dev-server": "webpack-dev-server",
     "test": "NODE_ENV=test env-cmd -f ./config/test.env jest --config=jest.config.json --watchAll --runInBand",
     "start:dev": "NODE_ENV=development node dist/server/serverStart.js",
     "start": "NODE_ENV=production node dist/server/serverStart.js --env production",
-    "create-indexes-database": "env-cmd -f ./config/prod.env node serverUtils/createIndexes.js",
-    "create-indexes-database:dev": "env-cmd -f ./config/dev.env node serverUtils/createIndexes.js",
+    "create-indexes-database": "node serverUtils/createIndexes.js",
+    "create-indexes-database:dev": "node serverUtils/createIndexes.js",
     "setup": "node serverUtils/setupServer.js",
     "debug": "env-cmd -f ./config/prod.env node --expose-gc --inspect=9222 dist/server/serverStart.js --env production",
     "heroku-postbuild": "npm run build"
diff --git a/serverUtils/createIndexes.js b/serverUtils/createIndexes.js
index 8056617..35adcb1 100644
--- a/serverUtils/createIndexes.js
+++ b/serverUtils/createIndexes.js
@@ -1,4 +1,6 @@
-const mongoose = require("../backend/db/mongoose");
+const getEnvVariables = require("./getEnvVaribables");
+getEnvVariables();
+const mongoose = require("./mongoServerUtil");
 const conn = mongoose.connection;
 
 const waitForDatabase = () => {
diff --git a/serverUtils/getEnvVaribables.js b/serverUtils/getEnvVaribables.js
new file mode 100644
index 0000000..ff38277
--- /dev/null
+++ b/serverUtils/getEnvVaribables.js
@@ -0,0 +1,10 @@
+const path = require("path");
+
+const getEnvVariables = () => {
+
+    const configPath = path.join(__dirname, "..", "config");
+
+    require('dotenv').config({ path: configPath + "/prod.env"})
+}
+
+module.exports = getEnvVariables;
\ No newline at end of file
diff --git a/serverUtils/mongoServerUtil.js b/serverUtils/mongoServerUtil.js
new file mode 100644
index 0000000..5a8c31a
--- /dev/null
+++ b/serverUtils/mongoServerUtil.js
@@ -0,0 +1,11 @@
+const mongoose = require("mongoose");
+
+mongoose.connect(process.env.MONGODB_URL, {
+    useNewUrlParser: true,
+    useCreateIndex: true,
+    useUnifiedTopology: true,
+    socketTimeoutMS: 30000000,
+    keepAlive: true,
+})
+
+module.exports = mongoose;
\ No newline at end of file