From 8e8e181df16e9ec8ce03770bb3065fa9280b765b Mon Sep 17 00:00:00 2001 From: kodamirmo Date: Sat, 25 Oct 2014 17:33:50 -0500 Subject: [PATCH 1/6] Server --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index a52cf0c..1b4d4d2 100644 --- a/server.js +++ b/server.js @@ -64,7 +64,7 @@ app.get("/lnf/reports/:id", reports.findById); app.post("/lnf/reports", reports.add); app.put("/lnf/reports", reports.update); app.delete("/lnf/reports/:id", reports.delete); -app.post("/lnf/reports/populate", reports.populateReports); +app.get("/lnf/reports/populate", reports.populateReports); app.post("/lnf/reports/setalert/:id", reports.setAlert); app.post("/lnf/reports/comment/:id", reports.comment); From d139b2d3a28d515bee79dd1ea1e33b8a0552e0df Mon Sep 17 00:00:00 2001 From: kodamirmo Date: Sat, 25 Oct 2014 17:42:25 -0500 Subject: [PATCH 2/6] Add 404 --- routes/lostandfound/users.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/routes/lostandfound/users.js b/routes/lostandfound/users.js index c98f8b0..2d3bf90 100644 --- a/routes/lostandfound/users.js +++ b/routes/lostandfound/users.js @@ -16,6 +16,10 @@ module.exports.findById = function(req,res){ var _id = req.params.id; User.findOne({'_id':_id}, function(err, users){ + + if(!users) + res.send(404); + res.send(users); }); }; From 0fff1cff474018e73eefa94d0ceafe50b07df2f2 Mon Sep 17 00:00:00 2001 From: kodamirmo Date: Sat, 25 Oct 2014 17:44:08 -0500 Subject: [PATCH 3/6] Add logs --- routes/lostandfound/users.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/routes/lostandfound/users.js b/routes/lostandfound/users.js index 2d3bf90..4d495cd 100644 --- a/routes/lostandfound/users.js +++ b/routes/lostandfound/users.js @@ -17,6 +17,9 @@ module.exports.findById = function(req,res){ User.findOne({'_id':_id}, function(err, users){ + console.log("Error ", err); + console.log("Users ", users); + if(!users) res.send(404); From d35a12e2ebf6446b60aec05c756d4bbd6b72a64c Mon Sep 17 00:00:00 2001 From: kodamirmo Date: Sat, 25 Oct 2014 17:46:39 -0500 Subject: [PATCH 4/6] Add logs --- routes/lostandfound/users.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/routes/lostandfound/users.js b/routes/lostandfound/users.js index 4d495cd..fd69472 100644 --- a/routes/lostandfound/users.js +++ b/routes/lostandfound/users.js @@ -15,6 +15,8 @@ module.exports.findPaged = function(req,res){ module.exports.findById = function(req,res){ var _id = req.params.id; + console.log("Buscando usuario:", _id); + User.findOne({'_id':_id}, function(err, users){ console.log("Error ", err); From 6d00a1a35146b917757c6d0f06ebc28f2d77676c Mon Sep 17 00:00:00 2001 From: kodamirmo Date: Sat, 25 Oct 2014 17:54:06 -0500 Subject: [PATCH 5/6] Update --- routes/users.js | 9 +++++++++ server.js | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/routes/users.js b/routes/users.js index 7e1478b..6ec27c6 100644 --- a/routes/users.js +++ b/routes/users.js @@ -18,7 +18,16 @@ module.exports.findPaged = function(req,res){ module.exports.findById = function(req,res){ var _id = req.params.id; + console.log("Buscando usuario:", _id); + User.findOne({'_id':_id}, function(err, users){ + + console.log("Error ", err); + console.log("Users ", users); + + if(!users) + res.send(404); + res.send(users); }); }; diff --git a/server.js b/server.js index 1b4d4d2..3b24196 100644 --- a/server.js +++ b/server.js @@ -23,7 +23,7 @@ app.configure(function(){ app.use(express.cookieParser()); app.use(express.bodyParser({ keepExtensions: true, uploadDir: "uploads", limit:'3mb'})); app.use(express.methodOverride()); - app.use(express.logger('dev')); // default, short, tiny, dev + //app.use(express.logger('dev')); // default, short, tiny, dev app.use(passport.initialize()); app.use(passport.session()); app.use(app.router); From b592ff9e448de090b2481ebf5863ff734f9a2fcf Mon Sep 17 00:00:00 2001 From: kodamirmo Date: Sat, 25 Oct 2014 18:00:10 -0500 Subject: [PATCH 6/6] Update 2 --- routes/users.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/routes/users.js b/routes/users.js index 6ec27c6..e9b1c88 100644 --- a/routes/users.js +++ b/routes/users.js @@ -18,17 +18,15 @@ module.exports.findPaged = function(req,res){ module.exports.findById = function(req,res){ var _id = req.params.id; - console.log("Buscando usuario:", _id); - User.findOne({'_id':_id}, function(err, users){ - console.log("Error ", err); - console.log("Users ", users); + if(err) + res.status(500).send({ error: 'something blew up' }); if(!users) - res.send(404); - - res.send(users); + res.status(404).send('Sorry, we cannot find that!'); + else + res.send(users); }); };