Merge pull request #34 from topcoder-platform/hotfix/remove-invite-on-member-create-dev

[HOTIFX] [DEV] Remove not removed invite for added member

Author: maxceem

src/common/helper.js

@@ -188,11 +188,27 @@ async function populateMemberWithUserDetails (member) {
   }
 }
 
+/**
+ * Reusable method to generate a function which would remove invite from the project ES document.
+ *
+ * @param {Object} message invite update or delete message
+ */
+const removeInvitePromise = message => async (doc) => {
+  // now merge the updated changes and re-index the document
+  const invites = _.isArray(doc._source.invites) ? doc._source.invites : []
+  const removedInvites = _.remove(invites, { id: message.id })
+  if (!removedInvites.length) {
+    throw new Error(`Invite with id "${message.id}" is not found and not removed.`)
+  }
+  return _.assign(doc._source, { invites })
+}
+
 module.exports = {
   getESClient,
   updateProjectESPromise,
   updateTimelineESPromise,
   updateMetadadaESPromise,
   getMemberDetailsByUserIds,
-  populateMemberWithUserDetails
+  populateMemberWithUserDetails,
+  removeInvitePromise
 }

src/services/ProcessorServiceProjectMember.js

@@ -62,6 +62,32 @@ async function create (message) {
       // from the database
       members.splice(existingMemberIndex, 1, member)
     }
+
+    // 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}`)
+        }
+      }
+    }
+
     return _.assign(doc._source, { members })
   }
 

src/services/ProcessorServiceProjectMemberInvite.js

@@ -53,24 +53,13 @@ create.schema = {
   message: createSchema()
 }
 
-// handle ES Update or Delete on invites
-const updateInvitesPromise = message => async (doc) => {
-  // now merge the updated changes and re-index the document
-  const invites = _.isArray(doc._source.invites) ? doc._source.invites : []
-  const removedInvites = _.remove(invites, invite => message.id === invite.id)
-  if (!removedInvites.length) {
-    throw new Error(`Invite with id "${message.id}" is not found and not removed.`)
-  }
-  return _.assign(doc._source, { invites })
-}
-
 /**
  * Update message in Elasticsearch.
  * @param {Object} message the challenge updated message
  * @return {Promise} promise result
  */
 async function update (message) {
-  await helper.updateProjectESPromise(message.projectId, updateInvitesPromise(message))
+  await helper.updateProjectESPromise(message.projectId, helper.removeInvitePromise(message))
   logger.debug(`Member invite updated successfully in elasticsearch index, (memberInviteId: ${message.id})`)
 }
 
@@ -84,7 +73,7 @@ update.schema = {
  * @return {Promise} promise result
  */
 async function deleteMessage (message) {
-  await helper.updateProjectESPromise(message.projectId, updateInvitesPromise(message))
+  await helper.updateProjectESPromise(message.projectId, helper.removeInvitePromise(message))
   logger.debug(`Member invite deleted successfully in elasticsearch index, (memberInviteId: ${message.id})`)
 }
 

test/data/project.member/project.action.create.json

@@ -1 +1 @@
-{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T04:45:18.165Z","mime-type":"application/json","payload":{"resource":"project.member","createdAt":"2019-06-21T04:45:18.036Z","updatedAt":"2019-06-21T04:45:18.038Z","isPrimary":false,"id":1,"projectId":1,"role":"manager","userId":40051334,"createdBy":40051334,"updatedBy":40051334,"deletedAt":null,"deletedBy":null}}
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T04:45:18.165Z","mime-type":"application/json","payload":{"resource":"project.member","createdAt":"2019-06-21T04:45:18.036Z","updatedAt":"2019-06-21T04:45:18.038Z","isPrimary":false,"id":1,"projectId":1,"role":"manager","userId":40051331,"createdBy":40051334,"updatedBy":40051334,"deletedAt":null,"deletedBy":null}}

test/e2e/processor.project.index.test.js

@@ -832,6 +832,25 @@ describe('TC Project Member Topic Tests', () => {
       _.keys(_.omit(projectMemberCreatedMessage.payload, ['resource'])))
   })
 
+  it('create project member message and remove not removed invite', async () => {
+    // let's say we still have invite
+    await ProcessorService.create(projectMemberInviteCreatedMessage)
+    let data = await testHelper.getProjectESData(projectId)
+    // make sure that invite is there
+    testHelper.expectObj(_.find(data.invites, { id: projectMemberInviteId }), projectMemberInviteCreatedMessage.payload,
+      _.keys(_.omit(projectMemberInviteCreatedMessage.payload, ['resource'])))
+
+    // and we are adding a member (but invite is still there as we created above)
+    await ProcessorService.create(projectMemberCreatedMessage)
+    data = await testHelper.getProjectESData(projectId)
+
+    // check that member has been added
+    testHelper.expectObj(_.find(data.members, { id: projectMemberId }), projectMemberCreatedMessage.payload,
+      _.keys(_.omit(projectMemberCreatedMessage.payload, ['resource'])))
+    // and at the same time the invite for the member has been removed
+    expect(_.find(data.invites, { id: projectMemberInviteId })).to.be.an('undefined')
+  })
+
   it('update project member message', async () => {
     await ProcessorService.update(projectMemberUpdatedMessage)
     const data = await testHelper.getProjectESData(projectId)