Skip to content

Commit e6ce1b8

Browse files
committed
[feature/new-members] updated code as per new roles property change
1 parent 73676e4 commit e6ce1b8

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

controllers/members.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const getIdleMembers = async (req, res) => {
3333
try {
3434
const allMembers = await memberQuery.fetchMembers()
3535
const taskParticipants = await tasks.fetchActiveTaskMembers()
36-
const idleMembers = allMembers?.filter(({ id }) => !taskParticipants.has(id))
36+
const idleMembers = allMembers.oldMembers?.filter(({ id }) => !taskParticipants.has(id))
3737
const idleMemberUserNames = idleMembers?.map((member) => member.username)
3838

3939
return res.json({

models/members.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ const fetchMembers = async () => {
2828
email: undefined
2929
}
3030
if (memberData.roles && memberData.roles.member) {
31-
allMembers.newMembers.push(curatedMemberData)
32-
} else {
3331
allMembers.oldMembers.push(curatedMemberData)
32+
} else {
33+
allMembers.newMembers.push(curatedMemberData)
3434
}
3535
})
3636
}

test/fixtures/user/user.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module.exports = () => {
2222
phone: '1234567890',
2323
2424
roles: {
25-
admin: true
25+
member: true
2626
},
2727
tokens: {
2828
githubAccessToken: 'githubAccessToken'

test/integration/members.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ describe('Members', function () {
4747
expect(res.body.message).to.equal('Members returned successfully!')
4848
expect(res.body.members.newMembers).to.be.a('array')
4949
expect(res.body.members.oldMembers).to.be.a('array')
50-
expect(res.body.members.oldMembers[0].roles.admin).to.eql(true)
50+
expect(res.body.members.oldMembers[0].roles.member).to.eql(true)
5151

5252
return done()
5353
})

0 commit comments

Comments
 (0)