Skip to content

Sms command name fix #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshuasorkin merged 3 commits into from
Oct 13, 2022
Merged

Sms command name fix #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a6b881
implement ES6 singleton in database.js per https://code.tutsplus.com/…
joshuasorkin Oct 12, 2022
543b4c8
edit connection success console log
joshuasorkin Oct 12, 2022
5ee6e4e
change .commandName to .name to agree with command-config.json
joshuasorkin Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/config/database.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ require("env2")(".env");
const Sequelize = require("sequelize");

class Database {

constructor() {
if (Database._instance) {
throw new Error(
Expand All @@ -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();
Expand Down Expand Up @@ -398,6 +399,7 @@ class Database {
type: this.sequelize.QueryTypes.INSERT,
}
);
console.log({result});
return result;
}
catch(err){
Expand Down
4 changes: 2 additions & 2 deletions src/lib/sms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ class Sms {
parameterCountMatch(command, parameterObj) {
if (
parameterObj.commandArray.length == 1 &&
command.commandName == "manual"
command.name == "manual"
) {
return true;
} else {
Expand All @@ -436,7 +436,7 @@ class Sms {
if (!this.parameterCountMatch(command, parameterObj)) {
responseValue =
"Incorrect syntax for '" +
command.commandName +
command.name +
"':\n" +
command.parameterUsage;
return responseValue;
Expand Down