Added db decorator and migration in docker deployment

Dockerfile

@@ -33,4 +33,4 @@ COPY . .
 EXPOSE 8080
 
 # Start the Express server
-CMD ["node", "./server/server.js"]
+CMD ["node", "./deploy-prod.js"]

deploy-dev.js

@@ -0,0 +1,47 @@
+const nodemon = require('nodemon');
+const knex = require('./server/database/knex');
+
+const DELAY = 3000;
+
+function testConnection() {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      console.log('Polling for DB Connection...');
+      knex.migrate.latest()
+      .then(resolve)
+      .catch((err) => {
+        console.log(err);
+        resolve(testConnection());
+      });
+    }, DELAY);
+  })
+}
+
+// migrate db
+testConnection()
+// run seeds
+.then(() => { knex.seed.run(); })
+// print status
+.then(() => {
+  console.log('Migration and Seeds Finished');
+})
+// run server using nodemon
+.then(() => {
+  nodemon({
+    script: './server/server.js',
+    ext: 'js json'
+  });
+
+  nodemon.on('start', function () {
+    console.log('App has started');
+  }).on('quit', function () {
+    console.log('App has quit');
+    process.exit();
+  }).on('restart', function (files) {
+    console.log('App restarted due to: ', files);
+  });
+})
+.catch((err) => {
+  console.log(err);
+  process.exit(1);
+});

deploy-prod.js

@@ -0,0 +1,31 @@
+const knex = require('./server/database/knex');
+
+const DELAY = 3000;
+
+function testConnection() {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      console.log('Polling for DB Connection...');
+      knex.migrate.latest()
+      .then(resolve)
+      .catch(() => { resolve(testConnection()); });
+    }, DELAY);
+  })
+}
+
+// migrate db
+testConnection()
+// run seeds
+.then(() => { knex.seed.run(); })
+// print status
+.then(() => {
+  console.log('Migration and Seeds Finished');
+})
+// run server
+.then(() => {
+  require('./server/server');
+})
+.catch((err) => {
+  console.log(err);
+  process.exit(1);
+});

docker-compose.override.yml

@@ -4,7 +4,7 @@ services:
     image: ${DOCKERHUB_NAME}/${IMAGE_NAME}:${IMAGE_VERSION}
     depends_on:
       - postgres-primary-db
-    command: ["npm", "run", "dev"]
+    command: ["node", "deploy-dev.js"]
     container_name: ${IMAGE_NAME}
     volumes:
       - ".:/src/app"

package.json

@@ -15,7 +15,6 @@
     "react-scripts": "2.1.2"
   },
   "scripts": {
-    "dev": "./node_modules/nodemon/bin/nodemon.js ./server/server.js",
     "start": "react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test",

server/database/decorator.js

@@ -0,0 +1,6 @@
+const User = require('./models/User');
+
+module.exports = function(req, res, next) {
+  req.database = { User };
+  next();
+}

server/knexfile.js

@@ -16,9 +16,9 @@ module.exports = {
   },
   migrations: {
     tableName: 'knex_migrations',
-    directory: './database/migrations'
+    directory: './server/database/migrations'
   },
   seeds: {
-    directory: './database/seeds'
+    directory: './server/database/seeds'
   }
 };

server/routes/users/index.js

@@ -0,0 +1,27 @@
+const express = require('express');
+const router = express.Router();
+
+router.route('/users')
+.get((req, res) => {
+  return new req.database.User().fetchAll()
+    .then((users) => {
+      return res.json(users);
+    })
+    .catch((err) => {
+      console.log(err);
+      res.sendStatus(500);
+    });
+})
+.post((req, res) => {
+  const username = req.body.username;
+  return new req.database.User({ username }).save()
+    .then((user) => {
+      return res.json({ success: true });
+    })
+    .catch((err) => {
+      console.log(err);
+      res.sendStatus(500);
+    });
+});
+
+module.exports = router;

server/server.js

@@ -1,6 +1,7 @@
 const express = require('express');
 const bodyParser = require('body-parser');
-const User = require('./database/models/User');
+const userRoutes = require('./routes/users');
+const decorator = require('./database/decorator');
 
 // data vars
 const PORT = process.env.PORT;
@@ -16,34 +17,15 @@ if (!PORT || !SESSION_SECRET || !REDIS_HOSTNAME) { return process.exit(1); }
 const app = express();
 app.use(bodyParser.json({ extended: true }));
 
+// decorate request with database
+app.use(decorator);
+
 // routes
+app.use('/api', userRoutes);
 app.get('/api/smoke', (req, res) => {
   res.json({ smoke: 'test' });
 });
 
-app.get('/api/users', (req, res) => {
-  return new User().fetchAll()
-    .then((users) => {
-      return res.json(users);
-    })
-    .catch((err) => {
-      console.log(err);
-      res.sendStatus(500);
-    });
-});
-
-app.post('/api/users', (req, res) => {
-  const username = req.body.username;
-  return new User({ username }).save()
-    .then((user) => {
-      return res.json({ success: true });
-    })
-    .catch((err) => {
-      console.log(err);
-      res.sendStatus(500);
-    });
-})
-
 // start server
 app.listen(PORT, () => {
   console.log(`Server stated on port: ${PORT}`);