Merge pull request #424 from Real-Dev-Squad/move-to-members

Move to members

Author: sumitd94

constants/roles.js

@@ -0,0 +1,6 @@
+const ROLES = {
+  SUPER_USER: 'superUser',
+  APP_OWNER: 'appOwner'
+}
+
+module.exports = ROLES

controllers/members.js

@@ -1,6 +1,9 @@
 const { ROLES } = require('../constants/users')
-const { fetchUsers, migrateUsers, deleteIsMemberProperty, fetchUsersWithRole } = require('../models/members')
+const { fetchUsers, migrateUsers, deleteIsMemberProperty, fetchUsersWithRole, moveToMembers: updateToMemberRole } = require('../models/members')
 const tasks = require('../models/tasks')
+const { fetchUser } = require('../models/users')
+
+const ERROR_MESSAGE = 'Something went wrong. Please try again or contact admin'
 
 /**
  * Fetches the data about our members
@@ -47,12 +50,38 @@ const getIdleMembers = async (req, res) => {
   }
 }
 
+/**
+ * Makes a new member a member
+ *
+ * @param req {Object} - Express request object
+ * @param res {Object} - Express response object
+ */
+
+const moveToMembers = async (req, res) => {
+  try {
+    const { username } = req.params
+    const result = await fetchUser({ username })
+    if (result.userExists) {
+      const successObject = await updateToMemberRole(result.user.id)
+      if (successObject.isAlreadyMember) {
+        return res.boom.badRequest('User is already a member')
+      }
+      return res.status(204).send()
+    }
+    return res.boom.notFound("User doesn't exist")
+  } catch (err) {
+    logger.error(`Error while retriving contributions ${err}`)
+    return res.boom.badImplementation(ERROR_MESSAGE)
+  }
+}
+
 /**
  * Returns the lists of usernames migrated
  *
  * @param req {Object} - Express request object
  * @param res {Object} - Express response object
  */
+
 const migrateUserRoles = async (req, res) => {
   try {
     const migratedUserData = await migrateUsers()
@@ -88,6 +117,7 @@ const deleteIsMember = async (req, res) => {
 module.exports = {
   getMembers,
   getIdleMembers,
+  moveToMembers,
   migrateUserRoles,
   deleteIsMember
 }

models/members.js

@@ -39,6 +39,28 @@ const fetchUsers = async () => {
   }
 }
 
+/**
+ * changes the role of a new user to member
+ * @param userId { String }: User id of user to be modified
+ * @return { Object }: whether moveToMember was successful or not and whether user is already a member or not
+ */
+
+const moveToMembers = async (userId) => {
+  try {
+    const userDoc = await userModel.doc(userId).get()
+    const user = userDoc.data()
+    if (user?.roles?.member) return { isAlreadyMember: true, movedToMember: false }
+    const roles = user.roles ? { ...user.roles, member: true } : { member: true }
+    await userModel.doc(userId).update({
+      roles
+    })
+    return { isAlreadyMember: false, movedToMember: true }
+  } catch (err) {
+    logger.error('Error updating user', err)
+    throw err
+  }
+}
+
 /**
  * Migrate user roles
  * @return {Promise<usersMigrated|Object>}
@@ -127,6 +149,7 @@ const fetchUsersWithRole = async (role) => {
 }
 
 module.exports = {
+  moveToMembers,
   fetchUsers,
   migrateUsers,
   deleteIsMemberProperty,

public/apiSchema.json

@@ -1,10 +1,11 @@
 const express = require('express')
 const router = express.Router()
-const { getMembers, getIdleMembers, migrateUserRoles, deleteIsMember } = require('../controllers/members')
+const { getMembers, getIdleMembers, migrateUserRoles, deleteIsMember, moveToMembers } = require('../controllers/members')
 const { authorizeUser } = require('../middlewares/authorization')
 const authenticate = require('../middlewares/authenticate')
 const { addRecruiter } = require('../controllers/recruiters')
 const { validateRecruiter } = require('../middlewares/validators/recruiter')
+const { SUPER_USER } = require('../constants/roles')
 
 /**
  * @swagger
@@ -86,6 +87,51 @@ router.get('/idle', getIdleMembers)
 
 router.post('/intro/:username', validateRecruiter, addRecruiter)
 
+/**
+ * @swagger
+ * /moveToMembers/:username:
+ *   patch:
+ *     summary: Changes the role of a new member(the username provided in params) to member
+ *     tags:
+ *       - Members
+ *     security:
+ *       - bearerAuth: []
+ *     responses:
+ *       204:
+ *         description: no content
+ *       400:
+ *         description: badRequest
+ *         content:
+ *           application/json:
+ *             schema:
+ *                type: object
+ *                properties:
+ *                  message:
+ *                    type: string
+ *                    example: User Already is a member
+ *
+ *       401:
+ *         description: unAuthorized
+ *         content:
+ *           application/json:
+ *             schema:
+ *               $ref: '#/components/schemas/errors/unAuthorized'
+ *       404:
+ *         description: notFound
+ *         content:
+ *           application/json:
+ *             schema:
+ *               $ref: '#/components/schemas/errors/notFound'
+ *
+ *       500:
+ *         description: serverUnavailable
+ *         content:
+ *           application/json:
+ *             schema:
+ *               $ref: '#/components/schemas/errors/serverUnavailable'
+ */
+
+router.patch('/moveToMembers/:username', authenticate, authorizeUser(SUPER_USER), moveToMembers)
 /**
  * @swagger
  * /members/member-to-role-migration:

routes/members.js

@@ -3,17 +3,34 @@ const { expect } = chai
 const chaiHttp = require('chai-http')
 
 const app = require('../../server')
+const authService = require('../../services/authService')
 const addUser = require('../utils/addUser')
 const cleanDb = require('../utils/cleanDb')
 
+// Import fixtures
+const userData = require('../fixtures/user/user')()
+
+const config = require('config')
+const cookieName = config.get('userToken.cookieName')
+
 chai.use(chaiHttp)
 
+const superUser = userData[4]
+const userAlreadyMember = userData[0]
+const userToBeMadeMember = userData[1]
+const nonSuperUser = userData[2]
+
 describe('Members', function () {
+  let jwt
+
   afterEach(async function () {
-    await cleanDb()
     await addUser()
   })
 
+  after(async function () {
+    await cleanDb()
+  })
+
   describe('GET /members', function () {
     before(async function () {
       await cleanDb()
@@ -89,4 +106,83 @@ describe('Members', function () {
         })
     })
   })
+
+  describe('PATCH /members/moveToMembers/:username', function () {
+    before(async function () {
+      await cleanDb()
+      const userId = await addUser(superUser)
+      jwt = authService.generateAuthToken({ userId })
+    })
+
+    it("Should return 404 if user doesn't exist", function (done) {
+      chai
+        .request(app)
+        .patch(`/members/moveToMembers/${userToBeMadeMember.username}`)
+        .set('cookie', `${cookieName}=${jwt}`)
+        .end((err, res) => {
+          if (err) { return done(err) }
+
+          expect(res).to.have.status(404)
+          expect(res.body).to.be.a('object')
+          expect(res.body.message).to.equal("User doesn't exist")
+
+          return done()
+        })
+    })
+
+    it('Should make the user a member', function (done) {
+      addUser(userToBeMadeMember).then(() => {
+        chai
+          .request(app)
+          .patch(`/members/moveToMembers/${userToBeMadeMember.username}`)
+          .set('cookie', `${cookieName}=${jwt}`)
+          .end((err, res) => {
+            if (err) { return done(err) }
+
+            expect(res).to.have.status(204)
+            /* eslint-disable no-unused-expressions */
+            expect(res.body).to.be.a('object').to.be.empty
+
+            return done()
+          })
+      })
+    })
+
+    it('Should return 400 if user is already a member', function (done) {
+      addUser(userAlreadyMember).then(() => {
+        chai
+          .request(app)
+          .patch(`/members/moveToMembers/${userAlreadyMember.username}`)
+          .set('cookie', `${cookieName}=${jwt}`)
+          .end((err, res) => {
+            if (err) { return done(err) }
+
+            expect(res).to.have.status(400)
+            expect(res.body).to.be.a('object')
+            expect(res.body.message).to.equal('User is already a member')
+
+            return done()
+          })
+      })
+    })
+
+    it('Should return 401 if user is not a super_user', function (done) {
+      addUser(nonSuperUser).then(nonSuperUserId => {
+        const nonSuperUserJwt = authService.generateAuthToken({ nonSuperUserId })
+        chai
+          .request(app)
+          .patch(`/members/moveToMembers/${nonSuperUser.username}`)
+          .set('cookie', `${cookieName}=${nonSuperUserJwt}`)
+          .end((err, res) => {
+            if (err) { return done(err) }
+
+            expect(res).to.have.status(401)
+            expect(res.body).to.be.a('object')
+            expect(res.body.message).to.equal('You are not authorized for this action.')
+
+            return done()
+          })
+      })
+    })
+  })
 })