Merge branch 'dev' into migrate-jobcandidates-scripts

Author: LieutenantRoger

config/default.js

@@ -186,9 +186,10 @@ module.exports = {
     BASE_URL: process.env.WEEKLY_SURVEY_BASE_URL || 'https://api.surveymonkey.net/v3/surveys',
     JWT_TOKEN: process.env.WEEKLY_SURVEY_JWT_TOKEN || '',
     SURVEY_ID: process.env.WEEKLY_SURVEY_SURVEY_ID || '',
+    SURVEY_COLLECTOR_PREFIX: process.env.WEEKLY_SURVEY_SURVEY_COLLECTOR_PREFIX || 'Week ending',
     SURVEY_MASTER_COLLECTOR_ID: process.env.WEEKLY_SURVEY_SURVEY_MASTER_COLLECTOR_ID || '',
     SURVEY_MASTER_MESSAGE_ID: process.env.WEEKLY_SURVEY_SURVEY_MASTER_MESSAGE_ID || '',
-    SURVEY_CONTACT_GROUP_ID: process.env.WEEKLY_SURVEY_SURVEY_CONTACT_GROUP_ID || ''
+    SURVEY_CONTACT_GROUP_ID: process.env.WEEKLY_SURVEY_SURVEY_CONTACT_GROUP_ID || '',
   },
   // payment scheduler config
   PAYMENT_PROCESSING: {

docs/swagger.yaml

@@ -5624,6 +5624,18 @@ components:
             isExternalMember:
               type: boolean
               description: "Is the user external member"
+            matchedSkills:
+              type: array
+              items:
+                type: string
+                example: "java"
+              description: "skills match with the role"
+            unMatchedSkills:
+              type: array
+              items:
+                type: string
+                example: "javascript"
+              description: "skills unmatch with the role"
             skillsMatch:
               type: number
               format: float

src/common/surveyMonkey.js

@@ -57,7 +57,7 @@ function getSingleItem (lst, errorMessage) {
  * format `Week Ending yyyy-nth(weeks)`
  */
 function getCollectorName (dt) {
-  return 'Week Ending ' + moment(dt).format('M/D/YYYY')
+  return config.WEEKLY_SURVEY.SURVEY_COLLECTOR_PREFIX + ' ' + moment(dt).format('M/D/YYYY')
 }
 
 /*

src/services/TeamService.js

@@ -803,8 +803,11 @@ async function getRoleBySkills (skills) {
   const roles = await Role.findAll(queryCriteria)
   if (roles.length > 0) {
     let result = _.each(roles, role => {
+      // role matched skills list
+      role.matchedSkills = _.intersection(role.listOfSkills, skills)
+      role.unMatchedSkills = _.difference(skills, role.matchedSkills)
       // calculate each found roles matching rate
-      role.skillsMatch = _.intersection(role.listOfSkills, skills).length / skills.length
+      role.skillsMatch = role.matchedSkills.length / skills.length
       // each role can have multiple rates, get the maximum of global rates
       role.maxGlobal = _.maxBy(role.rates, 'global').global
     })