Skip to content

Commit 13140b9

Browse files
committed
fix: fetching member details
1 parent 2bd4b33 commit 13140b9

File tree

3 files changed

+18
-21
lines changed

3 files changed

+18
-21
lines changed

.circleci/config.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,22 +146,22 @@ workflows:
146146
version: 2
147147
Connect Project Services:
148148
jobs:
149-
# - UnitTests:
150-
# context : org-global
149+
- UnitTests:
150+
context : org-global
151151
- deployDev:
152152
context : org-global
153-
# requires:
154-
# - UnitTests
153+
requires:
154+
- UnitTests
155155
filters:
156156
branches:
157157
only: ['develop', 'connect-performance-testing', 'feature/new-milestone-concept']
158158
- deployProd:
159159
context : org-global
160-
# requires:
161-
# - UnitTests
160+
requires:
161+
- UnitTests
162162
filters:
163163
branches:
164-
only: ['master', 'PLAT-3739']
164+
only: ['master']
165165
- Hold [Performance-Testing]:
166166
type: approval
167167
requires:

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,5 +102,8 @@
102102
"sinon": "^1.17.4",
103103
"sinon-chai": "^2.8.0",
104104
"supertest": "^4.0.2"
105+
},
106+
"volta": {
107+
"node": "12.16.1"
105108
}
106109
}

src/util.js

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* eslint-disable no-console */
1+
22
/*
33
* Copyright (C) 2016 TopCoder Inc., All Rights Reserved.
44
*/
@@ -512,15 +512,14 @@ const projectServiceUtils = {
512512
}
513513

514514
return httpClient.get(`${config.memberServiceEndpoint}/${handle}/traits`, {
515-
params: {},
515+
params: {
516+
traitIds: 'basic_info,connect_info',
517+
},
516518
headers: {
517519
'Content-Type': 'application/json',
518520
Authorization: `Bearer ${token}`,
519521
},
520-
}).then((res) => {
521-
console.info(res);
522-
return _.get(res, 'data', null);
523-
});
522+
}).then(res => _.get(res, 'data', null));
524523
} catch (err) {
525524
return Promise.reject(err);
526525
}
@@ -545,10 +544,7 @@ const projectServiceUtils = {
545544
'Content-Type': 'application/json',
546545
Authorization: `Bearer ${token}`,
547546
},
548-
}).then((res) => {
549-
console.info(res);
550-
return _.get(res, 'data', null);
551-
});
547+
}).then(res => _.get(res, 'data', null));
552548
} catch (err) {
553549
return Promise.reject(err);
554550
}
@@ -718,7 +714,6 @@ const projectServiceUtils = {
718714
if (_.intersection(fields, _.union(memberDetailFields, memberTraitFields)).length > 0) {
719715
const userIds = _.reject(_.map(members, 'userId'), _.isNil); // some invites may have no `userId`
720716
allMemberDetails = await util.getMemberDetailsByUserIds(userIds, req.log, req.id);
721-
console.info(allMemberDetails);
722717

723718
if (_.intersection(fields, memberTraitFields).length > 0) {
724719
const promises = _.map(
@@ -729,16 +724,15 @@ const projectServiceUtils = {
729724
}),
730725
);
731726
const traits = await Promise.all(promises);
732-
console.info(traits);
733727
_.each(traits, (memberTraits) => {
734728
// if we didn't manage to get traits for the user, skip it
735-
if (!memberTraits) return;
729+
if (_.isEmpty(memberTraits)) return;
736730

737731
const basicInfo = _.find(memberTraits, trait => trait.traitId === 'basic_info');
738732
const connectInfo = _.find(memberTraits, trait => trait.traitId === 'connect_info');
739733
const memberIndex = _.findIndex(
740734
allMemberDetails,
741-
member => member.userId === _.get(basicInfo, 'traits.data[0].userId'),
735+
member => member.userId === _.get(memberTraits, '[0].userId'),
742736
);
743737
const basicDetails = {
744738
photoURL: _.get(basicInfo, 'traits.data[0].photoURL'),

0 commit comments

Comments
 (0)