[feature/new-members] isMember field added dynamically on response, structure reverted

Author: rajakvk

controllers/members.js

@@ -13,7 +13,7 @@ const getMembers = async (req, res) => {
     const allMembers = await memberQuery.fetchMembers()
 
     return res.json({
-      message: allMembers.newMembers.length || allMembers.oldMembers.length ? 'Members returned successfully!' : 'No member found',
+      message: allMembers.length ? 'Members returned successfully!' : 'No member found',
       members: allMembers
     })
   } catch (error) {
@@ -33,7 +33,7 @@ const getIdleMembers = async (req, res) => {
   try {
     const allMembers = await memberQuery.fetchMembers()
     const taskParticipants = await tasks.fetchActiveTaskMembers()
-    const idleMembers = allMembers.oldMembers?.filter(({ id }) => !taskParticipants.has(id))
+    const idleMembers = allMembers?.filter(({ id }) => !taskParticipants.has(id))
     const idleMemberUserNames = idleMembers?.map((member) => member.username)
 
     return res.json({

models/members.js

@@ -15,7 +15,7 @@ const fetchMembers = async () => {
   try {
     const snapshot = await userModel.get()
 
-    const allMembers = { oldMembers: [], newMembers: [] }
+    const allMembers = []
 
     if (!snapshot.empty) {
       snapshot.forEach((doc) => {
@@ -28,10 +28,11 @@ const fetchMembers = async () => {
           email: undefined
         }
         if (memberData.roles && memberData.roles.member) {
-          allMembers.oldMembers.push(curatedMemberData)
+          allMembers.isMember = true
         } else {
-          allMembers.newMembers.push(curatedMemberData)
+          allMembers.isMember = false
         }
+        allMembers.push(curatedMemberData)
       })
     }
 

test/integration/members.test.js

@@ -28,8 +28,7 @@ describe('Members', function () {
           expect(res).to.have.status(200)
           expect(res.body).to.be.a('object')
           expect(res.body.message).to.equal('No member found')
-          expect(res.body.members.newMembers).to.eql([])
-          expect(res.body.members.oldMembers).to.eql([])
+          expect(res.body.members).to.eql([])
 
           return done()
         })
@@ -45,9 +44,8 @@ describe('Members', function () {
           expect(res).to.have.status(200)
           expect(res.body).to.be.a('object')
           expect(res.body.message).to.equal('Members returned successfully!')
-          expect(res.body.members.newMembers).to.be.a('array')
-          expect(res.body.members.oldMembers).to.be.a('array')
-          expect(res.body.members.oldMembers[0].roles.member).to.eql(true)
+          expect(res.body.members).to.be.a('array')
+          expect(res.body.members[0].roles.member).to.eql(true)
 
           return done()
         })