Merge pull request #478 from tcoDevs/feature/enrich

enrich disintigration

Author: vikasrohit

config/default.js

@@ -35,8 +35,8 @@ module.exports = {
   TC_API: process.env.TC_API || 'https://api.topcoder-dev.com/v5',
   // the organization id
   ORG_ID: process.env.ORG_ID || '36ed815b-3da1-49f1-a043-aaed0a4e81ad',
-  // the referenced skill provider id
-  TOPCODER_SKILL_PROVIDER_ID: process.env.TOPCODER_SKILL_PROVIDER_ID || '9cc0795a-6e12-4c84-9744-15858dba1861',
+  // the referenced taxonomy id
+  TOPCODER_TAXONOMY_ID: process.env.TOPCODER_TAXONOMY_ID || '7637ae1a-3b7c-44eb-a5ed-10ea02f1885d',
 
   TOPCODER_USERS_API: process.env.TOPCODER_USERS_API || 'https://api.topcoder-dev.com/v3/users',
   // the api to find topcoder members

docs/swagger.yaml

@@ -3157,7 +3157,7 @@ paths:
               schema:
                 type: array
                 items:
-                  $ref: "#/components/schemas/UbahnSkill"
+                  $ref: "#/components/schemas/SkillInSkillsAPI"
           headers:
             X-Next-Page:
               schema:
@@ -5516,17 +5516,25 @@ components:
           type: string
           example: "React"
           description: The skill name.
-    UbahnSkill:
-      type: object
+    SkillInSkillsAPI:
+      required:
+        - "id"
+        - "name"
+        - "taxonomyId"
+        - "taxonomyName"
+        - "metadata"
       properties:
         id:
           type: "string"
           format: "UUID"
           description: "The skill id"
-        skillProviderId:
+        taxonomyId:
           type: "string"
           format: "UUID"
-          description: "The referenced skill provider id"
+          description: "The referenced taxonomy id"
+        taxonomyName:
+          type: "string"
+          description: "The referenced taxonomy name"
         name:
           type: "string"
           description: "The name of the skill"
@@ -5536,22 +5544,20 @@ components:
         uri:
           type: "string"
           description: "The uri for the skill"
-        created:
-          type: "string"
-          format: "date-time"
-          description: "When the entity was created."
-        updated:
-          type: "string"
-          format: "date-time"
-          description: "When the entity was updated."
-        createdBy:
-          type: "string"
-          format: "UUID"
-          description: "Creator of the entity."
-        updatedBy:
-          type: "string"
-          format: "UUID"
-          description: "User that last updated the entity."
+        metadata:
+          type: "object"
+          description: "The metadata for the skill"
+          properties:
+            updated:
+              type: "string"
+              format: "date-time"
+              description: "The last updated timestamp of the skill"
+            challengeProminence:
+              type: "string"
+              description: "The challenge prominence ranging from [0, 1]"
+            memberProminence:
+              type: "string"
+              description: "The member prominence ranging from [0, 1]"
     JobForTeam:
       properties:
         id:

src/common/helper.js

@@ -950,7 +950,15 @@ async function listUsersByExternalId (externalId) {
     context: 'listUserByExternalId',
     message: `response body: ${JSON.stringify(res.body)}`
   })
-  return res.body
+
+  const users = res.body
+  // populate skill data for each user skill
+  await Promise.all(users.map(user => Promise.all(user.skills.map(async userSkill => {
+    const skill = await getSkillById(userSkill.skillId)
+    userSkill.skill = skill
+  }))))
+
+  return users
 }
 
 /**
@@ -1092,9 +1100,10 @@ async function getUserById (userId, enrich) {
   const user = _.pick(res.body, ['id', 'handle', 'firstName', 'lastName'])
 
   if (enrich) {
-    user.skills = (res.body.skills || []).map((skillObj) =>
-      _.pick(skillObj.skill, ['id', 'name'])
-    )
+    user.skills = await Promise.all((res.body.skills || []).map(async (userSkill) => {
+      const skill = await getSkillById(userSkill.skillId)
+      return _.pick(skill, ['id', 'name'])
+    }))
     const attributes = _.get(res, 'body.attributes', [])
     user.attributes = _.map(attributes, (attr) =>
       _.pick(attr, ['id', 'value', 'attribute.id', 'attribute.name'])
@@ -1211,18 +1220,18 @@ async function getProjectById (currentUser, id) {
 
 /**
  * Function to search skills from v5/skills
- * - only returns skills from Topcoder Skills Provider defined by `TOPCODER_SKILL_PROVIDER_ID`
+ * - only returns skills from Topcoder Skills API defined by `TOPCODER_TAXONOMY_ID`
  *
  * @param {Object} criteria the search criteria
  * @returns the request result
  */
 async function getTopcoderSkills (criteria) {
-  const token = await getM2MUbahnToken()
+  const token = await getM2MToken()
   try {
     const res = await request
       .get(`${config.TC_API}/skills`)
       .query({
-        skillProviderId: config.TOPCODER_SKILL_PROVIDER_ID,
+        taxonomyId: config.TOPCODER_TAXONOMY_ID,
         ...criteria
       })
       .set('Authorization', `Bearer ${token}`)
@@ -1248,7 +1257,7 @@ async function getTopcoderSkills (criteria) {
 
 /**
  * Function to search and retrive all skills from v5/skills
- * - only returns skills from Topcoder Skills Provider defined by `TOPCODER_SKILL_PROVIDER_ID`
+ * - only returns skills from Topcoder Skills API defined by `TOPCODER_TAXONOMY_ID`
  *
  * @param {Object} criteria the search criteria
  * @returns the request result
@@ -1270,7 +1279,7 @@ async function getAllTopcoderSkills (criteria) {
  * @returns the request result
  */
 async function getSkillById (skillId) {
-  const token = await getM2MUbahnToken()
+  const token = await getM2MToken()
   const res = await request
     .get(`${config.TC_API}/skills/${skillId}`)
     .set('Authorization', `Bearer ${token}`)
@@ -1280,7 +1289,7 @@ async function getSkillById (skillId) {
     context: 'getSkillById',
     message: `response body: ${JSON.stringify(res.body)}`
   })
-  return _.pick(res.body, ['id', 'name'])
+  return res.body
 }
 
 /**

src/services/TeamService.js

@@ -328,16 +328,13 @@ async function getTeam (currentUser, id) {
   const teamDetail = result[0]
 
   // add job skills for result
-  let jobSkills = []
   if (teamDetail && teamDetail.jobs) {
     for (const job of teamDetail.jobs) {
       if (job.skills) {
-        const usersPromises = []
-        _.map(job.skills, (skillId) => {
-          usersPromises.push(helper.getSkillById(skillId))
-        })
-        jobSkills = await Promise.all(usersPromises)
-        job.skills = jobSkills
+        job.skills = await Promise.all(job.skills.map(async (skillId) => {
+          const skill = await helper.getSkillById(skillId)
+          return _.pick(skill, ['id', 'name'])
+        }))
       }
     }
   }
@@ -376,7 +373,10 @@ async function getTeamJob (currentUser, id, jobId) {
 
   if (job.skills) {
     result.skills = await Promise.all(
-      _.map(job.skills, (skillId) => helper.getSkillById(skillId))
+      _.map(job.skills, async (skillId) => {
+        const skill = await helper.getSkillById(skillId)
+        return _.pick(skill, ['id', 'name'])
+      })
     )
   }