add readiness check in kubenetes pod and update database seeding

Author: yunhan0

kubernetes/server.yml

@@ -27,6 +27,10 @@ spec:
               path: /health-check
               port: 3000
             initialDelaySeconds: 15
+          readinessProbe:
+            httpGet:
+              path: /health-check
+              port: 3000
 
 ---
   apiVersion: v1

server/src/api/health-check/index.js

@@ -18,4 +18,4 @@ router
   })
 
 
-module.exports = router
+module.exports = router

server/src/config/seed.js

@@ -7,25 +7,34 @@ const Thing = require('../api/thing/thing.model')
 const User = require('../api/user/user.model')
 
 const seeding = async() => {
-  await Thing.collection.deleteMany()
-  await Thing.create(
-    { name: 'Our first Koa and Node app', info: 'Lightweight server' },
-    { name: 'Mongo is here', info: 'We use mongodb to store data!' }
-  )
-  await User.collection.deleteMany()
-  await User.create({
-    name: 'tester',
-    email: '[email protected]',
-    password: 'helloworld',
-    role: 'user'
-  })
-  await User.create({
-    name: 'admin',
-    email: '[email protected]',
-    password: 'admini',
-    role: 'admin'
-  })
-  console.log('Finish populating database')
+  let numberOfThings = await Thing.countDocuments()
+    // populate initial things if nothing is in the database
+  if (numberOfThings == 0) {
+    await Thing.create({
+      name: 'Our first Koa and Node app', info: 'Lightweight server'
+    }, {
+      name: 'Mongo is here', info: 'We use mongodb to store data!'
+    })
+    console.log('Finish populating database - things')
+  }
+
+  let numberOfUsers = await User.countDocuments()
+  // populate initial users if no user is in the database
+  if (numberOfUsers == 0) {
+    await User.create({
+      name: 'tester',
+      email: '[email protected]',
+      password: 'helloworld',
+      role: 'user'
+    })
+    await User.create({
+      name: 'admin',
+      email: '[email protected]',
+      password: '123456',
+      role: 'admin'
+    })
+    console.log('Finish populating database - users')
+  }
 }
 
 seeding()

server/src/routes.js

@@ -1,30 +1,30 @@
-module.exports = function(app) {
-  // Customized error handling, default error code: 500
-  app.use(async (ctx, next) => {
-    try {
-      await next()
-    } catch (err) {
-      // Handle Validation Error
-      if(err.name === 'ValidationError') {
-        err.status = 422
-      }
-      // Handle Mongoose Item Duplication Error
-      if (err.name === 'BulkWriteError' && err.code === 11000) {
-        err.status = 422
-      }
-      ctx.status = err.status || 500
-      ctx.body = { message: err.message }
-    }
-  })
-
-  // Health check does not require authentication
-  app.use(require('./api/health-check').routes())
-
-  app.use(require('./api/auth').routes())
-  app.use(require('./api/user').routes())
-  // route middleware to verify a token
-  app.use(require('./api/auth/service').isAuthenticated)
-  app
-    .use(require('./api/thing').routes())
-    .use(require('./api/thing').allowedMethods())
-}
+module.exports = function(app) {
+  // Customized error handling, default error code: 500
+  app.use(async (ctx, next) => {
+    try {
+      await next()
+    } catch (err) {
+      // Handle Validation Error
+      if(err.name === 'ValidationError') {
+        err.status = 422
+      }
+      // Handle Mongoose Item Duplication Error
+      if (err.name === 'BulkWriteError' && err.code === 11000) {
+        err.status = 422
+      }
+      ctx.status = err.status || 500
+      ctx.body = { message: err.message }
+    }
+  })
+
+  // Health check does not require authentication
+  app.use(require('./api/health-check').routes())
+
+  app.use(require('./api/auth').routes())
+  app.use(require('./api/user').routes())
+  // route middleware to verify a token
+  app.use(require('./api/auth/service').isAuthenticated)
+  app
+    .use(require('./api/thing').routes())
+    .use(require('./api/thing').allowedMethods())
+}