Merge branch 'develop' into feature/bulk-milestone-updates

# Conflicts:
#	package-lock.json

Author: maxceem

migrations/elasticsearch_sync.js

@@ -227,8 +227,7 @@ function getRequestBody (indexName) {
             type: 'string'
           },
           handle: {
-            type: 'string',
-            index: 'not_analyzed'
+            type: 'string'
           },
           id: {
             type: 'long'

src/common/helper.js

@@ -165,10 +165,50 @@ async function getMemberDetailsByUserIds (userIds) {
   }
 }
 
+/**
+ * Populate member with user details
+ *
+ * @param {Object} member the member object
+ * @returns {Object} the member object with details
+ */
+async function populateMemberWithUserDetails (member) {
+  try {
+    const membersDetails = await getMemberDetailsByUserIds([member.userId])
+    const memberDetails = membersDetails[0]
+    if (memberDetails) {
+      logger.debug(`Successfully got user details for member (userId:${member.userId})`)
+      return _.merge(member, _.pick(memberDetails, 'handle', 'firstName', 'lastName', 'email'))
+    } else {
+      throw new Error(`Didn't fine user details for member (userId:${member.userId})`)
+    }
+  } catch (err) {
+    logger.error(`Cannot populate member (userId:${member.userId}) with user details.`)
+    logger.debug(`Error during populating member (userId:${member.userId}) with user details`, err)
+    return 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
+  getMemberDetailsByUserIds,
+  populateMemberWithUserDetails,
+  removeInvitePromise
 }

src/services/ProcessorServiceProject.js

@@ -93,6 +93,9 @@ function createSchema () {
  * @return {Promise} promise result
  */
 async function create (message) {
+  const member = await helper.populateMemberWithUserDetails(message.members[0])
+  message.members = [member]
+
   await client.create({
     index: config.get('esConfig.ES_PROJECT_INDEX'),
     type: config.get('esConfig.ES_TYPE'),

src/services/ProcessorServiceProjectMember.js

@@ -53,23 +53,7 @@ async function create (message) {
   async function updateDocPromise (doc) {
     const members = _.isArray(doc._source.members) ? doc._source.members : []
     const existingMemberIndex = _.findIndex(members, p => p.id === message.id)// if member does not exists already
-    let member = message
-
-    // try to populate member with user details
-    // the code should move on, as it's not critical and is only used for searching at the moment
-    try {
-      const membersDetails = await helper.getMemberDetailsByUserIds([message.userId])
-      const memberDetails = membersDetails[0]
-      if (memberDetails) {
-        member = _.merge(message, _.pick(memberDetails, 'handle', 'firstName', 'lastName', 'email'))
-        logger.debug(`Successfully got user details for member (userId:${message.userId})`)
-      } else {
-        throw new Error(`Didn't fine user details for member (userId:${message.userId})`)
-      }
-    } catch (err) {
-      logger.error(`Cannot populate member (userId:${message.userId}) with user details.`)
-      logger.debug(`Error during populating member (userId:${message.userId}) with user details`, err)
-    }
+    const member = await helper.populateMemberWithUserDetails(message)
 
     if (existingMemberIndex === -1) {
       members.push(member)
@@ -78,6 +62,35 @@ 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
+    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 })
   }
 

src/services/ProcessorServiceProjectMemberInvite.js

@@ -22,6 +22,7 @@ function createSchema () {
       .email()
       .optional()
       .allow(null),
+    hashEmail: Joi.string().optional().allow(null),
     status: Joi.any()
       .valid(_.values(INVITE_STATUS))
       .required()
@@ -58,27 +59,33 @@ create.schema = {
  * @return {Promise} promise result
  */
 async function update (message) {
-  // handle ES Update
-  async function updateDocPromise (doc) {
-    // now merge the updated changes and reindex the document
-    const invites = _.isArray(doc._source.invites) ? doc._source.invites : []
-    _.remove(invites, invite => (!!message.email && invite.email === message.email) ||
-    (!!message.userId && invite.userId === message.userId))
-    return _.assign(doc._source, { invites })
-  }
-
-  await helper.updateProjectESPromise(message.projectId, updateDocPromise)
+  await helper.updateProjectESPromise(message.projectId, helper.removeInvitePromise(message))
   logger.debug(`Member invite updated successfully in elasticsearch index, (memberInviteId: ${message.id})`)
 }
 
 update.schema = {
   message: createSchema()
 }
 
+/**
+ * Delete message in Elasticsearch.
+ * @param {Object} message the deleted message
+ * @return {Promise} promise result
+ */
+async function deleteMessage (message) {
+  await helper.updateProjectESPromise(message.projectId, helper.removeInvitePromise(message))
+  logger.debug(`Member invite deleted successfully in elasticsearch index, (memberInviteId: ${message.id})`)
+}
+
+deleteMessage.schema = {
+  message: createSchema()
+}
+
 // Exports
 module.exports = {
   create,
-  update
+  update,
+  deleteMessage
 }
 
 logger.buildService(module.exports)

test/common/testData.js

@@ -100,6 +100,9 @@ const projectMemberInviteCreatedMessage = require(
 const projectMemberInviteUpdatedMessage = require(
   '../data/project.member.invite/project.action.update.json'
 )
+const projectMemberInviteDeletedMessage = require(
+  '../data/project.member.invite/project.action.delete.json'
+)
 const orgConfigCreatedMessage = require('../data/project.orgConfig/project.action.create.json')
 const orgConfigUpdatedMessage = require('../data/project.orgConfig/project.action.update.json')
 const orgConfigDeletedMessage = require('../data/project.orgConfig/project.action.delete.json')
@@ -202,6 +205,7 @@ module.exports = {
   orgConfigDeletedMessage,
   projectMemberInviteUpdatedMessage,
   projectMemberInviteCreatedMessage,
+  projectMemberInviteDeletedMessage,
   projectMemberUpdatedMessage,
   projectMemberCreatedMessage,
   projectMemberDeletedMessage,

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

@@ -1 +1 @@
-{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T04:58:12.671Z","mime-type":"application/json","payload":{"resource":"project.member.invite","createdAt":"2019-06-21T04:58:12.594Z","updatedAt":"2019-06-21T04:58:12.594Z","id":1,"projectId":1,"role":"customer","status":"pending","createdBy":40051334,"updatedBy":40051334,"userId":40051331,"email":null,"deletedAt":null,"deletedBy":null}}
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T04:58:12.671Z","mime-type":"application/json","payload":{"resource":"project.member.invite","createdAt":"2019-06-21T04:58:12.594Z","updatedAt":"2019-06-21T04:58:12.594Z","id":1,"projectId":1,"role":"customer","status":"pending","createdBy":40051334,"updatedBy":40051334,"userId":40051331,"email":"[email protected]","hashEmail":"dummy_value","deletedAt":null,"deletedBy":null}}

test/data/project.member.invite/project.action.delete.json

@@ -0,0 +1 @@
+{"topic":"project.action.update","originator":"project-api","timestamp":"2019-06-21T04:59:38.562Z","mime-type":"application/json","payload":{"resource":"project.member.invite","status":"canceled","userId":40051331,"email":"[email protected]","hashEmail":"dummy_value","id":1,"projectId":1}}

test/data/project.member.invite/project.action.update.json

@@ -1 +1 @@
-{"topic":"project.action.update","originator":"project-api","timestamp":"2019-06-21T04:59:38.562Z","mime-type":"application/json","payload":{"resource":"project.member.invite","status":"pending","userId":40051331,"email":"[email protected]","id":1,"projectId":1}}
+{"topic":"project.action.update","originator":"project-api","timestamp":"2019-06-21T04:59:38.562Z","mime-type":"application/json","payload":{"resource":"project.member.invite","status":"pending","userId":40051331,"email":"[email protected]","hashEmail":"dummy_value","id":1,"projectId":1}}

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}}