username added on query

NerdCats · Oct 5, 2016 · 56993c2 · 56993c2
1 parent 898acb3
commit 56993c2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/queryMaker.js b/queryMaker.js
@@ -11,9 +11,9 @@ module.exports = {
 		    };
 			return dynObj;
 		} else if ((params.query.usertype === "USER" || params.query.usertype === "ENTERPRISE") 
-			&& params.query.userid && params.query.userid.length === 24) {
+			&& params.query.username) {
 			return {
-				"User.UserId" : params.query.userid,
+				"User.UserName" : params.query.username,
 				"CreateTime" : {
 			        $gte: new Date(params.query.startdate),
 			        $lt: new Date(params.query.enddate),

diff --git a/server.js b/server.js
@@ -28,7 +28,7 @@ router.get('/', function(req, res){
 
 // Parameters:
 // usertype = USER BIKE_MESSENGER ENTERPRISE
-// userid = Asset's user id
+// userid = Asset's user id or username = USER's or ENTERPRISE's UserName
 // startdate = ISOdate
 // enddate = ISOdate
 // generateexcel = boolean
@@ -76,7 +76,7 @@ router.get('/report', function (req, res) {
 
 // Parameters:
 // usertype = USER BIKE_MESSENGER ENTERPRISE
-// userid = Asset's user id
+// userid = Asset's user id or username = USER's or ENTERPRISE's UserName
 // startdate = ISOdate
 // enddate = ISOdate
 // generateexcel = boolean