Merge 58584dd into 08e9fb5

andela · Aug 21, 2019 · bf4064e · bf4064e
2 parents 08e9fb5 + 58584dd
commit bf4064e
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 32 deletions.
diff --git a/controllers/articles/index.js b/controllers/articles/index.js
@@ -51,44 +51,79 @@ export default {
 
   getUserArticles: async (req, res) => {
     try {
-      const { user: { id }, query } = req;
+      const { user, query, params: { username } } = req;
       const offset = query.offset ? (query.offset * query.limit) : 0;
       const limit = query.limit || 20;
 
+      let userId = null;
+      if (user) {
+        userId = user.id;
+      }
+      const id = userId;
+
+      let usernameId = null;
+      if (username) {
+        const foundUser = await db.User.findOne({
+          where: {
+            username
+          }
+        });
+        usernameId = foundUser.id;
+      }
+
+      const data = [
+        {
+          model: db.Category,
+          as: 'category',
+          attributes: ['name']
+        },
+        {
+          model: db.User,
+          as: 'author',
+          attributes: ['firstName', 'lastName', ['image', 'authorImage']]
+        },
+        {
+          model: db.ArticleVote,
+          where: { status: true },
+          required: false,
+          as: 'upVote',
+          attributes: ['status'],
+          include: [{
+            model: db.User,
+            required: false,
+            as: 'user',
+            attributes: ['username']
+          }]
+        },
+        {
+          model: db.ArticleVote,
+          where: { status: false },
+          required: false,
+          as: 'downVote',
+          attributes: ['status'],
+          include: [{
+            model: db.User,
+            required: false,
+            as: 'user',
+            attributes: ['username']
+          }]
+        }
+      ];
+
+      const include = id ? [...data, {
+        model: db.Bookmark,
+        as: 'bookmarks',
+        where: {
+          userId: id
+        },
+        required: false,
+      }] : [...data];
       const articles = await db.Article.findAndCountAll(
         {
           offset,
           limit,
-          where: { authorId: id },
-          attributes: ['title', 'rating', 'reads'],
-          include: [
-            {
-              model: db.ArticleVote,
-              where: { status: true },
-              required: false,
-              as: 'upVote',
-              attributes: ['status'],
-              include: [{
-                model: db.User,
-                required: false,
-                as: 'user',
-                attributes: ['username']
-              }]
-            },
-            {
-              model: db.ArticleVote,
-              where: { status: false },
-              required: false,
-              as: 'downVote',
-              attributes: ['status'],
-              include: [{
-                model: db.User,
-                required: false,
-                as: 'user',
-                attributes: ['username']
-              }]
-            }
-          ]
+          where: { authorId: (usernameId || id), publish: true },
+          include
         }
       );
       return res.status(200).json({

diff --git a/routes/v1/articles.js b/routes/v1/articles.js
@@ -23,7 +23,7 @@ router.post(
 );
 
 router.get(
-  '/user',
+  '/user/:username?',
   Middleware.authenticate,
   Middleware.isblackListedToken,
   Validation.getUserArticles,