Merge pull request #383 from Real-Dev-Squad/develop

Develop to Main: Members role migration

Author: ankushdharkar

models/members.js

@@ -13,21 +13,23 @@ const userModel = firestore.collection('users')
 
 const fetchMembers = async () => {
   try {
-    const snapshot = await userModel.where('isMember', '==', true).get()
+    const snapshot = await userModel.get()
 
     const allMembers = []
 
     if (!snapshot.empty) {
       snapshot.forEach((doc) => {
-        allMembers.push({
+        const memberData = doc.data()
+        const curatedMemberData = {
           id: doc.id,
-          ...doc.data(),
+          ...memberData,
           tokens: undefined,
           phone: undefined,
           email: undefined
-        })
-      }
-      )
+        }
+        curatedMemberData.isMember = !!(memberData.roles && memberData.roles.member)
+        allMembers.push(curatedMemberData)
+      })
     }
 
     return allMembers

test/fixtures/user/user.js

@@ -21,6 +21,9 @@ module.exports = () => {
       isMember: true,
       phone: '1234567890',
       email: '[email protected]',
+      roles: {
+        member: true
+      },
       tokens: {
         githubAccessToken: 'githubAccessToken'
       },

test/integration/members.test.js

@@ -45,7 +45,7 @@ describe('Members', function () {
           expect(res.body).to.be.a('object')
           expect(res.body.message).to.equal('Members returned successfully!')
           expect(res.body.members).to.be.a('array')
-          expect(res.body.members[0].isMember).to.eql(true)
+          expect(res.body.members[0].roles.member).to.eql(true)
 
           return done()
         })