Added optional chaining and updated test

Author: prakashchoudhary07

models/members.js

@@ -49,7 +49,7 @@ const moveToMembers = async (userId) => {
   try {
     const userDoc = await userModel.doc(userId).get()
     const user = userDoc.data()
-    if (user.roles && user.roles.member) return { isAlreadyMember: true, movedToMember: false }
+    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

test/integration/members.test.js

@@ -16,6 +16,7 @@ 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]
 
@@ -106,7 +107,7 @@ describe('Members', function () {
     })
   })
 
-  describe('PATCH /members/moveToMembers', function () {
+  describe('PATCH /members/moveToMembers/:username', function () {
     before(async function () {
       await cleanDb()
       const userId = await addUser(superUser)
@@ -148,19 +149,21 @@ describe('Members', function () {
     })
 
     it('Should return 400 if user is already a member', function (done) {
-      chai
-        .request(app)
-        .patch(`/members/moveToMembers/${userToBeMadeMember.username}`)
-        .set('cookie', `${cookieName}=${jwt}`)
-        .end((err, res) => {
-          if (err) { return done(err) }
+      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')
+            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()
-        })
+            return done()
+          })
+      })
     })
 
     it('Should return 401 if user is not a super_user', function (done) {