Accounted for empty comment history in retrieve_userComments_history

2 files changed, 14 insertions, 9 deletions

diff --git a/node_simple.js b/node_simple.js
index 0290519..f7da2c3 100644
--- a/node_simple.js
+++ b/node_simple.js
@@ -350,16 +350,20 @@ exports.retrieve_userComments_history = function (username, callback) {
                 _id: 0
             }}
         ]).toArray(function (err, res) {
-            var finised = _.after(res.length, doCall);      // execute "doCall" only after res.length # of attempts
-            res.forEach(function (comment) {
-                exams.find( { _id: ObjectId(comment.exam_id) } ).toArray(function (err, docs) {     // get the exam info
-                    comment.course_code = docs[0].course_code;
-                    comment.year = docs[0].year;
-                    comment.term = docs[0].term;
-                    mylist.push(comment);       // save it to array
-                    finised();
+            if(!res.length){ // Ensure a callback is executed if res is empty
+                callback(true, res);
+            }else{
+                var finised = _.after(res.length, doCall);      // execute "doCall" only after res.length # of attempts
+                res.forEach(function (comment) {
+                    exams.find( { _id: ObjectId(comment.exam_id) } ).toArray(function (err, docs) {     // get the exam info
+                        comment.course_code = docs[0].course_code;
+                        comment.year = docs[0].year;
+                        comment.term = docs[0].term;
+                        mylist.push(comment);       // save it to array
+                        finised();
+                    });
                 });
-            });
+            }
         });
 
         function doCall() {
diff --git a/routes/user.js b/routes/user.js
index b179236..7a3e27c 100644
--- a/routes/user.js
+++ b/routes/user.js
@@ -51,6 +51,7 @@ router.get('/user_profile', loggedIn, isUser, function(req, res, next) {
     }
     function getMail(){
         return new Promise(function(resolve, reject) {
+
             dbFile.checkMailbox(req.user.user_name, function(success, error, data, message){
                 if (success) {
                     inbox = data;