Skip to content

Commit b6158fc

Browse files
author
bountyCoder
committed
fixed the issue of allSetled
1 parent 9145177 commit b6158fc

File tree

4 files changed

+104
-34
lines changed

4 files changed

+104
-34
lines changed

package-lock.json

Lines changed: 84 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"standard": "^12.0.1"
2222
},
2323
"dependencies": {
24+
"axios": "^0.27.2",
2425
"bluebird": "^3.5.1",
2526
"config": "^3.0.1",
2627
"get-parameter-names": "^0.3.0",
@@ -33,7 +34,7 @@
3334
"winston": "^3.1.0"
3435
},
3536
"engines": {
36-
"node": "10.x"
37+
"node": "14.x"
3738
},
3839
"standard": {
3940
"ignore": [

src/common/helper.js

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*/
44

55
const _ = require('lodash')
6+
const axios = require('axios')
67
const config = require('config')
78
const m2mAuth = require('tc-core-library-js').auth.m2m
89
const m2m = m2mAuth(_.pick(config, ['AUTH0_URL', 'AUTH0_AUDIENCE', 'TOKEN_CACHE_TIME', 'AUTH0_PROXY_SERVER_URL']))
@@ -198,7 +199,7 @@ async function filterMemberForGroups (memberIds, groupIds) {
198199
const memberList = []
199200

200201
for (const memberId of memberIds) {
201-
const res = await Promise.allSettled(groupIds.map(groupId => memberGroupsCall(groupId, memberId)))
202+
const res = await Promise.all(groupIds.map(groupId => memberGroupsCall(groupId, memberId)))
202203
const memberGroups = _.compact(_.flattenDeep(_.map(res, 'value')))
203204

204205
if (memberGroups.length !== groupIds.length) memberList.push(memberId)
@@ -216,12 +217,20 @@ async function filterMemberForGroups (memberIds, groupIds) {
216217
async function memberGroupsCall (groupId, memberId) {
217218
// M2M token is cached by 'tc-core-library-js' lib
218219
const token = await getM2MToken()
219-
220220
const url = `${config.GROUPS_API_URL}/${groupId}/members/${memberId}`
221-
return superagent
222-
.get(url)
223-
.set('Authorization', `Bearer ${token}`)
224-
.timeout(config.REQUEST_TIMEOUT)
221+
222+
try {
223+
const res = await axios
224+
.get(url, {
225+
headers: {
226+
'Authorization': `Bearer ${token}`
227+
}
228+
})
229+
230+
return res
231+
} catch (error) {
232+
return []
233+
}
225234
}
226235

227236
module.exports = {

src/services/ProcessorService.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ async function handleChallengeUpdate (message) {
8383
challengeResources = challengeResources.filter(member => filteredMemberIds.includes(member.memberId))
8484

8585
// remove members from resources who are not part of all the groups
86-
await Promise.allSettled(challengeResources.map(member => helper.deleteResource(challengeId, member.memberHandle, config.RESOURCE_ROLE_ID)))
86+
await Promise.all(challengeResources.map(member => helper.deleteResource(challengeId, member.memberHandle, config.RESOURCE_ROLE_ID)))
8787
}
8888

8989
logger.info(`Successfully processed message of challenge id ${challengeId} and project id ${projectId}`)
@@ -177,7 +177,8 @@ handleMemberRemoved.schema = {
177177
module.exports = {
178178
handleChallengeCreate,
179179
handleMemberAdded,
180-
handleMemberRemoved
180+
handleMemberRemoved,
181+
handleChallengeUpdate
181182
}
182183

183184
logger.buildService(module.exports)

0 commit comments

Comments
 (0)