diff --git a/src/config/database.js b/src/config/database.js index 09f9791..209d0f0 100644 --- a/src/config/database.js +++ b/src/config/database.js @@ -2,7 +2,7 @@ require("env2")(".env"); const Sequelize = require("sequelize"); class Database { - + constructor() { if (Database._instance) { throw new Error( @@ -28,13 +28,14 @@ class Database { } catch (error) { console.error("Unable to connect to the database:", error); } +} - Database._instance = this; - } - - static getInstance() { - return Database._instance; +static getInstance() { + if (!this._instance){ + this._instance = new Database(); } + return this._instance; +} parseSSLEnvVar() { this.sequelize_ssl = process.env.SEQUELIZE_SSL.toLowerCase(); @@ -398,6 +399,7 @@ class Database { type: this.sequelize.QueryTypes.INSERT, } ); + console.log({result}); return result; } catch(err){ diff --git a/src/lib/sms.js b/src/lib/sms.js index a021874..506559e 100644 --- a/src/lib/sms.js +++ b/src/lib/sms.js @@ -416,7 +416,7 @@ class Sms { parameterCountMatch(command, parameterObj) { if ( parameterObj.commandArray.length == 1 && - command.commandName == "manual" + command.name == "manual" ) { return true; } else { @@ -436,7 +436,7 @@ class Sms { if (!this.parameterCountMatch(command, parameterObj)) { responseValue = "Incorrect syntax for '" + - command.commandName + + command.name + "':\n" + command.parameterUsage; return responseValue;