Merge ae5bd67 into 5467688

andela · Mar 3, 2019 · c52139d · c52139d
2 parents 5467688 + ae5bd67
commit c52139d
Show file tree

Hide file tree

Showing 74 changed files with 51 additions and 12 deletions.
diff --git a/server/config/passportConfigs/facebookStragegy.js b/server/config/passportConfigs/facebookStragegy.js
diff --git a/server/config/passportConfigs/googleStrategy.js b/server/config/passportConfigs/googleStrategy.js
diff --git a/server/config/passportConfigs/linkednStrategy.js b/server/config/passportConfigs/linkednStrategy.js
diff --git a/server/config/passportConfigs/twitterStrategy.js b/server/config/passportConfigs/twitterStrategy.js
diff --git a/server/controllers/ArticleController.js b/server/controllers/ArticleController.js
diff --git a/server/controllers/BookmarkController.js b/server/controllers/BookmarkController.js
@@ -26,16 +26,29 @@ class BookmarkController {
       if (!article) return response(res, 404, 'failure', 'Article not found');
 
       await Bookmark.findOrCreate({
-        where: { userId, articleId: article.dataValues.id },
+        where: { userId, articleId: article.dataValues.id }
       }).spread((bookmark, created) => {
         if (created) {
-          return response(res, 201, 'success', 'You have successfully bookmarked this article', null, bookmark);
+          return response(
+            res,
+            201,
+            'success',
+            'You have successfully bookmarked this article',
+            null,
+            bookmark
+          );
         }
         bookmark.destroy();
         return response(res, 200, 'success', 'Bookmark removed successfully');
       });
     } catch (error) {
-      return response(res, 500, 'failure', 'Something went wrong on the server', `server error: ${error.message}`);
+      return response(
+        res,
+        500,
+        'failure',
+        'Something went wrong on the server',
+        `server error: ${error.message}`
+      );
     }
   }
 
@@ -58,22 +71,33 @@ class BookmarkController {
 
       const bookmarksQuery = await Bookmark.findAll({
         attributes: { exclude: ['userId'] },
-        include: [{
-          model: User,
-          attributes: ['userName', 'bio', 'img']
-        }],
+        include: [
+          {
+            model: User,
+            attributes: ['userName', 'bio', 'img']
+          }
+        ],
         where: {
           articleId: article.dataValues.id
-        },
+        }
       });
       if (bookmarksQuery.length === 0) {
         return response(res, 200, 'success', 'This article has not been bookmarked yet');
       }
       const bookmarks = [];
       bookmarksQuery.map(bookmark => bookmarks.push(bookmark.dataValues));
-      return response(res, 200, 'success', 'Bookmarks successfully found', null, { bookmarks, bookmarkCount: bookmarks.length });
+      return response(res, 200, 'success', 'Bookmarks successfully found', null, {
+        bookmarks,
+        bookmarkCount: bookmarks.length
+      });
     } catch (error) {
-      return response(res, 500, 'failure', 'Something went wrong on the server', `server error: ${error.message}`);
+      return response(
+        res,
+        500,
+        'failure',
+        'Something went wrong on the server',
+        `server error: ${error.message}`
+      );
     }
   }
 
@@ -94,15 +118,30 @@ class BookmarkController {
         where: {
           userId: user.dataValues.id
         },
+        include: [
+          {
+            model: Article,
+            attributes: ['slug', 'title', 'content', 'banner', 'timeToRead', 'createdAt']
+          }
+        ]
       });
       if (bookmarksQuery.length === 0) {
         return response(res, 200, 'success', 'You have not bookmarked any article yet');
       }
       const bookmarks = [];
       bookmarksQuery.map(bookmark => bookmarks.push(bookmark.dataValues));
-      return response(res, 200, 'success', 'Bookmarks successfully found', null, { bookmarks, bookmarkCount: bookmarks.length });
+      return response(res, 200, 'success', 'Bookmarks successfully found', null, {
+        bookmarks,
+        bookmarkCount: bookmarks.length
+      });
     } catch (error) {
-      return response(res, 500, 'failure', 'Something went wrong on the server', `server error: ${error.message}`);
+      return response(
+        res,
+        500,
+        'failure',
+        'Something went wrong on the server',
+        `server error: ${error.message}`
+      );
     }
   }
 }

diff --git a/server/controllers/CommentController.js b/server/controllers/CommentController.js
diff --git a/server/controllers/FollowFeedController.js b/server/controllers/FollowFeedController.js
diff --git a/server/controllers/RatingController.js b/server/controllers/RatingController.js
diff --git a/server/controllers/ReadingStatsController.js b/server/controllers/ReadingStatsController.js
diff --git a/server/controllers/ReportArticleController.js b/server/controllers/ReportArticleController.js
diff --git a/server/controllers/SearchController.js b/server/controllers/SearchController.js
diff --git a/server/controllers/TagController.js b/server/controllers/TagController.js
diff --git a/server/controllers/TagFeedContoller.js b/server/controllers/TagFeedContoller.js
diff --git a/server/controllers/followController.js b/server/controllers/followController.js
diff --git a/server/helpers/ArticleHelper.js b/server/helpers/ArticleHelper.js
diff --git a/server/helpers/MockStrategy.js b/server/helpers/MockStrategy.js
diff --git a/server/helpers/TagHelper.js b/server/helpers/TagHelper.js
diff --git a/server/helpers/TimeToRead.js b/server/helpers/TimeToRead.js
diff --git a/server/helpers/Util.js b/server/helpers/Util.js
diff --git a/server/helpers/emailTemplates/newArticleTemplate.js b/server/helpers/emailTemplates/newArticleTemplate.js
diff --git a/server/helpers/emailTemplates/newCommentTemplate.js b/server/helpers/emailTemplates/newCommentTemplate.js
diff --git a/server/helpers/emailTemplates/newFollowerTemplate.js b/server/helpers/emailTemplates/newFollowerTemplate.js
diff --git a/server/helpers/emailTemplates/verifyEmailTemplate.js b/server/helpers/emailTemplates/verifyEmailTemplate.js
diff --git a/server/helpers/eventsHandler.js b/server/helpers/eventsHandler.js
diff --git a/server/helpers/pagination.js b/server/helpers/pagination.js
diff --git a/server/helpers/response.js b/server/helpers/response.js
diff --git a/server/middlewares/ContentValidator.js b/server/middlewares/ContentValidator.js
diff --git a/server/middlewares/validations/ArticleRatingValidations.js b/server/middlewares/validations/ArticleRatingValidations.js
diff --git a/server/middlewares/validations/ArticleValidation.js b/server/middlewares/validations/ArticleValidation.js
diff --git a/server/middlewares/validations/CommentValidations.js b/server/middlewares/validations/CommentValidations.js
diff --git a/server/middlewares/validations/ReportArticleValidations.js b/server/middlewares/validations/ReportArticleValidations.js
diff --git a/server/middlewares/validations/SearchValidations.js b/server/middlewares/validations/SearchValidations.js
diff --git a/server/middlewares/validations/handleValidationErrors.js b/server/middlewares/validations/handleValidationErrors.js
diff --git a/server/middlewares/validations/userValidation.js b/server/middlewares/validations/userValidation.js
diff --git a/server/migrations/20190127133424-create-reading-stats.js b/server/migrations/20190127133424-create-reading-stats.js
diff --git a/server/migrations/20190130065911-create-user-followed-tags.js b/server/migrations/20190130065911-create-user-followed-tags.js
diff --git a/server/migrations/20190130215647-create-highlight.js b/server/migrations/20190130215647-create-highlight.js
diff --git a/server/models/followedTags.js b/server/models/followedTags.js
diff --git a/server/models/highlight.js b/server/models/highlight.js
diff --git a/server/models/readingstats.js b/server/models/readingstats.js
diff --git a/server/routes/api/article.js b/server/routes/api/article.js
diff --git a/server/routes/api/auth.js b/server/routes/api/auth.js
diff --git a/server/routes/api/bookmark.js b/server/routes/api/bookmark.js
diff --git a/server/routes/api/comment.js b/server/routes/api/comment.js
diff --git a/server/routes/api/rating.js b/server/routes/api/rating.js
diff --git a/server/routes/api/readStats.js b/server/routes/api/readStats.js
diff --git a/server/routes/api/reportArticle.js b/server/routes/api/reportArticle.js
diff --git a/server/routes/api/tag.js b/server/routes/api/tag.js
diff --git a/server/seeders/20190119190506-demoComment.js b/server/seeders/20190119190506-demoComment.js
diff --git a/server/seeders/20190124084130-demoTag.js b/server/seeders/20190124084130-demoTag.js
diff --git a/server/seeders/20190124084901-demoArticleTag.js b/server/seeders/20190124084901-demoArticleTag.js
diff --git a/server/seeders/20190130083652-demoFollow.js b/server/seeders/20190130083652-demoFollow.js
diff --git a/server/seeders/20190130102850-demo-followedTags.js b/server/seeders/20190130102850-demo-followedTags.js
diff --git a/server/seeders/20190219002203-demoNotification.js b/server/seeders/20190219002203-demoNotification.js
diff --git a/server/test/controllers/articleFeedController.spec.js b/server/test/controllers/articleFeedController.spec.js
diff --git a/server/test/controllers/articles.spec.js b/server/test/controllers/articles.spec.js
diff --git a/server/test/controllers/authController.spec.js b/server/test/controllers/authController.spec.js
diff --git a/server/test/controllers/bookmarkController.spec.js b/server/test/controllers/bookmarkController.spec.js
diff --git a/server/test/controllers/comment.spec.js b/server/test/controllers/comment.spec.js
diff --git a/server/test/controllers/follow.spec.js b/server/test/controllers/follow.spec.js
diff --git a/server/test/controllers/notification.spec.js b/server/test/controllers/notification.spec.js
diff --git a/server/test/controllers/ratingController.spec.js b/server/test/controllers/ratingController.spec.js
diff --git a/server/test/controllers/readStats.spec.js b/server/test/controllers/readStats.spec.js
diff --git a/server/test/controllers/reportArticles.spec.js b/server/test/controllers/reportArticles.spec.js
diff --git a/server/test/controllers/searchController.spec.js b/server/test/controllers/searchController.spec.js
diff --git a/server/test/controllers/tags.spec.js b/server/test/controllers/tags.spec.js
diff --git a/server/test/helpers/articleHelper.spec.js b/server/test/helpers/articleHelper.spec.js
diff --git a/server/test/helpers/mockStrategy.spec.js b/server/test/helpers/mockStrategy.spec.js
diff --git a/server/test/helpers/util.spec.js b/server/test/helpers/util.spec.js
diff --git a/server/test/middlewares/middlewares.spec.js b/server/test/middlewares/middlewares.spec.js
diff --git a/server/test/mockData/dummyArticleData.js b/server/test/mockData/dummyArticleData.js
diff --git a/server/test/mockData/token.js b/server/test/mockData/token.js
diff --git a/server/test/mockData/tokens.js b/server/test/mockData/tokens.js