Skip to content

Commit 591b5b3

Browse files
committed
refactor: project member list endpoint naming things
Also, removed disabling eslint rule.
1 parent 9bff750 commit 591b5b3

File tree

3 files changed

+24
-16
lines changed

3 files changed

+24
-16
lines changed

src/permissions/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module.exports = () => {
2222
Authorizer.setPolicy('project.edit', projectEdit);
2323
Authorizer.setPolicy('project.delete', projectDelete);
2424
Authorizer.setPolicy('project.addMember', projectView);
25-
Authorizer.setPolicy('project.getMember', projectView);
25+
Authorizer.setPolicy('project.listMembers', projectView);
2626
Authorizer.setPolicy('project.removeMember', projectMemberDelete);
2727
Authorizer.setPolicy('project.addAttachment', projectEdit);
2828
Authorizer.setPolicy('project.updateAttachment', projectAttachmentUpdate);

src/routes/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ router.route('/v4/projects/:projectId(\\d+)/scopeChangeRequests/:requestId(\\d+)
119119
// .delete(require('./scopeChangeRequests/delete'));
120120

121121
router.route('/v4/projects/:projectId(\\d+)/members')
122-
.get(require('./projectMembers/get'))
122+
.get(require('./projectMembers/list'))
123123
.post(require('./projectMembers/create'));
124124

125125
router.route('/v4/projects/:projectId(\\d+)/members/:id(\\d+)')

src/routes/projectMembers/get.js renamed to src/routes/projectMembers/list.js

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,33 @@
1-
/* eslint-disable max-len */
1+
/**
2+
* Endpoint to list project members.
3+
*/
24
import _ from 'lodash';
35
import { middleware as tcMiddleware } from 'tc-core-library-js';
46
import util from '../../util';
57

6-
/**
7-
* API to add a project member.
8-
* add members directly (only managers and copilots)
9-
* user being added is current user
10-
*/
118
const permissions = tcMiddleware.permissions;
129

13-
1410
module.exports = [
15-
// handles request validations
16-
// validate(createProjectMemberValidations),
17-
permissions('project.getMember'),
11+
permissions('project.listMembers'),
1812
async (req, res) => {
1913
let members = req.context.currentProjectMembers;
2014

2115

2216
if (members.length && _.get(req, 'query.fields')) {
2317
const fields = req.query.fields.split(',');
2418

25-
const ModelFields = ['id', 'userId', 'role', 'isPrimary', 'deletedAt', 'createdAt', 'updatedAt', 'deletedBy', 'createdBy', 'updatedBy'];
19+
const ModelFields = [
20+
'id',
21+
'userId',
22+
'role',
23+
'isPrimary',
24+
'deletedAt',
25+
'createdAt',
26+
'updatedAt',
27+
'deletedBy',
28+
'createdBy',
29+
'updatedBy',
30+
];
2631

2732
const modelFields = _.intersection(ModelFields, fields);
2833
const hasUserIdField = _.indexOf(fields, 'userId') !== -1;
@@ -79,19 +84,22 @@ module.exports = [
7984
const traitsArr = _.find(traits, t => t[0].userId === m.userId);
8085
if (traitsArr) {
8186
if (traitFields[0] === 'photoURL') {
82-
_.assign(m, { photoURL: _.get(_.find(traitsArr, t => t.traitId === 'basic_info'), 'traits.data[0].photoURL') });
87+
_.assign(m, {
88+
photoURL: _.get(_.find(traitsArr, { traitId: 'basic_info' }), 'traits.data[0].photoURL'),
89+
});
8390
if (traitFields.length > 1) {
84-
const traitInfo = _.get(_.find(traitsArr, t => t.traitId === 'connect_info'), 'traits.data[0]', {});
91+
const traitInfo = _.get(_.find(traitsArr, { traitId: 'connect_info' }), 'traits.data[0]', {});
8592
_.assign(m, _.pick(traitInfo, connectInfoFields));
8693
}
8794
} else {
88-
const traitInfo = _.get(_.find(traitsArr, t => t.traitId === 'connect_info'), 'traits.data[0]', {});
95+
const traitInfo = _.get(_.find(traitsArr, { traitId: 'connect_info' }), 'traits.data[0]', {});
8996
_.assign(m, _.pick(traitInfo, connectInfoFields));
9097
}
9198
}
9299
});
93100
}
94101
} catch (e) {
102+
logger.error('Error getting member details', e);
95103
if (hasUserIdField === false) {
96104
members = _.map(members, m => _.omit(m, ['userId']));
97105
}

0 commit comments

Comments
 (0)