Skip to content

Commit 6f79781

Browse files
Merge pull request #36 from topcoder-platform/plat-1143-OR-validation-issue
fixed the lint issues
2 parents e0d2a5d + 9145177 commit 6f79781

File tree

3 files changed

+21
-20
lines changed

3 files changed

+21
-20
lines changed

config/default.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ module.exports = {
4141
IGNORED_ORIGINATORS: process.env.IGNORED_ORIGINATORS ? process.env.IGNORED_ORIGINATORS.split(',') : ['legacy-migration-script'],
4242

4343
GROUPS_TO_IGNORE: process.env.GROUPS_TO_IGNORE ? process.env.GROUPS_TO_IGNORE.split(',') : ['72a0b8a0-aa45-44f7-86c2-bf9de6321e5b'],
44-
GROUPS_API_URL: process.env.GROUPS_API_URL || 'http://localhost:4000/v5/groups',
44+
GROUPS_API_URL: process.env.GROUPS_API_URL || 'http://localhost:4000/v5/groups'
4545

4646
}

src/common/helper.js

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -190,39 +190,40 @@ async function deleteResource (challengeId, memberHandle, roleId) {
190190

191191
/**
192192
* Search members of the given group ids
193-
* @param {Array} members
194-
* @param {Array} groupIds
193+
* @param {Array} members
194+
* @param {Array} groupIds
195195
* @return {Array} filtered members
196196
*/
197-
async function filterMemberForGroups(memberIds, groupIds) {
197+
async function filterMemberForGroups (memberIds, groupIds) {
198+
const memberList = []
199+
198200
for (const memberId of memberIds) {
199-
const res = await Promise.allSettled(groupIds.map(groupId => memberGroupsCall(groupId, memberId)));
200-
const memberGroups =_.compact(_.flattenDeep(_.map(res, 'value')))
201+
const res = await Promise.allSettled(groupIds.map(groupId => memberGroupsCall(groupId, memberId)))
202+
const memberGroups = _.compact(_.flattenDeep(_.map(res, 'value')))
203+
204+
if (memberGroups.length !== groupIds.length) memberList.push(memberId)
205+
}
201206

202-
if (memberGroups.length != groupIds.length) memberList.push(memberId)
203-
}
207+
return memberList
204208
}
205209

206210
/**
207-
* Return the memberId if member is part of the groups
208-
* @param {String} groupId
209-
* @param {String} memberId
211+
* Return the memberId if member is part of the groups
212+
* @param {String} groupId
213+
* @param {String} memberId
210214
* @returns {String} memberId in case of member of group
211215
*/
212-
async function memberGroupsCall(groupId, memberId) {
216+
async function memberGroupsCall (groupId, memberId) {
213217
// M2M token is cached by 'tc-core-library-js' lib
214218
const token = await getM2MToken()
215219

216220
const url = `${config.GROUPS_API_URL}/${groupId}/members/${memberId}`
217-
const res = await superagent
221+
return superagent
218222
.get(url)
219223
.set('Authorization', `Bearer ${token}`)
220224
.timeout(config.REQUEST_TIMEOUT)
221-
222-
return memberId
223225
}
224226

225-
226227
module.exports = {
227228
getKafkaOptions,
228229
getProject,

src/services/ProcessorService.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ handleChallengeCreate.schema = {
6363
* Process Kafka message of challenge updated
6464
* @param {Object} message the challenge update message
6565
*/
66-
async function handleChallengeUpdate (message) {
66+
async function handleChallengeUpdate (message) {
6767
const challengeId = message.payload.id
6868
const projectId = message.payload.projectId
6969
logger.info(`Process message of challenge id ${challengeId} and project id ${projectId}`)
@@ -80,10 +80,10 @@ handleChallengeCreate.schema = {
8080
const filteredMemberIds = await helper.filterMemberForGroups(memberIds, groupIds)
8181

8282
// filter the members who are not part of all the groups
83-
challengeResources = challengeResources.filter(member => filteredMemberIds.includes(member.memberId) )
84-
83+
challengeResources = challengeResources.filter(member => filteredMemberIds.includes(member.memberId))
84+
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.allSettled(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}`)

0 commit comments

Comments
 (0)