Merge pull request #81 from micro-toolkit/fix/status-codes-reply

Fix/status codes reply

Author: pjanuario

lib/client.js

@@ -17,46 +17,36 @@ function getConfig(runtimeConfig, modelName){
   throw new Error(msg);
 }
 
-function payloadResolver(data){
-  return data.payload;
-}
-
 function init(modelName, runtimeConfig){
   var client = new ZSSClient(getConfig(runtimeConfig, modelName));
 
   return {
     get: function(payload, headers){
-      return client.call('get', payload || {}, { headers: headers })
-        .then(payloadResolver);
+      return client.call('get', payload || {}, { headers: headers });
     },
     list: function(payload, headers){
       log.trace('Call \'list\' with headers %j & payload %j', headers, payload);
-      return client.call('list', payload || {}, { headers: headers })
-        .then(payloadResolver);
+      return client.call('list', payload || {}, { headers: headers });
     },
     create: function(payload, headers){
       log.trace('Call \'create\' with headers %j & payload %j',
         headers, payload);
-      return client.call('create', payload || {}, { headers: headers })
-        .then(payloadResolver);
+      return client.call('create', payload || {}, { headers: headers });
     },
     update: function(payload, headers){
       log.trace('Call \'update\' with headers %j & payload %j',
         headers, payload);
-      return client.call('update', payload || {}, { headers: headers })
-        .then(payloadResolver);
+      return client.call('update', payload || {}, { headers: headers });
     },
     remove: function(payload, headers){
       log.trace('Call \'remove\' with headers %j & payload %j',
         headers, payload);
-      return client.call('remove', payload, { headers: headers })
-        .then(payloadResolver);
+      return client.call('remove', payload, { headers: headers });
     },
     call: function(verb, payload, headers){
       log.trace('Call \'%s\' with headers %j & payload %j',
         verb, headers, payload);
-      return client.call(verb, payload, { headers: headers })
-        .then(payloadResolver);
+      return client.call(verb, payload, { headers: headers });
     }
   };
 }

lib/handlers.js

@@ -72,8 +72,8 @@ function collectionHandler(metadata, config) {
     var headers = getHeaders(req, handlerConfig.claimsConfig);
     handlerConfig.client.list(payload, headers)
       .then(function(data){
-        log.debug('collection data received: %j', data);
-        var models = data.map(handlerConfig.toModel);
+        log.debug('collection data received: %j', data.payload);
+        var models = data.payload.map(handlerConfig.toModel);
         res.json(models);
         return next();
       })
@@ -96,8 +96,8 @@ function getResource(metadata, config) {
 
     handlerConfig.client.get(payload, headers)
       .then(function(data){
-        log.debug('resource data received: %j', data);
-        var model = handlerConfig.toModel(data);
+        log.debug('resource data received: %j', data.payload);
+        var model = handlerConfig.toModel(data.payload);
         res.json(model);
         return next();
       })
@@ -116,8 +116,8 @@ function createResource(metadata, config) {
     var headers = getHeaders(req, handlerConfig.claimsConfig);
     handlerConfig.client.create(payload, headers)
       .then(function(data){
-        log.debug('resource created successfully with: %j', data);
-        var model = handlerConfig.toModel(data);
+        log.debug('resource created successfully with: %j', data.payload);
+        var model = handlerConfig.toModel(data.payload);
         res.json(model);
         return next();
       })
@@ -139,8 +139,8 @@ function updateResource(metadata, config) {
 
     handlerConfig.client.update(payload, headers)
       .then(function(data){
-        log.debug('resource updated successfully with: %j', data);
-        var model = handlerConfig.toModel(data);
+        log.debug('resource updated successfully with: %j', data.payload);
+        var model = handlerConfig.toModel(data.payload);
         res.json(model);
         return next();
       })
@@ -155,9 +155,16 @@ function removeResource(metadata, config) {
     log.info('Request delete resource with: %j', req.params);
     var headers = getHeaders(req, handlerConfig.claimsConfig);
     handlerConfig.client.remove(req.params, headers)
-      .then(function(){
-        log.debug('resource removed successfully');
-        res.sendStatus(204);
+      .then(function(data){
+        log.debug('resource removed successfully with: %j', data.payload);
+        if (data.status === 204) {
+          // no content
+          res.sendStatus(204);
+        } else {
+          var model = handlerConfig.toModel(data.payload);
+          res.status(data.status).json(model);
+        }
+
         return next();
       })
       .fail(handleErrors(config.runtimeConfig, res, next));
@@ -190,8 +197,8 @@ function resourceRelationHandler(relation, config) {
     var headers = getHeaders(req, claimsConfig);
     client.list(payload, headers)
       .then(function(data){
-        log.debug('resource relation data received: %j', data);
-        var models = data.map(toModel);
+        log.debug('resource relation data received: %j', data.payload);
+        var models = data.payload.map(toModel);
         res.json(models);
         return next();
       })
@@ -213,13 +220,15 @@ function nonStandardAction(metadata, config, action) {
     handlerConfig.client.call(action.verb, payload, headers)
       .then(function(data){
         log.debug('action executed successfully with: %j', data);
-        if (!data) {
+        if (data.status === 204) {
+          // no content
           res.sendStatus(204);
           return next();
         }
 
-        var result = _.isArray(data) ? data.map(handlerConfig.toModel)
-          : handlerConfig.toModel(data);
+        var result = _.isArray(data.payload) ?
+          data.payload.map(handlerConfig.toModel)
+          : handlerConfig.toModel(data.payload);
         res.json(result);
         return next();
       })