Updated remove and update handlers to support all primary keys.

Author: Ben Hanna

handlers/remove.js

@@ -1,4 +1,6 @@
-var HttpStatusError = require('../errors/HttpStatusError');
+var _ = require('lodash'),
+    qs = require('../parsers/qs'),
+    HttpStatusError = require('../errors/HttpStatusError');
 
 module.exports = init;
 
@@ -8,10 +10,16 @@ function init(model) {
     ];
 
     function remove(req, res, next) {
-        var options = req.options || {}; 
-
-        options.where = options.where || {};
-        options.where[model.primaryKeyAttribute] = req.params.id;
+        var keys = {},
+            options = {};
+        
+        keys.model = _.keys(model.primaryKeyAttributes);
+        keys.params = _.keys(req.params);
+        keys.filters = _.intersection(keys.model, keys.params);
+    
+        options.where = qs.filters(_.pick(req.params, keys.filters))
+        
+        options = _.merge({}, options, req.options);
 
         model
             .findOne(options)

handlers/update.js

@@ -1,4 +1,6 @@
-var HttpStatusError = require('../errors/HttpStatusError'),
+var _ = require('lodash'),
+    qs = require('../parsers/qs'),
+    HttpStatusError = require('../errors/HttpStatusError'),
     plainTransform = require('../transforms/plain');
 
 module.exports = init; 
@@ -11,10 +13,16 @@ function init(model) {
 
     function update(req, res, next) {
         var body = req.body,
-            options = req.options || {}; 
-
-        options.where = options.where || {};
-        options.where[model.primaryKeyAttribute] = req.params.id;
+            keys = {},
+            options = {};
+        
+        keys.model = _.keys(model.primaryKeyAttributes);
+        keys.params = _.keys(req.params);
+        keys.filters = _.intersection(keys.model, keys.params);
+    
+        options.where = qs.filters(_.pick(req.params, keys.filters))
+        
+        options = _.merge({}, options, req.options);
 
         model
             .findOne(options)