Skip to content

[HOTFIX] [DEV] Remove not removed invite for added member - part 2 #35

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.

Sign up for GitHub

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
Mar 17, 2020
Merged

[HOTFIX] [DEV] Remove not removed invite for added member - part 2 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 22 additions & 19 deletions src/services/ProcessorServiceProjectMember.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,27 +65,30 @@ async function create (message) {

// sometimes we have issue that when member accepts invitation the invitation is somehow
// is not removed from the ES, so here we are making sure that invite is removed when we are adding member
const addedMember = members[existingMemberIndex]
const addedMemberInvites = _.filter(doc._source.invites, (invite) => (
invite.email === addedMember.email || invite.userId === addedMember.userId
))

if (addedMemberInvites.length > 0) {
logger.warn(`There are ${addedMemberInvites.length} invite(s) are not yet removed` +
` for member.id: ${addedMember.id} member.userId: ${addedMember.userId}.`)

for (let i = 0; i < addedMemberInvites.length; i++) {
const invite = addedMemberInvites[i]
logger.debug(`Removing invite.id: ${invite.id} for member.id: ${addedMember.id} member.userId: ${addedMember.userId}.`)
try {
const message = { id: invite.id }
const updateDocHandler = helper.removeInvitePromise(message)
await updateDocHandler(doc)
logger.debug(`Successfully removed invite.id: ${invite.id}.`)
} catch (err) {
logger.error(`Failed removing invite.id: ${invite.id}. ${err}`)
try { // make sure that this logic never cause an error in member adding process
const invites = _.filter(doc._source.invites, (invite) => (
invite.email === member.email || invite.userId === member.userId
))

if (invites.length > 0) {
logger.warn(`There are ${invites.length} invite(s) are not yet removed` +
` for member.id: ${member.id} member.userId: ${member.userId}.`)

for (let i = 0; i < invites.length; i++) {
const invite = invites[i]
logger.debug(`Removing invite.id: ${invite.id} for member.id: ${member.id} member.userId: ${member.userId}.`)
try {
const message = { id: invite.id }
const updateDocHandler = helper.removeInvitePromise(message)
await updateDocHandler(doc)
logger.debug(`Successfully removed invite.id: ${invite.id}.`)
} catch (err) {
logger.error(`Failed removing invite.id: ${invite.id}. ${err}`)
}
}
}
} catch (err) {
logger.error(`Error during removing existent invites for added member: ${err}`)
}

return _.assign(doc._source, { members })
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/processor.project.index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@ describe('TC Project Member Topic Tests', () => {
_.keys(_.omit(projectMemberCreatedMessage.payload, ['resource'])))
})

it('create project member message and remove not removed invite', async () => {
it('create project member message - already exists - remove not removed invite', async () => {
// let's say we still have invite
await ProcessorService.create(projectMemberInviteCreatedMessage)
let data = await testHelper.getProjectESData(projectId)
Expand Down