fix bug

andela · Aug 8, 2019 · fe330a0 · fe330a0
1 parent 8ada3a1
commit fe330a0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/src/controllers/CommentController.js b/src/controllers/CommentController.js
@@ -82,12 +82,8 @@ export default class CommentController {
     const userId = req.user.id;
     const { articleSlug, commentId } = req.params;
     const newComment = { articleSlug, commentId, userId };
-    const findComment = await comment.getSingle({ articleSlug, id: commentId, userId });
     const findAllEdit = await editcomment.getAll(newComment);
-    if (findAllEdit.length === 0) {
-      return res.status(status.OK).json({ message: 'All previous', Comments: findComment });
-    }
-    return res.status(status.OK).json({ message: 'All previous comments', Comments: findAllEdit });
+    return res.status(status.OK).json({ message: 'All previous comments', history: findAllEdit });
   }
 
   /**

diff --git a/src/queries/articles/get.js b/src/queries/articles/get.js
@@ -14,7 +14,7 @@ export default async (condition = {}) => db.Article.findOne({
     {
       model: db.User,
       as: 'author',
-      attributes: ['username', 'bio', 'image']
+      attributes: ['username', 'firstName', 'lastName', 'bio', 'image']
     }
   ]
 });
diff --git a/src/routes/api/articles.js b/src/routes/api/articles.js
@@ -54,11 +54,11 @@ articles.get(
   '/articles/:slug',
   checkArticleBySlug,
   (req, res, next) => (req.article.status !== 'published'
-      && res.status(404).json({
-        errors: {
-          article: 'article not found'
-        }
-      }))
+    && res.status(404).json({
+      errors: {
+        article: 'article not found'
+      }
+    }))
     || next(),
   asyncHandler(ArticleController.getSpecificArticle)
 );