Skip to content

Hotfix/debug logs #230

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 17 commits into from
Jan 16, 2019
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
2 changes: 1 addition & 1 deletion src/events/projectMembers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ const projectMemberUpdatedHandler = Promise.coroutine(function* a(logger, msg, c
try {
const data = JSON.parse(msg.content.toString());
// get member information
const memberDetails = yield util.getMemberDetailsByUserIds[data.original.userId];
const memberDetails = yield util.getMemberDetailsByUserIds([data.original.userId], logger);
const payload = _.merge(data.updated, _.pick(memberDetails[0], 'handle', 'firstName', 'lastName', 'email'));
const doc = yield eClient.get({ index: ES_PROJECT_INDEX, type: ES_PROJECT_TYPE, id: data.original.projectId });

Expand Down
2 changes: 1 addition & 1 deletion src/events/projects/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const indexProject = Promise.coroutine(function* (logger, msg) { // eslint-disab
const userIds = data.members ? data.members.map(single => `userId:${single.userId}`) : [];
try {
// retrieve member details
const memberDetails = yield util.getMemberDetailsByUserIds(userIds, msg.properties.correlationId, logger);
const memberDetails = yield util.getMemberDetailsByUserIds(userIds, logger, msg.properties.correlationId);
// if no members are returned than this should result in nack
// if (!_.isArray(memberDetails) || memberDetails.length === 0) {
// logger.error(`Empty member details for userIds ${userIds.join(',')} requeing the message`);
Expand Down
4 changes: 3 additions & 1 deletion src/routes/projectMemberInvites/create.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,17 @@ const buildCreateInvitePromises = (req, invite, invites, data) => {
};

const sendInviteEmail = (req, projectId, invite) => {
req.log.debug(req.authUser);
const emailEventType = BUS_API_EVENT.PROJECT_MEMBER_EMAIL_INVITE_CREATED;
const promises = [
models.Project.find({
where: { id: projectId },
raw: true,
}),
util.getMemberDetailsByUserIds([req.authUser.userId], req.log, req.id),
util.getMemberDetailsByUserIds([`userId:${req.authUser.userId}`], req.log, req.id),
];
return Promise.all(promises).then((responses) => {
req.log.debug(responses);
const project = responses[0];
const initiator = responses[1] && responses[1].length ? responses[1][0] : {
userId: req.authUser.userId,
Expand Down
3 changes: 3 additions & 0 deletions src/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,9 @@ _.assignIn(util, {
try {
const token = yield this.getSystemUserToken(logger);
const httpClient = this.getHttpClient({ id: requestId, log: logger });
if (logger) {
logger.trace(userIds);
}
return httpClient.get(`${config.memberServiceEndpoint}/_search`, {
params: {
query: `${userIds.join(urlencode(' OR ', 'utf8'))}`,
Expand Down