Skip to content

Commit 6def634

Browse files
Merge pull request #37 from topcoder-platform/plat-1143-OR-validation-issue
fixed the issue of allSetled
2 parents 6f79781 + fb2d6af commit 6def634

File tree

4 files changed

+78
-40
lines changed

4 files changed

+78
-40
lines changed

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"winston": "^3.1.0"
3434
},
3535
"engines": {
36-
"node": "10.x"
36+
"node": "14.x"
3737
},
3838
"standard": {
3939
"ignore": [

src/common/helper.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ async function filterMemberForGroups (memberIds, groupIds) {
198198
const memberList = []
199199

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

204204
if (memberGroups.length !== groupIds.length) memberList.push(memberId)
@@ -216,12 +216,16 @@ async function filterMemberForGroups (memberIds, groupIds) {
216216
async function memberGroupsCall (groupId, memberId) {
217217
// M2M token is cached by 'tc-core-library-js' lib
218218
const token = await getM2MToken()
219-
220219
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)
220+
221+
try {
222+
return superagent
223+
.get(url)
224+
.set('Authorization', `Bearer ${token}`)
225+
.timeout(config.REQUEST_TIMEOUT)
226+
} catch (error) {
227+
return []
228+
}
225229
}
226230

227231
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)