index.js

@@ -2,18 +2,18 @@ const config = require("./config");
 
 const Sequelize = require("sequelize");
 const sequelize = new Sequelize(
-    config.DB,
+    dbConfig.DB,
-    config.USER,
+    dbConfig.USER,
-    config.PASSWORD,
+    dbConfig.PASSWORD,
     {
-        host: config.HOST,
+        host: dbConfig.HOST,
-        dialect: config.dialect,
+        dialect: dbConfig.dialect,
-        port: config.PORT,
+        port: dbConfig.PORT,
         pool: {
-            max: config.pool.max,
+            max: dbConfig.pool.max,
-            min: config.pool.min,
+            min: dbConfig.pool.min,
-            aqcuire: config.pool.acquire,
+            aqcuire: dbConfig.pool.acquire,
-            idle: config.pool.idle
+            idle: dbConfig.pool.idle
         }
     }
 );
@@ -23,11 +23,7 @@ const db = {};
 db.Sequelize = Sequelize;
 db.sequelize = sequelize;
 
-db.intent = require("./models/intent")(sequelize, Sequelize);
+db.intent = require("./intent.model")(sequelize, Sequelize);
-db.user = require("./models/user")(sequelize, Sequelize);
-db.role = require("./models/role")(sequelize, Sequelize);
-db.bill = require("./models/bill")(sequelize, Sequelize);
-db.reminder = require("./models/reminder")(sequelize, Sequelize);
 
 module.exports = {
     db

models/bill.js

@@ -1,36 +0,0 @@
-module.exports = (sequelize, DataTypes) => {
-    const Bill = sequelize.define("bills", {
-        id: {
-            type: DataTypes.INTEGER,
-            primaryKey: true,
-            autoIncrement: true,
-            allowNull: false
-        },
-        name: {
-            type: DataTypes.STRING,
-            allowNull: false
-        },
-        amount: {
-            type: DataTypes.INTEGER,
-            allowNull: false
-        },
-        due: {
-            type: DataTypes.DATEONLY,
-            allowNull: false
-        },
-        type: {
-            type: DataTypes.STRING,
-            allowNull: true
-        },
-        shared: {
-            type: DataTypes.BOOLEAN,
-            allowNull: false,
-            defaultValue: false
-        }
-    }, {
-        tableName: "bills",
-        timestamps: true
-    });
-
-    return Bill;
-};

models/intent.js

@@ -1,27 +0,0 @@
-module.exports = (sequelize, DataTypes) => {
-    const Intent = sequelize.define("intents", {
-        id: {
-            type: DataTypes.INTEGER,
-            primaryKey: true,
-            autoIncrement: true,
-            allowNull: false
-        },
-        name: {
-            type: DataTypes.STRING,
-            allowNull: false
-        },
-        examples: {
-            type: DataTypes.ARRAY(DataTypes.STRING),
-            allowNull: true
-        },
-        arguments: {
-            type: DataTypes.ARRAY(DataTypes.STRING),
-            allowNull: true
-        }
-    }, {
-        tableName: "intents",
-        timestamps: false
-    });
-
-    return Intent;
-};

models/reminder.js

@@ -1,32 +0,0 @@
-module.exports = (sequelize, DataTypes) => {
-    const Reminder = sequelize.define("reminders", {
-        id: {
-            type: DataTypes.INTEGER,
-            primaryKey: true,
-            autoIncrement: true,
-            allowNull: false
-        },
-        name: {
-            type: DataTypes.STRING,
-            allowNull: false
-        },
-        description: {
-            type: DataTypes.STRING,
-            allowNull: true
-        },
-        dueAt: {
-            type: DataTypes.DATE,
-            allowNull: false
-        },
-        sent: {
-            type: DataTypes.BOOLEAN,
-            allowNull: false,
-            defaultValue: false
-        }
-    }, {
-        tableName: "reminders",
-        timestamps: false
-    });
-
-    return Reminder;
-};

models/role.js

@@ -1,19 +0,0 @@
-module.exports = (sequelize, DataTypes) => {
-    const Role = sequelize.define("roles", {
-        id: {
-            type: DataTypes.INTEGER,
-            primaryKey: true,
-            autoIncrement: true,
-            allowNull: false,
-        },
-        name: {
-            type: DataTypes.STRING,
-            allowNull: false
-        }
-    }, {
-        tableName: "roles",
-        timestamps: true
-    });
-
-    return Role;
-}

models/user.js

@@ -1,15 +0,0 @@
-module.exports = (sequelize, Sequelize) => {
-    const User = sequelize.define("users", {
-        username: {
-            type: Sequelize.STRING
-        },
-        email: {
-            type: Sequelize.STRING
-        },
-        password: {
-            type: Sequelize.STRING
-        }
-    });
-
-    return User;
-}