Merge pull request #769 from topcoder-platform/PLAT-3739

Plat 3739

Author: eisbilir

config/development.json

@@ -4,7 +4,7 @@
   "attachmentsS3Bucket": "topcoder-dev-media",
   "connectProjectsUrl": "https://connect.topcoder-dev.com/projects/",
   "fileServiceEndpoint": "https://api.topcoder-dev.com/v5/files",
-  "memberServiceEndpoint": "https://api.topcoder-dev.com/v3/members",
+  "memberServiceEndpoint": "https://api.topcoder-dev.com/v5/members",
   "identityServiceEndpoint": "https://api.topcoder-dev.com/v3/",
   "taasJobApiUrl": "https://api.topcoder-dev.com/v5/jobs",
   "sfdcBillingAccountNameField": "Billing_Account_Name__c",

config/m2m.local.js

@@ -15,7 +15,7 @@ if (process.env.NODE_ENV === 'test') {
     fileServiceEndpoint: 'https://api.topcoder-dev.com/v5/files',
     directProjectServiceEndpoint: 'https://api.topcoder-dev.com/v3/direct',
     connectProjectsUrl: 'https://connect.topcoder-dev.com/projects/',
-    memberServiceEndpoint: 'https://api.topcoder-dev.com/v3/members',
+    memberServiceEndpoint: 'https://api.topcoder-dev.com/v5/members',
     dbConfig: {
       masterUrl: 'postgres://coder:mysecretpassword@dockerhost:5432/projectsdb',
       maxPoolSize: 50,

config/mock.local.js

@@ -15,7 +15,7 @@ if (process.env.NODE_ENV === 'test') {
     fileServiceEndpoint: 'https://api.topcoder-dev.com/v5/files',
     directProjectServiceEndpoint: 'https://api.topcoder-dev.com/v3/direct',
     connectProjectsUrl: 'https://connect.topcoder-dev.com/projects/',
-    memberServiceEndpoint: 'http://dockerhost:3001/v3/members',
+    memberServiceEndpoint: 'http://dockerhost:3001/v5/members',
     dbConfig: {
       masterUrl: 'postgres://coder:mysecretpassword@dockerhost:5432/projectsdb',
       maxPoolSize: 50,

package.json

@@ -102,5 +102,8 @@
     "sinon": "^1.17.4",
     "sinon-chai": "^2.8.0",
     "supertest": "^4.0.2"
+  },
+  "volta": {
+    "node": "12.16.1"
   }
 }

src/util.js

@@ -512,7 +512,9 @@ const projectServiceUtils = {
       }
 
       return httpClient.get(`${config.memberServiceEndpoint}/${handle}/traits`, {
-        params: {},
+        params: {
+          traitIds: 'basic_info,connect_info',
+        },
         headers: {
           'Content-Type': 'application/json',
           Authorization: `Bearer ${token}`,
@@ -724,13 +726,13 @@ const projectServiceUtils = {
         const traits = await Promise.all(promises);
         _.each(traits, (memberTraits) => {
           // if we didn't manage to get traits for the user, skip it
-          if (!memberTraits) return;
+          if (_.isEmpty(memberTraits)) return;
 
           const basicInfo = _.find(memberTraits, trait => trait.traitId === 'basic_info');
           const connectInfo = _.find(memberTraits, trait => trait.traitId === 'connect_info');
           const memberIndex = _.findIndex(
             allMemberDetails,
-            member => member.userId === _.get(basicInfo, 'traits.data[0].userId'),
+            member => member.userId === _.get(memberTraits, '[0].userId'),
           );
           const basicDetails = {
             photoURL: _.get(basicInfo, 'traits.data[0].photoURL'),