1 files changed, 81 insertions, 49 deletions
diff --git a/models/cardComments.js b/models/cardComments.js
index cc1c55bc..4d802748 100644
--- a/models/cardComments.js
+++ b/models/cardComments.js
@@ -88,65 +88,97 @@ if (Meteor.isServer) {
 //CARD COMMENT REST API
 if (Meteor.isServer) {
   JsonRoutes.add('GET', '/api/boards/:boardId/cards/:cardId/comments', function (req, res, next) {
-    Authentication.checkUserId( req.userId);
-    const paramBoardId = req.params.boardId;
-    const paramCardId = req.params.cardId;
-    JsonRoutes.sendResult(res, {
-      code: 200,
-      data: CardComments.find({ boardId: paramBoardId, cardId: paramCardId}).map(function (doc) {
-        return {
-          _id: doc._id,
-          comment: doc.text,
-          authorId: doc.userId,
-        };
-      }),
-    });
+    try {
+      Authentication.checkUserId( req.userId);
+      const paramBoardId = req.params.boardId;
+      const paramCardId = req.params.cardId;
+      JsonRoutes.sendResult(res, {
+        code: 200,
+        data: CardComments.find({ boardId: paramBoardId, cardId: paramCardId}).map(function (doc) {
+          return {
+            _id: doc._id,
+            comment: doc.text,
+            authorId: doc.userId,
+          };
+        }),
+      });
+    }
+    catch (error) {
+      JsonRoutes.sendResult(res, {
+        code: 200,
+        data: error,
+      });
+    }
   });
 
   JsonRoutes.add('GET', '/api/boards/:boardId/cards/:cardId/comments/:commentId', function (req, res, next) {
-    Authentication.checkUserId( req.userId);
-    const paramBoardId = req.params.boardId;
-    const paramCommentId = req.params.commentId;
-    const paramCardId = req.params.cardId;
-    JsonRoutes.sendResult(res, {
-      code: 200,
-      data: CardComments.findOne({ _id: paramCommentId, cardId: paramCardId, boardId: paramBoardId }),
-    });
+    try {
+      Authentication.checkUserId( req.userId);
+      const paramBoardId = req.params.boardId;
+      const paramCommentId = req.params.commentId;
+      const paramCardId = req.params.cardId;
+      JsonRoutes.sendResult(res, {
+        code: 200,
+        data: CardComments.findOne({ _id: paramCommentId, cardId: paramCardId, boardId: paramBoardId }),
+      });
+    }
+    catch (error) {
+      JsonRoutes.sendResult(res, {
+        code: 200,
+        data: error,
+      });
+    }
   });
 
   JsonRoutes.add('POST', '/api/boards/:boardId/cards/:cardId/comments', function (req, res, next) {
-    Authentication.checkUserId( req.userId);
-    const paramBoardId = req.params.boardId;
-    const paramCardId = req.params.cardId;
-    const id = CardComments.direct.insert({
-      userId: req.body.authorId,
-      text: req.body.comment,
-      cardId: paramCardId,
-      boardId: paramBoardId,
-    });
+    try {
+      Authentication.checkUserId( req.userId);
+      const paramBoardId = req.params.boardId;
+      const paramCardId = req.params.cardId;
+      const id = CardComments.direct.insert({
+        userId: req.body.authorId,
+        text: req.body.comment,
+        cardId: paramCardId,
+        boardId: paramBoardId,
+      });
 
-    JsonRoutes.sendResult(res, {
-      code: 200,
-      data: {
-        _id: id,
-      },
-    });
+      JsonRoutes.sendResult(res, {
+        code: 200,
+        data: {
+          _id: id,
+        },
+      });
 
-    const cardComment = CardComments.findOne({_id: id, cardId:paramCardId, boardId: paramBoardId });
-    commentCreation(req.body.authorId, cardComment);
+      const cardComment = CardComments.findOne({_id: id, cardId:paramCardId, boardId: paramBoardId });
+      commentCreation(req.body.authorId, cardComment);
+    }
+    catch (error) {
+      JsonRoutes.sendResult(res, {
+        code: 200,
+        data: error,
+      });
+    }
   });
 
   JsonRoutes.add('DELETE', '/api/boards/:boardId/cards/:cardId/comments/:commentId', function (req, res, next) {
-    Authentication.checkUserId( req.userId);
-    const paramBoardId = req.params.boardId;
-    const paramCommentId = req.params.commentId;
-    const paramCardId = req.params.cardId;
-    CardComments.remove({ _id: paramCommentId, cardId: paramCardId, boardId: paramBoardId });
-    JsonRoutes.sendResult(res, {
-      code: 200,
-      data: {
-        _id: paramCardId,
-      },
-    });
+    try {
+      Authentication.checkUserId( req.userId);
+      const paramBoardId = req.params.boardId;
+      const paramCommentId = req.params.commentId;
+      const paramCardId = req.params.cardId;
+      CardComments.remove({ _id: paramCommentId, cardId: paramCardId, boardId: paramBoardId });
+      JsonRoutes.sendResult(res, {
+        code: 200,
+        data: {
+          _id: paramCardId,
+        },
+      });
+    }
+    catch (error) {
+      JsonRoutes.sendResult(res, {
+        code: 200,
+        data: error,
+      });
+    }
   });
 }