Skip to content

Limit draft phase update events to topcoder project members #249

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.

Sign up for GitHub

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
Feb 11, 2019
Merged

Limit draft phase update events to topcoder project members #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions src/events/busApi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { EVENT, BUS_API_EVENT, PROJECT_STATUS, PROJECT_PHASE_STATUS, PROJECT_MEM
from '../constants';
import { createEvent } from '../services/busApi';
import models from '../models';
import getTopcoderProjectMembers from '../util';

/**
* Map of project status and event name sent to bus api
Expand Down Expand Up @@ -363,6 +364,8 @@ module.exports = (app, logger) => {
projectUrl: connectProjectUrl(projectId),
userId: req.authUser.userId,
initiatorUserId: req.authUser.userId,
allowedUsers: created.status === PROJECT_PHASE_STATUS.DRAFT ?
getTopcoderProjectMembers(project.members) : null,
}, logger);
return sendPlanReadyEventIfNeeded(req, project, created);
}).catch(err => null); // eslint-disable-line no-unused-vars
Expand All @@ -387,6 +390,8 @@ module.exports = (app, logger) => {
projectUrl: connectProjectUrl(projectId),
userId: req.authUser.userId,
initiatorUserId: req.authUser.userId,
allowedUsers: deleted.status === PROJECT_PHASE_STATUS.DRAFT ?
getTopcoderProjectMembers(project.members) : null,
}, logger);
}).catch(err => null); // eslint-disable-line no-unused-vars
});
Expand Down Expand Up @@ -438,6 +443,8 @@ module.exports = (app, logger) => {
projectName: project.name,
userId: req.authUser.userId,
initiatorUserId: req.authUser.userId,
allowedUsers: updated.status === PROJECT_PHASE_STATUS.DRAFT ?
getTopcoderProjectMembers(project.members) : null,
}, logger));
events.forEach((event) => { eventsMap[event] = true; });
}
Expand Down Expand Up @@ -483,6 +490,8 @@ module.exports = (app, logger) => {
projectUrl: connectProjectUrl(projectId),
userId: req.authUser.userId,
initiatorUserId: req.authUser.userId,
allowedUsers: updated.status === PROJECT_PHASE_STATUS.DRAFT ?
getTopcoderProjectMembers(project.members) : null,
}, logger);
}
}).catch(err => null); // eslint-disable-line no-unused-vars
Expand Down
9 changes: 8 additions & 1 deletion src/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import elasticsearch from 'elasticsearch';
import Promise from 'bluebird';
// import AWS from 'aws-sdk';

import { ADMIN_ROLES, TOKEN_SCOPES, EVENT } from './constants';
import { ADMIN_ROLES, TOKEN_SCOPES, EVENT, PROJECT_MEMBER_ROLE } from './constants';

const exec = require('child_process').exec;
const models = require('./models').default;
Expand Down Expand Up @@ -468,6 +468,13 @@ _.assignIn(util, {
});
});
},

/**
* Filter only members of topcoder team
* @param {Array} members project members
* @return {Array} tpcoder project members
*/
getTopcoderProjectMembers: members => _(members).filter(m => m.role !== PROJECT_MEMBER_ROLE.CUSTOMER),
});

export default util;