Sharpening

lib/database/app-index.js

@@ -1 +0,0 @@
-// Remove file

lib/database/index.js

@@ -3,10 +3,10 @@ const bcrypt = require('bcrypt')
 const sequelize = require('./sequelize')
 const User = require('./user')
 const Session = require('./session')
-const appIndex = require('./app-index')
 
-module.exports = Object.assign({
+module.exports = {
   init: () => sequelize.sync(),
+  sequelize,
   User,
   Session
-}, appIndex)
+}

lib/server.js

@@ -11,14 +11,14 @@ const app = express()
 app.use(bodyParser.json())
 
 routes(app)
-app.use(express.static('./public'))
-app.all('/api/*', (req, res) => {
-  res.send(404)
-})
-app.get('*', (req, res) => {
-  res.sendFile(path.join(process.cwd(), 'public/index.html'));
-})
 app.start = () => new Promise((resolve, reject) => {
+  app.use(express.static('./public'))
+  app.all('/api/*', (req, res) => {
+    res.send(404)
+  })
+  app.get('*', (req, res) => {
+    res.sendFile(path.join(process.cwd(), 'public/index.html'));
+  })
   try {
     const listener = app.listen(config.server.port, function() {
       app.address = listener.address()
@@ -30,12 +30,12 @@ app.start = () => new Promise((resolve, reject) => {
 })
 
 
-const asyncWrap = (method) => function() {
+const asyncWrap = (method) => (function() {
   const args = Array.from(arguments)
-  if (args[0]) args[0] = asyncHandler(args[0])
+  if (args[1]) args[1] = asyncHandler(args[1])
   return method.apply(app, args)
-}
-const asyncApp = Object.create(app, {
+})
+const asyncApp = Object.assign(Object.create(app), {
   get: asyncWrap(app.get),
   post: asyncWrap(app.post),
   put: asyncWrap(app.put),

server.js

@@ -1,9 +1,11 @@
 const app = require('./lib/server')
 const crudRoute = require('./lib/crud-route')
 const controllers = require('./lib/controllers')
+const database = require('./lib/database')
 
 module.exports = {
   app,
   crudRoute,
-  controllers
+  controllers,
+  database
 }