Merge 18e138d into ccfde98

src/api/controllers/adminPermissionsController.js → src/api/controllers/admin/adminPermissionsController.js

@@ -1,6 +1,6 @@
-import models from '../models';
-import status from '../../helpers/constants/status.codes';
-import paginateUser from '../../helpers/generate.pagination.details';
+import models from '../../models';
+import status from '../../../helpers/constants/status.codes';
+import paginateUser from '../../../helpers/generate.pagination.details';
 
 const generatePagination = paginateUser;
 

src/api/controllers/admin/commentReportController.js

@@ -0,0 +1,73 @@
+import models from '../../models';
+import status from '../../../helpers/constants/status.codes';
+
+const { Comment } = models;
+
+/**
+ * block and unblock reported comments
+ *
+ * @export
+ * @class commentReportController
+ */
+export default class commentReportController {
+  /**
+   * block Comment
+   *
+   * @static
+   * @param {object} req - request body
+   * @param {object} res - response body
+   * @returns { object } - response
+   * @memberof commentReportController
+   */
+  static async blockComment(req, res) {
+    const { id } = req.params;
+    const { body } = req;
+    const isBlocked = true;
+
+    await Comment.update({
+      isBlocked
+    },
+    {
+      where: {
+        id
+      }
+    });
+    return res.status(status.OK).json({
+      status: status.OK,
+      message: `${body}:: blocked successfully`,
+      data: {
+        body
+      }
+    });
+  }
+
+  /**
+   * unblock Comment
+   *
+   * @static
+   * @param {object} req - request body
+   * @param {object} res - response body
+   * @returns { object } - response
+   * @memberof commentReportController
+   */
+  static async unBlockComment(req, res) {
+    const { id } = req.params;
+    const isBlocked = false;
+    const { body } = req;
+    await Comment.update({
+      isBlocked
+    },
+    {
+      where: {
+        id
+      }
+    });
+    return res.status(status.OK).json({
+      status: status.OK,
+      message: `${body}:: unblocked successfully`,
+      data: {
+        body
+      }
+    });
+  }
+}

src/api/migrations/20190718162333-comment-isBlocked.js

@@ -0,0 +1,8 @@
+export default {
+  up: (queryInterface, Sequelize) => queryInterface.addColumn('Comments', 'isBlocked', {
+    type: Sequelize.BOOLEAN,
+    defaultValue: false
+  }),
+
+  down: queryInterface => queryInterface.removeColumn('Comments', 'isBlocked')
+};

src/api/models/comment.js

@@ -34,6 +34,10 @@ export default (sequelize, DataTypes) => {
       parentCommentId: {
         type: DataTypes.INTEGER,
         allowNull: true
+      },
+      isBlocked: {
+        type: DataTypes.BOOLEAN,
+        defaultValue: false
       }
     },
     {

src/api/routes/adminRouter.js

@@ -1,6 +1,7 @@
 import { Router } from 'express';
 import authController from '../controllers/authController';
-import adminPermissionsController from '../controllers/adminPermissionsController';
+import adminPermissionsController from '../controllers/admin/adminPermissionsController';
+import reportedCommentsAdminController from '../controllers/admin/commentReportController';
 import ValidateUser from '../../middlewares/ValidateUser';
 import validateToken from '../../middlewares/checkValidToken';
 import checkUser from '../../middlewares/checkUser';
@@ -10,6 +11,8 @@ import articleController from '../controllers/articleController';
 import checkIfArticleExist from '../../middlewares/getOneArticle';
 import CheckIfModerator from '../../middlewares/CheckIfModerator';
 import CheckIfBlocked from '../../middlewares/isArticleBlocked';
+import CheckIfCommentBlocked from '../../middlewares/isCommentBlocked';
+import checkIfCommentExist from '../../middlewares/checkIfCommentExist';
 
 const adminRouter = new Router();
 
@@ -92,4 +95,18 @@ adminRouter.patch('/article/:slug/unblock',
   CheckIfBlocked.checkUnBlocked,
   adminPermissionsController.unBlockArticle);
 
+adminRouter.patch('/comments/:id/block',
+  validateToken,
+  CheckIfModerator.CheckAdmins,
+  checkIfCommentExist.checkIfExist,
+  CheckIfCommentBlocked.checkBlocked,
+  reportedCommentsAdminController.blockComment);
+
+adminRouter.patch('/comments/:id/unblock',
+  validateToken,
+  CheckIfModerator.CheckAdmins,
+  checkIfCommentExist.checkIfExist,
+  CheckIfCommentBlocked.checkUnBlocked,
+  reportedCommentsAdminController.unBlockComment);
+
 export default adminRouter;

src/api/seeders/20190718163410-reported-comment.js

@@ -0,0 +1,22 @@
+export default {
+  up: queryInterface => queryInterface.bulkInsert('ReportComments',
+    [
+      {
+        userId: 12,
+        reportedCommentId: 5,
+        reasonId: 2,
+        createdAt: new Date(),
+        updatedAt: new Date()
+      },
+      {
+        userId: 13,
+        reportedCommentId: 6,
+        reasonId: 1,
+        createdAt: new Date(),
+        updatedAt: new Date()
+      }
+    ],
+    {}),
+
+  down: queryInterface => queryInterface.bulkDelete('ReportComments', null, {})
+};

src/docs/swagger.json

@@ -908,6 +908,79 @@
           }
         }
       },
+      "/admin/comment/block/:id": {
+        "patch": {
+          "tags": ["Admin"],
+          "summary": "allow Admin and moderator to block a comment a moderetor",
+          "description": "",
+          "produces": ["application/json"],
+          "parameters": [
+            {
+              "in": "path",
+              "name": "token",
+              "description": "must be admin or moderator",
+              "required": true
+            },
+            {
+              "in": "path",
+              "name": "email",
+              "description": "block comment",
+              "required": true
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "comment blocked successfully"
+            },
+            "401": {
+              "description": "Please you must be the Admin in order to modify it, Thanks"
+            },
+            "403": {
+              "description": "comment is already a blocked"
+            },
+            "default": {
+              "description": "Something went wrong"
+            }
+          }
+        }
+      },
+
+      "/admin/comment/unblock/:id": {
+        "patch": {
+          "tags": ["Admin"],
+          "summary": "allow Admin and moderator to unblock a comment a moderetor",
+          "description": "",
+          "produces": ["application/json"],
+          "parameters": [
+            {
+              "in": "path",
+              "name": "token",
+              "description": "must be admin or moderator",
+              "required": true
+            },
+            {
+              "in": "path",
+              "name": "email",
+              "description": "unblock comment",
+              "required": true
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "comment unblocked successfully"
+            },
+            "401": {
+              "description": "Please you must be the Admin in order to modify it, Thanks"
+            },
+            "403": {
+              "description": "comment is not blocked"
+            },
+            "default": {
+              "description": "Something went wrong"
+            }
+          }
+        }
+      },
 
       "externalDocs": {
         "description": "Find out more about Swagger",

src/middlewares/checkIfCommentExist.js

@@ -0,0 +1,39 @@
+import models from '../api/models';
+import statusCode from '../helpers/constants/status.codes';
+import sendError from '../helpers/error.sender';
+
+const { Comment } = models;
+/**
+ * check Comment middleware
+ *
+ * @export
+ * @class checkIfCommentExist
+ */
+class checkIfCommentExist {
+  /**
+   * this is a middleware which checks if comment exist.
+   *
+   * @author R
+   * @static
+   * @param {object} req the request
+   * @param {object} res the response to be sent
+   * @param { object } next the next route controller to be called
+   * @memberof checkIfCommentExist
+   * @returns {Object} res
+   */
+  static async checkIfExist(req, res, next) {
+    const { id } = req.params;
+    const result = await Comment.findOne({
+      where: {
+        id
+      }
+    });
+    if (result) req.article = result.dataValues;
+
+    return result
+      ? next()
+      : sendError(statusCode.NOT_FOUND, res, 'id', `Comment with id ${id} is not found, Thanks`);
+  }
+}
+
+export default checkIfCommentExist;

src/middlewares/isCommentBlocked.js

@@ -0,0 +1,68 @@
+import models from '../api/models';
+import status from '../helpers/constants/status.codes';
+import sendError from '../helpers/error.sender';
+
+const { Comment } = models;
+/**
+ * check if Comment is blocked
+ *
+ * @export
+ * @class checkIfBlocked
+ */
+class checkIfBlocked {
+  /**
+   * this is a middleware which checks if a Comment is blocked.
+   *
+   * @static
+   * @param {object} req the request
+   * @param {object} res the response
+   * @param { object } next the next route controller to be called
+   * @memberof checkComment
+   * @returns {Object} res
+   */
+  static async checkBlocked(req, res, next) {
+    const { id } = req.params;
+
+    const result = await Comment.findOne({
+      where: {
+        id,
+        isBlocked: false
+      }
+    });
+
+    if (result) {
+      req.body = result.dataValues.body;
+      return next();
+    }
+    sendError(status.BAD_REQUEST, res, 'isBlocked', `${id} is already blocked`);
+  }
+
+  /**
+   * this is a middleware which checks if a Comment is not blocked.
+   *
+   * @static
+   * @param {object} req the request
+   * @param {object} res the response
+   * @param { object } next the next route controller to be called
+   * @memberof checkComment
+   * @returns {Object} res
+   */
+  static async checkUnBlocked(req, res, next) {
+    const { id } = req.params;
+
+    const result = await Comment.findOne({
+      where: {
+        id,
+        isBlocked: true
+      }
+    });
+
+    if (result) {
+      req.body = result.dataValues.body;
+      return next();
+    }
+    sendError(status.BAD_REQUEST, res, 'isBlocked', `${id} is not blocked`);
+  }
+}
+
+export default checkIfBlocked;