merge: "develop" into "hotfix/remove-invite-on-member-create-dev"

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,6 +165,29 @@ 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.
  *
@@ -186,5 +209,6 @@ module.exports = {
   updateTimelineESPromise,
   updateMetadadaESPromise,
   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)