Merge branch 'develop'

Author: Ryan Kotzen

package.json

@@ -38,7 +38,7 @@
   "dependencies": {
     "acl": "0.4.9",
     "ajv": "4.9.0",
-    "api-query-params": "4.1.0",
+    "api-query-params": "4.2.0",
     "async": "2.1.2",
     "bcrypt": "0.8.7",
     "body-parser": "1.15.2",
@@ -66,7 +66,7 @@
     "password-generator": "2.0.2",
     "pluralize": "3.0.0",
     "request-id": "0.11.0",
-    "snyk": "1.19.1",
+    "snyk": "1.20.0",
     "swagger-spec-express": "1.0.7",
     "winston": "2.3.0",
     "winston-daily-rotate-file": "1.3.1",
@@ -89,4 +89,4 @@
     "swagger-ui": "2.2.6"
   },
   "snyk": true
-}
+}

src/mongo/crud.js

@@ -42,7 +42,15 @@ function query(metadata) {
 }
 
 function parseQueryWithDefaults(queryString) {
-    var parsedQuery = aqp(queryString);
+    var agpOptions = {
+        casters: {
+            mongoId: val => mongo.ObjectId(val)
+        },
+        castParams: {
+            _id: 'mongoId'
+        }
+    };
+    var parsedQuery = aqp(queryString, agpOptions);
     if (_.isObject(queryString)) {
         coerceTypes(queryString, parsedQuery.filter);
     }
@@ -60,7 +68,6 @@ function coerceTypes(inputObject, filter) {
         }
         if (inputObject[key] instanceof mongo.ObjectId) {
             filter[key] = mongo.ObjectId(filter[key]);
-            return;
         }
     });
 }
@@ -72,12 +79,10 @@ function findByIdentifier(metadata) {
             return next(new Error("Object has no identifier"));
         }
         var mongoQuery = getIdentifierQuery(identifier, metadata);
-        if (Object.keys(req.query).length > 0) {
-            var parsedQuery = parseQueryWithDefaults(req.query);
-            mongoQuery = _.merge({}, parsedQuery.filter, mongoQuery);
-        }
+        mongoQuery = _.merge({}, req.query, mongoQuery);
+        var parsedQuery = parseQueryWithDefaults(mongoQuery);
         mongo.db.collection(metadata.collectionName)
-            .findOne(mongoQuery, dataRetrieved);
+            .findOne(parsedQuery.filter, dataRetrieved);
 
         function dataRetrieved(err, document) {
             if (err) {
@@ -94,7 +99,7 @@ function findByIdentifier(metadata) {
 
 function getIdentifierQuery(identifier, metadata) {
     if (mongo.isValidObjectId(identifier)) {
-        return {_id: mongo.ObjectId(identifier)};
+        return {_id: identifier};
     }
     var identifierQuery = {};
     identifierQuery[metadata.identifierName] = identifier;
@@ -117,7 +122,7 @@ function updateStatus(metadata) {
         if (_.isNil(identifier)) {
             return next(new Error("Object has no identifier"));
         }
-        var filter = getIdentifierQuery(identifier, metadata);
+        var mongoQuery = getIdentifierQuery(identifier, metadata);
         var now = moment.utc().toDate();
         var updateStatement = {
             $set: {
@@ -136,8 +141,9 @@ function updateStatus(metadata) {
         var options = {
             returnOriginal: true
         };
+        var parsedQuery = parseQueryWithDefaults(mongoQuery);
         mongo.db.collection(metadata.collectionName)
-            .findOneAndUpdate(filter, updateStatement, options, updateComplete);
+            .findOneAndUpdate(parsedQuery.filter, updateStatement, options, updateComplete);
         function updateComplete(err, result) {
             if (err) {
                 return next();
@@ -154,13 +160,14 @@ function update(metadata) {
         if (_.isNil(identifier)) {
             return next(new Error("Object has no identifier"));
         }
-        var filter = getIdentifierQuery(identifier, metadata);
+        var mongoQuery = getIdentifierQuery(identifier, metadata);
         var replacement = req.body;
         var options = {
             returnOriginal: true
         };
+        var parsedQuery = parseQueryWithDefaults(mongoQuery);
         mongo.db.collection(metadata.collectionName)
-            .findOneAndReplace(filter, replacement, options, updateComplete);
+            .findOneAndReplace(parsedQuery.filter, replacement, options, updateComplete);
         function updateComplete(err, result) {
             if (err) {
                 return next();
@@ -188,15 +195,16 @@ function getExistingMetadata(metadata) {
         if (_.isNil(identifier)) {
             return next(new Error("Object has no identifier"));
         }
-        var filter = getIdentifierQuery(identifier, metadata);
+        var mongoQuery = getIdentifierQuery(identifier, metadata);
         var options = {
             fields: {}
         };
         metadataFields.forEach(function (field) {
             options.fields[field] = 1;
         });
+        var parsedQuery = parseQueryWithDefaults(mongoQuery);
         mongo.db.collection(metadata.collectionName)
-            .findOne(filter, options, dataRetrieved);
+            .findOne(parsedQuery.filter, options, dataRetrieved);
         function dataRetrieved(err, document) {
             if (err) {
                 return next(err);
@@ -224,8 +232,9 @@ function deleteByIdentifier(metadata) {
             return next(new Error("Object has no identifier"));
         }
         var mongoQuery = getIdentifierQuery(identifier, metadata);
+        var parsedQuery = parseQueryWithDefaults(mongoQuery);
         mongo.db.collection(metadata.collectionName)
-            .deleteOne(mongoQuery, documentDeleted);
+            .deleteOne(parsedQuery.filter, documentDeleted);
 
         function documentDeleted(err, result) {
             if (err) {