Fix a bug: SQL error on fresh install

Author: paul-ion

trainingportal/challenges.js

@@ -105,12 +105,22 @@ let init = async () => {
         masterSalt=process.env.CHALLENGE_MASTER_SALT;
     }
 
-    let dbModuleVersion = await db.getModuleVersion();
-    if(dbModuleVersion < moduleVer){
-        util.log("New training modules version, updating module completion for all users.")
-        recreateBadgesOnModulesUpdate();
-        db.updateModuleVersion(moduleVer);
-    } 
+    try {
+        let dbModuleVersion = await db.getModuleVersion();
+        if(dbModuleVersion < moduleVer){
+            util.log("New training modules version, updating module completion for all users.")
+            recreateBadgesOnModulesUpdate();
+            db.updateModuleVersion(moduleVer);    
+            if(dbModuleVersion < moduleVer){
+                util.log("New training modules version, updating module completion for all users.")
+                recreateBadgesOnModulesUpdate();
+                db.updateModuleVersion(moduleVer);
+            } 
+        } 
+    } catch (error) {
+        console.log(`Error handling module version ${error.message}`);
+    }
+    
 }
 
 init();

trainingportal/db.js

@@ -161,7 +161,9 @@ getPromise = (dbFunc, params) => {
   return promise;
 };
 
-init = async () => {
+
+
+let init = async () => {
   var con = getConn();
   var sql = "";
   var dbSetup = "";
@@ -251,6 +253,9 @@ init = async () => {
   }
 };
 
+let initSync = async() => {
+  await init()
+}
 
 //Creates a user in the database
 insertUser = function(user,errCb,doneCb){
@@ -655,6 +660,7 @@ module.exports = {
   fetchUsers,
   fetchUsersWithId,
   init,
+  initSync,
   insertBadge,
   insertChallengeEntry,
   insertUser,

trainingportal/server.js

@@ -26,7 +26,7 @@ const uid = require('uid-safe');
 const validator = require('validator');
 
 const db = require(path.join(__dirname, 'db'));
-db.init();
+db.initSync();
 
 const auth = require(path.join(__dirname, 'auth'));
 const util = require(path.join(__dirname, 'util'));