cmbf-hapi-restmodel - npm Package Compare versions

Comparing version 0.6.7 to 0.6.8

lib/handlers/create.js

@@ -16,3 +16,3 @@ var Calibrate = require('calibrate'),
                     log.trace("Model %s is unique", model[Model.idField]);
-                    var opts = _.merge(req.query || {}, { credentials: _.get(req.auth, "credentials")});
+                    var opts = _.merge(req.query || {}, { params: req.params|| {}, credentials: _.get(req.auth, "credentials")});
                     return model.create(opts).then(function() {
@@ -19,0 +19,0 @@ log.debug("Model %s instance %s was successfully created", Model.name, model[Model.idField]);

lib/handlers/list.js

@@ -9,3 +9,3 @@ var Calibrate = require('calibrate');
         return function(req, reply) {
-            var opts = _.merge(req.query || {}, { credentials: _.get(req.auth, "credentials") });
+            var opts = _.merge(req.query || {}, { params: req.params || {}, credentials: _.get(req.auth, "credentials") });
             return Model.list(opts).then(Calibrate.response).catch(Calibrate.error).then(reply);
@@ -12,0 +12,0 @@ }

lib/handlers/remove.js

@@ -11,3 +11,3 @@ var Calibrate = require('calibrate');
             log.debug("Remove %s request", Model.name, req.params.id);
-            var opts = _.merge(req.query || {}, { credentials: _.get(req.auth, "credentials")});
+            var opts = _.merge(req.query || {}, { params: req.params || {}, credentials: _.get(req.auth, "credentials")});
             Model.remove(req.params.id, opts).then(Calibrate.response).then(Calibrate.error).then(reply);
@@ -14,0 +14,0 @@ }

lib/handlers/show.js

@@ -11,3 +11,3 @@ var Calibrate = require('calibrate');
             log.debug("Show %s(%s) request", Model.name, req.params.id);
-            var opts = _.merge(req.query || {}, { credentials: _.get(req.auth, "credentials") });
+            var opts = _.merge(req.query || {}, { params: req.params || {}, credentials: _.get(req.auth, "credentials") });
             return Model.show(req.params.id, opts).then(Calibrate.response).catch(Calibrate.error).then(reply);
@@ -14,0 +14,0 @@ }

lib/handlers/update.js

@@ -12,3 +12,3 @@ var Calibrate = require('calibrate'),
             log.debug("Update %s(%s) request", Model.name, req.params.id);
-            var opts = _.merge(req.query || {}, { credentials: _.get(req.auth, "credentials") });
+            var opts = _.merge(req.query || {}, { params: req.params || {}, credentials: _.get(req.auth, "credentials") });
             return Model.show(req.params.id, opts).then(function(model) {
@@ -15,0 +15,0 @@ if(model) {

lib/handlers/upsert.js

@@ -12,3 +12,3 @@ var Calibrate = require('calibrate'),
             log.debug("Upsert %s(%s) request", Model.name, req.params.id);
-            var opts = _.merge(req.query || {}, { credentials: _.get(req.auth, "credentials") });
+            var opts = _.merge(req.query || {}, { params: req.params || {}, credentials: _.get(req.auth, "credentials") });
             return Model.show(req.params.id, opts).then(function(model) {
@@ -15,0 +15,0 @@ if(model) {

lib/services/create-model.js

@@ -10,4 +10,3 @@ var _ = require('lodash');
             log.trace("Model %s is unique", model[Model.idField]);
-            var opts = _.pick(msg, "credentials");
-            return model.create(opts).then(function() {
+            return model.create({params: _.omit(msg, "credentials"), credentials: msg.credentials }).then(function() {
                 log.debug("Model %s instance %s was successfully created", Model.name, model[Model.idField]);
@@ -14,0 +13,0 @@ return model.toJSON();

lib/services/list-model.js

@@ -7,4 +7,4 @@
     return function(msg) {
-        return Model.list(_.pick(msg, "query", "credentials"));
+        return Model.list({params: _.omit(msg, "credentials"), credentials: msg.credentials });
     }
 };

lib/services/remove-model.js

 
+var _ = require('lodash');
 
@@ -7,4 +8,4 @@ module.exports = function(Model, server, config, log) {
         log.debug("Remove %s request", Model.name, msg.id);
-        return Model.remove(msg.id, { credentials: msg.credentials});
+        return Model.remove(msg.id, {params: _.omit(msg, "credentials"), credentials: msg.credentials });
     }
 };

lib/services/show-model.js

 
+var _ = require('lodash');
 
@@ -7,4 +8,4 @@ module.exports = function(Model, server, config, log) {
         log.debug("Show %s(%s) request", Model.name, msg.id);
-        return Model.show(msg.id, { credentials: msg.credentials });
+        return Model.show(msg.id, {params: _.omit(msg, "credentials"), credentials: msg.credentials });
     }
 };

lib/services/update-model.js

 var Boom = require('boom');
+var _ = require('lodash');
 
@@ -7,3 +8,3 @@ module.exports = function(Model, server, config, log) {
         log.debug("Update %s(%s) request", Model.name, msg.id);
-        return Model.show(msg.id, { credentials: msg.credentials }).then(function(model) {
+        return Model.show(msg.id, {params: _.omit(msg, "credentials"), credentials: msg.credentials }).then(function(model) {
             if(model) {
@@ -10,0 +11,0 @@ return model.save(msg.data).then(function() {

lib/services/upsert-model.js

 var Boom = require('boom');
+var _ = require('lodash');
 
@@ -7,3 +8,3 @@ module.exports = function(Model, server, config, log) {
         log.debug("Upsert %s(%s) request", Model.name, msg.id);
-        return Model.show(msg.id, {credentials: msg.credentials}).then(function(model) {
+        return Model.show(msg.id, {params: _.omit(msg, "credentials"), credentials: msg.credentials }).then(function(model) {
             if(model) {
@@ -10,0 +11,0 @@ return model.save(msg.data, {upsert: true}).then(function() {

package.json

 {
   "name": "cmbf-hapi-restmodel",
-  "version": "0.6.7",
+  "version": "0.6.8",
   "author": "Joel Grenon <[e-mail]>",
@@ -5,0 +5,0 @@ "description": "Hapi plugin building a REST Api from Joi schema, backed by covistra-mongo plugin",

No alert changes

Improved metrics

Total package byte prevSize

41091

increased by1.11%

Lines of code

655

increased by0.46%

No dependency changes