Skip to content

fixed the lint issues #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ module.exports = {
IGNORED_ORIGINATORS: process.env.IGNORED_ORIGINATORS ? process.env.IGNORED_ORIGINATORS.split(',') : ['legacy-migration-script'],

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

}
31 changes: 16 additions & 15 deletions src/common/helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -190,39 +190,40 @@ async function deleteResource (challengeId, memberHandle, roleId) {

/**
* Search members of the given group ids
* @param {Array} members
* @param {Array} groupIds
* @param {Array} members
* @param {Array} groupIds
* @return {Array} filtered members
*/
async function filterMemberForGroups(memberIds, groupIds) {
async function filterMemberForGroups (memberIds, groupIds) {
const memberList = []

for (const memberId of memberIds) {
const res = await Promise.allSettled(groupIds.map(groupId => memberGroupsCall(groupId, memberId)));
const memberGroups =_.compact(_.flattenDeep(_.map(res, 'value')))
const res = await Promise.allSettled(groupIds.map(groupId => memberGroupsCall(groupId, memberId)))
const memberGroups = _.compact(_.flattenDeep(_.map(res, 'value')))

if (memberGroups.length !== groupIds.length) memberList.push(memberId)
}

if (memberGroups.length != groupIds.length) memberList.push(memberId)
}
return memberList
}

/**
* Return the memberId if member is part of the groups
* @param {String} groupId
* @param {String} memberId
* Return the memberId if member is part of the groups
* @param {String} groupId
* @param {String} memberId
* @returns {String} memberId in case of member of group
*/
async function memberGroupsCall(groupId, memberId) {
async function memberGroupsCall (groupId, memberId) {
// M2M token is cached by 'tc-core-library-js' lib
const token = await getM2MToken()

const url = `${config.GROUPS_API_URL}/${groupId}/members/${memberId}`
const res = await superagent
return superagent
.get(url)
.set('Authorization', `Bearer ${token}`)
.timeout(config.REQUEST_TIMEOUT)

return memberId
}


module.exports = {
getKafkaOptions,
getProject,
Expand Down
8 changes: 4 additions & 4 deletions src/services/ProcessorService.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ handleChallengeCreate.schema = {
* Process Kafka message of challenge updated
* @param {Object} message the challenge update message
*/
async function handleChallengeUpdate (message) {
async function handleChallengeUpdate (message) {
const challengeId = message.payload.id
const projectId = message.payload.projectId
logger.info(`Process message of challenge id ${challengeId} and project id ${projectId}`)
Expand All @@ -80,10 +80,10 @@ handleChallengeCreate.schema = {
const filteredMemberIds = await helper.filterMemberForGroups(memberIds, groupIds)

// filter the members who are not part of all the groups
challengeResources = challengeResources.filter(member => filteredMemberIds.includes(member.memberId) )
challengeResources = challengeResources.filter(member => filteredMemberIds.includes(member.memberId))

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

logger.info(`Successfully processed message of challenge id ${challengeId} and project id ${projectId}`)
Expand Down