fixed db models

package.json

@@ -40,9 +40,11 @@
     "debug": "^4.1.1",
     "dotenv": "^8.0.0",
     "express": "^4.16.4",
+    "express-fileupload": "^1.1.6",
     "express-validator": "^5.3.1",
     "forever": "^1.0.0",
     "http-errors": "^1.7.2",
+    "morgan": "^1.9.1",
     "mysql2": "^1.6.5",
     "passport": "^0.4.0",
     "passport-azure-ad": "^4.0.0",

src/models/index.js

@@ -1,6 +1,3 @@
-// database instance
-import database from 'setup/mysql';
-
 
 // import models
 import logger from 'utils/logger';
@@ -13,22 +10,25 @@ const log = logger('models');
 
 
 // init models
-log('init start');
-UserModel.init(database);
-PostModel.init(database);
-RoleModel.init(database);
-log('init end');
+export function initModels(database) {
+  log('init start');
+  UserModel.init(database);
+  PostModel.init(database);
+  RoleModel.init(database);
+  log('init end');
+}
+
+// associate models
+export function associateModels() {
+  log('associate start');
+  UserModel.associate();
+  PostModel.associate();
+  RoleModel.associate();
+  log('associate end');
+}
 
 
 // export models
 export const User = UserModel;
 export const Post = PostModel;
 export const Role = RoleModel;
-
-
-// associate models
-log('associate start');
-UserModel.associate();
-PostModel.associate();
-RoleModel.associate();
-log('associate end');

src/setup/express.js

@@ -1,8 +1,8 @@
 import express from 'express';
 import bodyParser from 'body-parser';
 import cookieSession from 'cookie-session';
-// import fileUpload from 'express-fileupload'
-// import morgan from 'morgan'
+import fileUpload from 'express-fileupload';
+import morgan from 'morgan';
 
 
 import routes from 'routes';
@@ -17,7 +17,7 @@ const { SERVER_SESSION_SECRET = 'keyboard cat' } = process.env;
 
 const server = express();
 
-// server.use(morgan('dev'))
+server.use(morgan('dev'));
 
 // cookies
 server.set('trust proxy', 1);
@@ -28,7 +28,7 @@ server.use(cookieSession({
 server.use(bodyParser.json());
 // server.use(bodyParser.urlencoded({ extended: false }))
 
-// server.use(fileUpload())
+server.use(fileUpload());
 
 server.use(passport.initialize());
 server.use(passport.session());

src/setup/mysql.js

@@ -2,7 +2,9 @@ import Sequelize from 'sequelize';
 
 import logger from 'utils/logger';
 
-const log = logger('config/database');
+import { initModels, associateModels } from 'models/index';
+
+const log = logger('setup/database');
 
 const {
   DB_NAME,
@@ -16,7 +18,6 @@ const {
   DB_SSL = false,
 } = process.env;
 
-log('start');
 log('DB_NAME', DB_NAME);
 log('DB_USER', DB_USER);
 log('DB_PASS', DB_PASS);
@@ -47,9 +48,9 @@ const database = new Sequelize(
 
 export default database;
 
+initModels(database);
+associateModels(database);
+
 database.sync({ force: DB_CLEAN === 'true' }).then(() => {
   log('synced');
-  require('models');
 });
-
-log('end');