Merge pull request #12 from topcoder-platform/develop

Fix for Member Skills Aggregation

Author: urwithat

src/common/helper.js

@@ -568,40 +568,52 @@ function mergeSkills (memberEnteredSkill, memberAggregatedSkill, allTags) {
     })
     // process skills in member aggregated skill
     if (memberAggregatedSkill.skills) {
-      _.forIn(memberAggregatedSkill.skills, (value, key) => {
-        if (!value.hidden) {
-          var tag = this.findTagById(allTags, Number(key))
-          if(tag) {
-            if (value.hasOwnProperty("sources")) {
-              if(value.sources.includes("CHALLENGE")) {
-                if (tempSkill[key]) {
-                  value.tagName = tag.name
-                  if (!value.hasOwnProperty("score")) {
-                    value.score = tempSkill[key].score
-                  } else {
-                    if (value.score <= tempSkill[key].score) {
-                      value.score = tempSkill[key].score
-                    }
-                  }
-                  value.sources.push(tempSkill[key].sources[0])
-                } else {
-                  value.tagName = tag.name
-                  if (!value.hasOwnProperty("score")) {
-                    value.score = 0
-                  }
+      tempSkill = mergeAggregatedSkill(memberAggregatedSkill, allTags, tempSkill)
+    }
+    memberEnteredSkill.skills = tempSkill
+  } else {
+    // process skills in member aggregated skill
+    if (memberAggregatedSkill.hasOwnProperty("skills")) {
+      var tempSkill = {}
+      memberEnteredSkill.skills = mergeAggregatedSkill(memberAggregatedSkill, allTags, tempSkill)
+    } else {
+      memberEnteredSkill.skills = {}
+    }
+  }
+  return memberEnteredSkill
+}
+
+function mergeAggregatedSkill (memberAggregatedSkill, allTags, tempSkill) {
+  for (var key in memberAggregatedSkill.skills) {
+    var value = memberAggregatedSkill.skills[key]
+    if (!value.hidden) {
+      var tag = findTagById(allTags, Number(key))
+      if(tag) {
+        if (value.hasOwnProperty("sources")) {
+          if(value.sources.includes("CHALLENGE")) {
+            if (tempSkill[key]) {
+              value.tagName = tag.name
+              if (!value.hasOwnProperty("score")) {
+                value.score = tempSkill[key].score
+              } else {
+                if (value.score <= tempSkill[key].score) {
+                  value.score = tempSkill[key].score
                 }
-                tempSkill[key] = value
+              }
+              value.sources.push(tempSkill[key].sources[0])
+            } else {
+              value.tagName = tag.name
+              if (!value.hasOwnProperty("score")) {
+                value.score = 0
               }
             }
+            tempSkill[key] = value
           }
         }
-      })
+      }
     }
-    memberEnteredSkill.skills = tempSkill
-  } else {
-    memberEnteredSkill.skills = {}
   }
-  return memberEnteredSkill
+  return tempSkill
 }
 
 async function getAllTags(url) {
@@ -650,6 +662,7 @@ module.exports = {
   convertToObjectSkills,
   cleanupSkills,
   mergeSkills,
+  mergeAggregatedSkill,
   getAllTags,
   findTagById,
   getRatingColor

src/services/StatisticsService.js

@@ -252,7 +252,7 @@ async function getMemberSkills (currentUser, handle, query, throwError) {
     this.allTags = await helper.getAllTags(config.TAGS.TAGS_BASE_URL + config.TAGS.TAGS_API_VERSION + config.TAGS.TAGS_FILTER)
   }
   // get member entered skill by member user id
-  let memberEnteredSkill = await helper.getEntityByHashKey(handle, 'MemberEnteredSkills', 'userId', member.userId, throwError)
+  let memberEnteredSkill = await helper.getEntityByHashKey(handle, 'MemberEnteredSkills', 'userId', member.userId, false)
   // get member aggregated skill by member user id
   let memberAggregatedSkill = await helper.getEntityByHashKey(handle, 'MemberAggregatedSkills', 'userId', member.userId, false)
   // cleanup - convert string to object