Merge pull request #712 from topcoder-platform/dev

TSJR-331 Feature improvements and bug fixes

Author: kkartunov

.circleci/config.yml

@@ -78,6 +78,7 @@ workflows:
             branches:
               only:
                 - dev
+                - TSJR-246
 
       # Development builds are executed on "develop" branch only.
       - "build-qa":

src/common/helper.js

@@ -1392,6 +1392,39 @@ async function getSkillById (skillId) {
   return _.pick(res.body, ['id', 'name'])
 }
 
+/**
+ * Function to get skills by their exact name, via the standarized skills API
+ * Used in the job service to validate skill names passed in when creating / updating
+ * jobs
+ * @param {Array<String>} names - the skill name
+ * @returns the request result
+ */
+async function getSkillsByExactNames (names) {
+  if (!names || !_.isArray(names) || !names.length) {
+    return []
+  }
+
+  const token = await getM2MToken()
+  localLogger.debug({
+    context: 'getSkillsByNames',
+    message: `M2M Token: ${token}`
+  })
+  
+  const url = `${config.TC_API}/standardized-skills/skills?${names.map(skill => `name=${encodeURIComponent(skill)}`).join('&')}`
+  const res = await request
+    .get(url)
+    .set('Authorization', `Bearer ${token}`)
+    .set('Content-Type', 'application/json')
+    .set('Accept', 'application/json')
+  
+    localLogger.debug({
+    context: 'getSkillsByNames',
+    message: `response body of GET ${url} is ${JSON.stringify(res.body)}`
+  })
+  
+  return res.body
+}
+
 /**
  * Encapsulate the getUserByExternalId function.
  * Make sure a user exists in ubahn(/v5/users) and return the id of the user.
@@ -2139,16 +2172,14 @@ async function getMembersSuggest (fragment) {
 async function registerSkills (job) {
   const token = await getM2MToken()
   const body = {
-    workId: job.id,
-    workTypeId: config.STANDARDIZED_SKILL_WORK_TYPE_ID,
     skillIds: job.skills
   }
   localLogger.debug({
     context: 'registerSkills',
     message: `request: ${JSON.stringify(body)}`
   })
   const res = await request
-    .post(`${config.TC_API}/standardized-skills/work-skills`)
+    .post(`${config.TC_API}/standardized-skills/job-skills/${job.id}`)
     .set('Authorization', `Bearer ${token}`)
     .set('Content-Type', 'application/json')
     .set('Accept', 'application/json')
@@ -2363,5 +2394,6 @@ module.exports = {
   runExclusiveInterviewEventHandler,
   runExclusiveByNamedMutex,
   signZoomLink,
-  verifyZoomLinkToken
+  verifyZoomLinkToken,
+  getSkillsByExactNames
 }

src/services/JobService.js

@@ -28,7 +28,7 @@ const esClient = helper.getESClient()
  * @param {String} jobId the job id
  * @returns {Array} the list of candidates
  */
-async function _getJobCandidates (jobId) {
+async function _getJobCandidates(jobId) {
   const { body } = await esClient.search({
     index: config.get('esConfig.ES_INDEX_JOB_CANDIDATE'),
     body: {
@@ -60,7 +60,7 @@ async function _getJobCandidates (jobId) {
  * @param {Array} skills the list of skills
  * @returns {undefined}
  */
-async function _validateSkills (skills) {
+async function _validateSkills(skills) {
   const responses = await Promise.all(
     skills.map(
       skill => helper.getSkillById(skill.skillId)
@@ -81,13 +81,31 @@ async function _validateSkills (skills) {
   }
 }
 
+/**
+ * Validate by exact match on name field if all skills exist.
+ *
+ * @param {Array} skillNames the list of skill names to validate
+ * @returns {Array} the list of matching skill objects
+ */
+async function _validateAndGetSkillsByNames(skillNames) {
+  const skills = await helper.getSkillsByExactNames(skillNames)
+  
+  if (skills.length !== skillNames.length) {
+    const foundSkillNames = skills.map(skill => skill.name)
+    const notFoundSkillNames = _.difference(skillNames, foundSkillNames)
+    throw new errors.BadRequestError(`Invalid skills: [${notFoundSkillNames}]`)
+  }
+  
+  return skills
+}
+
 /**
  * Validate if all roles exist.
  *
  * @param {Array} roles the list of roles
  * @returns {undefined}
  */
-async function _validateRoles (roles) {
+async function _validateRoles(roles) {
   const foundRolesObj = await models.Role.findAll({
     where: {
       id: roles
@@ -109,7 +127,7 @@ async function _validateRoles (roles) {
  * @param {String} projectId the project id
  * @returns {undefined}
  */
-async function _checkUserPermissionForGetJob (currentUser, projectId) {
+async function _checkUserPermissionForGetJob(currentUser, projectId) {
   if (!currentUser.hasManagePermission && !currentUser.isMachine && !currentUser.isConnectManager) {
     await helper.checkIsMemberOfProject(currentUser.userId, projectId)
   }
@@ -122,7 +140,7 @@ async function _checkUserPermissionForGetJob (currentUser, projectId) {
  * @param {Boolean} fromDb flag if query db for data or not
  * @returns {Object} the job
  */
-async function getJob (currentUser, id, fromDb = false) {
+async function getJob(currentUser, id, fromDb = false) {
   if (!fromDb) {
     try {
       const job = await esClient.get({
@@ -170,7 +188,7 @@ getJob.schema = Joi.object().keys({
  * @params {Object} job the job to be created
  * @returns {Object} the created job
  */
-async function createJob (currentUser, job, onTeamCreating) {
+async function createJob(currentUser, job, onTeamCreating) {
   // check user permission
   if (!currentUser.hasManagePermission && !currentUser.isMachine) {
     await helper.checkIsMemberOfProject(currentUser.userId, job.projectId)
@@ -258,10 +276,26 @@ createJob.schema = Joi.object()
  * @params {Object} data the data to be updated
  * @returns {Object} the updated job
  */
-async function updateJob (currentUser, id, data) {
+async function updateJob(currentUser, id, data) {
+  logger.debug({ component: 'JobService', context: 'updateJob start', message: `Arguments: ${JSON.stringify(currentUser)} job id: ${id} data: ${JSON.stringify(data)}` })
+
+  let skills = data.skills
+
   if (data.skills) {
     await _validateSkills(data.skills)
+
+    // Compact the skills to *just* the IDs for saving to ES
+    data.skills = _.chain(skills).map('skillId').uniq().compact().value()
+  }
+  if (data.skillNames) {
+    skills = await _validateAndGetSkillsByNames(data.skillNames)
+
+    data = _.omit(data, 'skillNames')
+
+    // Compact the skills to *just* the IDs for saving to ES
+    data.skills = _.chain(skills).map('id').uniq().compact().value()
   }
+
   if (data.roleIds) {
     data.roleIds = _.uniq(data.roleIds)
     await _validateRoles(data.roleIds)
@@ -288,10 +322,13 @@ async function updateJob (currentUser, id, data) {
 
   let entity
   try {
+    logger.debug({ component: 'JobService', context: 'updateJob update transaction', message: `Data: ${JSON.stringify(data)}` })
+
     await sequelize.transaction(async (t) => {
       const updated = await job.update(data, { transaction: t })
       entity = updated.toJSON()
       await processUpdate(entity)
+      await helper.registerSkills(job)
     })
   } catch (e) {
     if (entity) {
@@ -312,7 +349,7 @@ async function updateJob (currentUser, id, data) {
  * @params {Object} data the data to be updated
  * @returns {Object} the updated job
  */
-async function partiallyUpdateJob (currentUser, id, data) {
+async function partiallyUpdateJob(currentUser, id, data) {
   return updateJob(currentUser, id, data, false)
 }
 
@@ -332,7 +369,8 @@ partiallyUpdateJob.schema = Joi.object()
         resourceType: Joi.stringAllowEmpty().allow(null),
         rateType: Joi.rateType().allow(null),
         workload: Joi.workload().allow(null),
-        skills: Joi.array().items(Joi.string().uuid()),
+        skills: Joi.array().allow(null),
+        skillNames: Joi.array().allow(null),
         isApplicationPageActive: Joi.boolean(),
         minSalary: Joi.number().integer(),
         maxSalary: Joi.number().integer(),
@@ -359,7 +397,7 @@ partiallyUpdateJob.schema = Joi.object()
  * @params {Object} data the data to be updated
  * @returns {Object} the updated job
  */
-async function fullyUpdateJob (currentUser, id, data) {
+async function fullyUpdateJob(currentUser, id, data) {
   return updateJob(currentUser, id, data, true)
 }
 
@@ -401,7 +439,7 @@ fullyUpdateJob.schema = Joi.object().keys({
  * @params {Object} currentUser the user who perform this operation
  * @params {String} id the job id
  */
-async function deleteJob (currentUser, id) {
+async function deleteJob(currentUser, id) {
   // check user permission
   if (!currentUser.hasManagePermission && !currentUser.isMachine) {
     throw new errors.ForbiddenError('You are not allowed to perform this action!')
@@ -432,7 +470,7 @@ deleteJob.schema = Joi.object().keys({
  * @params {Object} options the extra options to control the function
  * @returns {Object} the search result, contain total/page/perPage and result array
  */
-async function searchJobs (currentUser, criteria, options = { returnAll: false }) {
+async function searchJobs(currentUser, criteria, options = { returnAll: false }) {
   // check user permission
   if (!currentUser.hasManagePermission && !currentUser.isMachine && !currentUser.isConnectManager && !options.returnAll) {
     if (!criteria.projectId) { // regular user can only search with filtering by "projectId"