Skip to content

Fix issue 3723 #28

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
Mar 13, 2020
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
26 changes: 25 additions & 1 deletion src/common/helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,34 @@ 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
}
}

module.exports = {
getESClient,
updateProjectESPromise,
updateTimelineESPromise,
updateMetadadaESPromise,
getMemberDetailsByUserIds
getMemberDetailsByUserIds,
populateMemberWithUserDetails
}
3 changes: 3 additions & 0 deletions src/services/ProcessorServiceProject.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
18 changes: 1 addition & 17 deletions src/services/ProcessorServiceProjectMember.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down