Merge branch 'develop' of https://github.com/andela/hermes-ah-backend …

…into feature/165429968-user-get-bookmark-articles

package.json

@@ -43,7 +43,7 @@
     "mocha": "^6.1.3",
     "nock": "^10.0.6",
     "nodemon": "^1.18.10",
-    "nyc": "^13.3.0",
+    "nyc": "^14.0.0",
     "prettier": "1.16.4"
   },
   "dependencies": {

server/config/config.js

@@ -16,6 +16,7 @@ module.exports = {
     database: process.env.DB_DATABASE_TEST,
     host: process.env.DB_HOST,
     port: process.env.DB_PORT,
+    logging: false,
     dialect,
   },
   production: {

server/controllers/article.controllers.js

@@ -9,7 +9,15 @@ import statistic from '../helpers/statistics-storer';
 import notifications from '../helpers/notifications';
 
 const { findArticle } = serchDatabase;
-const { Article, User, Reported_articles: ReportedArticle, Highlight } = model;
+const {
+  Article,
+  User,
+  Reported_articles: ReportedArticle,
+  Highlight,
+  Like,
+  Bookmark,
+  Rating,
+} = model;
 
 /**
  * @description Get Article
@@ -45,6 +53,15 @@ const getOneArticle = async (req, res) => {
             'bio',
           ],
         },
+        {
+          model: Like,
+        },
+        {
+          model: Bookmark,
+        },
+        {
+          model: Rating,
+        },
       ],
     });
 

server/controllers/auth.controller.js

@@ -34,6 +34,7 @@ const loginController = async (req, res) => {
       is_admin: isAdmin,
       bio,
       image_url: image,
+      is_reviewer: isReviewer,
     } = user;
     const verifyPassword = authHelper.comparePassword(hashedPassword, password);
 
@@ -44,7 +45,7 @@ const loginController = async (req, res) => {
         },
       });
     }
-    const token = authHelper.encode({ id, isAdmin });
+    const token = authHelper.encode({ id, isAdmin, isReviewer });
 
     return res.status(200).json({
       user: {
@@ -83,8 +84,13 @@ const signupController = async (req, res) => {
       return res.status(204).json({ errors: { body: ['User not created'] } });
     }
 
-    const { id, is_admin: isAdmin, first_name: firstName } = user;
-    const token = authHelper.encode({ id, isAdmin });
+    const {
+      id,
+      is_admin: isAdmin,
+      first_name: firstName,
+      is_reviewer: isReviewer,
+    } = user;
+    const token = authHelper.encode({ id, isAdmin, isReviewer });
 
     const verificationToken = authHelper.encode({ email });
     const verificationLink = `${req.protocol}://${req.get(

server/controllers/get-articles.controllers.js

@@ -2,7 +2,7 @@ import models from '../models';
 import validations from '../helpers/validations';
 import serverError from '../helpers/server-error';
 
-const { Article, User } = models;
+const { Article, User, Reported_articles: ReportedArticles } = models;
 
 const getArticles = async (req, res) => {
   if (validations.validateArticlePage(req.params.page)) {
@@ -59,8 +59,37 @@ const getArticles = async (req, res) => {
   });
 };
 
+const getAllReportedArticles = async (req, res) => {
+  try {
+    if (!validations.validReportedArticleQueryString(req.query)) {
+      return res.status(400).json({
+        errors: {
+          body: ['Invalid query string'],
+        },
+      });
+    }
+    const reportedArticles = await ReportedArticles.findAll({
+      where: req.query,
+      include: [
+        {
+          model: Article,
+          as: 'article',
+        },
+      ],
+    });
+
+    return res.status(200).json({
+      reportedArticles,
+    });
+  } catch (error) {
+    return res.status(500).json({
+      errors: serverError(),
+    });
+  }
+};
 const Articles = {
   getArticles,
+  getAllReportedArticles,
 };
 
 export default Articles;

server/controllers/index.js

@@ -12,6 +12,7 @@ import adminController from './admin.controllers';
 import bookmarkController from './bookmark.controller';
 import requestController from './user-request.controllers';
 import searchArticles from './search-article.controllers';
+import getAllReportedArticles from './get-articles.controllers';
 
 export default {
   profileController,
@@ -28,4 +29,5 @@ export default {
   bookmarkController,
   requestController,
   searchArticles,
+  getAllReportedArticles,
 };

server/helpers/validations.js

@@ -98,6 +98,18 @@ const draftPublishMessage = isDraft => {
   return 'Article published successfully';
 };
 
+const validReportedArticleQueryString = query => {
+  let valid = true;
+  const searchableArticleField = ['status'];
+
+  Object.keys(query).forEach(item => {
+    if (!searchableArticleField.includes(item)) {
+      valid = false;
+    }
+  });
+
+  return valid;
+};
 const validations = {
   verifyUUID,
   validateArticlePage,
@@ -106,6 +118,7 @@ const validations = {
   validEditableProfileBody,
   compareFieldWithToken,
   draftPublishMessage,
+  validReportedArticleQueryString,
 };
 
 export default validations;

server/middlewares/verify-token.middlewares.js

@@ -53,9 +53,24 @@ const verifyAdmin = (req, res, next) => {
   return next();
 };
 
+const isVerifiedReviewer = (req, res, next) => {
+  const payload = validations.verifyAuthHeader(req);
+  const { isReviewer, isAdmin } = payload.userObj;
+  if (!isReviewer && !isAdmin) {
+    return res.status(403).json({
+      errors: {
+        body: ['You are not authorized to access this endpoint.'],
+      },
+    });
+  }
+  req.user = payload;
+  return next();
+};
+
 const tokenValidator = {
   verifyToken,
   verifyAdmin,
+  isVerifiedReviewer,
 };
 
 export default tokenValidator;

server/models/article.js

@@ -112,10 +112,24 @@ module.exports = (sequelize, DataTypes) => {
       ],
     }
   );
-  Article.associate = models =>
+  Article.associate = models => {
     Article.belongsTo(models.User, {
       foreignKey: 'user_id',
       as: 'author',
     });
+
+    Article.hasMany(models.Like, {
+      foreignKey: 'article_id',
+    });
+
+    Article.hasMany(models.Bookmark, {
+      foreignKey: 'article_id',
+    });
+
+    Article.hasMany(models.Rating, {
+      foreignKey: 'article_id',
+    });
+  };
+
   return Article;
 };

server/models/reported_article.js

@@ -63,12 +63,15 @@ module.exports = (sequelize, DataTypes) => {
     },
   });
   Reported.associate = models => {
-    Reported.belongsTo(models.Article, {
+    const { Article, User } = models;
+    Reported.belongsTo(Article, {
       foreignKey: 'reported_article_id',
+      as: 'article',
     });
-    Reported.belongsTo(models.User, {
+    Reported.belongsTo(User, {
       foreignKey: 'reporter_id',
       foreignKey: 'reported_user_id',
+      as: 'user',
     });
   };
 

server/routes/get-articles.routes.js

@@ -1,6 +1,9 @@
 import express from 'express';
 
 import Articles from '../controllers/get-articles.controllers';
+import middlewares from '../middlewares';
+
+const { tokenValidator } = middlewares;
 
 const router = express.Router();
 
@@ -28,4 +31,40 @@ const router = express.Router();
 
 router.get('/articles/:page', Articles.getArticles);
 
+/**
+ * @swagger
+ *
+ * /reported-articles:
+ *   get:
+ *     tags:
+ *       - article
+ *     description: a verified reviewer can get all reported articles
+ *     produces:
+ *       - application/json
+ *     parameters:
+ *       - in: query
+ *         name: status
+ *         description: Requires status query string
+ *         required: true
+ *         schema:
+ *           $ref: '#/definitions/article'
+ *     responses:
+ *       200:
+ *         description: Success
+ *       400:
+ *         description: Bad request
+ *       401:
+ *         description: unauthorized
+ *       403:
+ *         description: Forbidden
+ *       500:
+ *         description: ran
+ */
+router.get(
+  '/reported-articles',
+  tokenValidator.verifyToken,
+  tokenValidator.isVerifiedReviewer,
+  Articles.getAllReportedArticles
+);
+
 export default router;

server/seeders/20190331205705-users.js

@@ -109,5 +109,23 @@ module.exports = {
         is_notified: false,
         research_field: 'Physics',
       },
+      {
+        id: 'c89e0df9-4865-49e1-92ad-b83a2d1c4a4e',
+        first_name: 'Jane',
+        last_name: 'Doe',
+        title: 'Dr',
+        phone_number: '(934) 915-1648',
+        email: 'janedoe@yahoo.com',
+        bio: 'Worked as a lecturer...',
+        password:
+          '$2a$08$FaLCM57LR8X4apZYpKeVb.1XC082FTmkhWp3//j3TVr2XHYg.fuDK',
+        is_activated: true,
+        image_url: 'https://picsum.photos/g/200/300',
+        is_admin: false,
+        is_reviewer: true,
+        is_reported: false,
+        is_notified: false,
+        research_field: 'Physics',
+      },
     ]),
 };