Unification of error messages for e2e test

app.js

@@ -30,6 +30,14 @@ const db = require('./lib/db');
 const fruits = require('./lib/routes/fruits');
 
 app.use(bodyParser.json());
+app.use(function (error, req, res, next) {
+  if (req.body === '' || (error instanceof SyntaxError && error.type === 'entity.parse.failed')) {
+    res.status(415);
+    return res.send('Invalid payload!');
+  } else {
+    next();
+  }
+});
 app.use(bodyParser.urlencoded({ extended: false }));
 app.use(express.static(path.join(__dirname, 'public')));
 // expose the license.html at http[s]://[host]:[port]/licences/licenses.html

lib/routes/fruits.js

@@ -7,7 +7,7 @@ const validations = require('../validations');
 const fruits = require('../api/fruits');
 
 router.get('/fruits/:id', (request, response) => {
-  const {id} = request.params;
+  const { id } = request.params;
   fruits.find(id).then(result => {
     if (result.rowCount === 0) {
       response.status(404);
@@ -27,8 +27,8 @@ router.get('/fruits', (request, response) => {
   });
 });
 
-router.post('/fruits', validations.validateCreate, (request, response) => {
-  const {name, stock} = request.body;
+router.post('/fruits', validations.validateCreateUpdateRequest, (request, response) => {
+  const { name, stock } = request.body;
   return fruits.create(name, stock).then((result) => {
     response.status(201);
     return response.send(result.rows[0]);
@@ -38,10 +38,10 @@ router.post('/fruits', validations.validateCreate, (request, response) => {
   });
 });
 
-router.put('/fruits/:id', validations.validateUpdate, (request, response) => {
-  const {name, stock} = request.body;
-  const {id} = request.params;
-  fruits.update({name, stock, id}).then((result) => {
+router.put('/fruits/:id', validations.validateCreateUpdateRequest, (request, response) => {
+  const { name, stock } = request.body;
+  const { id } = request.params;
+  fruits.update({ name, stock, id }).then((result) => {
     if (result.rowCount === 0) {
       response.status(404);
       return response.send(`Unknown item ${id}`);
@@ -54,7 +54,7 @@ router.put('/fruits/:id', validations.validateUpdate, (request, response) => {
 });
 
 router.delete('/fruits/:id', (request, response) => {
-  const {id} = request.params;
+  const { id } = request.params;
   fruits.remove(id).then((result) => {
     if (result.rowCount === 0) {
       response.status(404);

lib/validations/index.js

@@ -1,50 +1,31 @@
 'use strict';
 
-function validateCreate (request, response, next) {
-  // No need to check for no body, express will make body an empty object
-  const {name, stock, id} = request.body;
-
-  if (!name) {
-    response.status(400);
-    return response.send('The name must not be null');
+function validateCreateUpdateRequest(request, response, next) {
+  if(Object.keys(request.body).length === 0){
+    response.status(415);
+    return response.send('Invalid payload!');
   }
-
-  if (!stock) {
-    response.status(400);
-    return response.send('The stock must not be greater or equal to 0');
-  }
-
-  if (id) {
-    response.status(400);
-    return response.send('The created item already contains an id');
-  }
-
-  next();
-}
-
-function validateUpdate (request, response, next) {
   // No need to check for no body, express will make body an empty object
-  const {name, stock, id} = request.body;
+  const { name, stock, id } = request.body;
 
   if (!name) {
-    response.status(400);
-    return response.send('The name must not be null');
+    response.status(422);
+    return response.send('The name is required!');
   }
 
-  if (!stock) {
-    response.status(400);
-    return response.send('The stock must not be greater or equal to 0');
+  if (stock == null || isNaN(stock) || stock < 0) {
+    response.status(422);
+    return response.send('The stock must be greater or equal to 0!');
   }
 
   if (id && id !== request.params.id) {
-    response.status(400);
-    return response.send('The id cannot be changed');
+    response.status(422);
+    return response.send('Id was invalidly set on request.');
   }
 
   next();
 }
 
 module.exports = {
-  validateCreate,
-  validateUpdate
+  validateCreateUpdateRequest
 };

public/index.html

@@ -81,7 +81,7 @@
       //In case of edit fruits, populate form with fruit data
       $scope.edit = function (fruit) {
         $scope.form.name = fruit.name;
-        $scope.form.stock = fruit.stock;
+        $scope.form.stock = parseInt(fruit.stock);
         $scope.form.id = fruit.id;
       };
 
@@ -104,7 +104,7 @@
       }
 
       function _error(response) {
-        alert(response.data.error || response.statusText);
+        alert(response.data || response.statusText);
       }
 
       //Clear the form
@@ -131,7 +131,7 @@ <h3>Add/Edit a fruit</h3>
   <form ng-submit="update()">
     <div class="row">
       <div class="col-6"><input type="text" placeholder="Name" ng-model="form.name" size="60"/></div>
-      <div class="col-6"><input type="number" placeholder="Stock" ng-model="form.stock" size="60"/></div>
+      <div class="col-6"><input type="number" placeholder="Stock" ng-model="form.stock" size="60" min="0"/></div>
     </div>
     <input type="submit" value="Save"/>
   </form>