From b187327aa8c08b7684026d680a1f4a80a4d5fab4 Mon Sep 17 00:00:00 2001
From: yoution <zhuyan207@gmail.com>
Date: Tue, 29 Jun 2021 21:17:44 +0800
Subject: [PATCH] Role Skills Intake Tweaks and Bugs

---
 src/routes/RoleRoutes.js            | 4 ++--
 src/services/JobCandidateService.js | 8 ++++----
 src/services/JobService.js          | 6 +++---
 src/services/TeamService.js         | 8 +++++++-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/routes/RoleRoutes.js b/src/routes/RoleRoutes.js
index ce8441a9..890c9d3d 100644
--- a/src/routes/RoleRoutes.js
+++ b/src/routes/RoleRoutes.js
@@ -13,13 +13,13 @@ module.exports = {
     },
     get: {
       controller: 'RoleController',
-      method: 'searchRoles',
+      method: 'searchRoles'
     }
   },
   '/taas-roles/:id': {
     get: {
       controller: 'RoleController',
-      method: 'getRole',
+      method: 'getRole'
     },
     patch: {
       controller: 'RoleController',
diff --git a/src/services/JobCandidateService.js b/src/services/JobCandidateService.js
index 33ba9aa5..a46917aa 100644
--- a/src/services/JobCandidateService.js
+++ b/src/services/JobCandidateService.js
@@ -203,14 +203,14 @@ fullyUpdateJobCandidate.schema = Joi.object()
       .keys({
         jobId: Joi.string().uuid().required(),
         userId: Joi.string().uuid().required(),
-        status: Joi.jobCandidateStatus().default("open"),
+        status: Joi.jobCandidateStatus().default('open'),
         externalId: Joi.string().allow(null).default(null),
-        resume: Joi.string().uri().allow("").allow(null).default(null),
+        resume: Joi.string().uri().allow('').allow(null).default(null),
         remark: Joi.stringAllowEmpty().allow(null)
       })
-      .required(),
+      .required()
   })
-  .required();
+  .required()
 
 /**
  * Delete jobCandidate by id
diff --git a/src/services/JobService.js b/src/services/JobService.js
index b4a50665..4a183783 100644
--- a/src/services/JobService.js
+++ b/src/services/JobService.js
@@ -294,11 +294,11 @@ partiallyUpdateJob.schema = Joi.object()
         jobLocation: Joi.stringAllowEmpty().allow(null),
         jobTimezone: Joi.stringAllowEmpty().allow(null),
         currency: Joi.stringAllowEmpty().allow(null),
-        roleIds: Joi.array().items(Joi.string().uuid().required()).allow(null),
+        roleIds: Joi.array().items(Joi.string().uuid().required()).allow(null)
       })
-      .required(),
+      .required()
   })
-  .required();
+  .required()
 
 /**
  * Fully update job by id
diff --git a/src/services/TeamService.js b/src/services/TeamService.js
index 94865aae..36a30ab7 100644
--- a/src/services/TeamService.js
+++ b/src/services/TeamService.js
@@ -789,7 +789,7 @@ roleSearchRequest.schema = Joi.object()
     currentUser: Joi.object(),
     data: Joi.object().keys({
       roleId: Joi.string().uuid(),
-      jobDescription: Joi.string().max(255),
+      jobDescription: Joi.string().max(2000),
       skills: Joi.array().items(Joi.string().uuid().required()),
       jobTitle: Joi.string().max(100),
       previousRoleSearchRequestId: Joi.string().uuid()
@@ -864,6 +864,12 @@ async function getSkillsByJobDescription (data) {
       if (skill.pattern.test(word)) {
         foundSkills.push(skill.name)
       }
+      // for suffix with 'js'
+      if (!word.endsWith('js') && skill.name.endsWith('js')) {
+        if (skill.pattern.test(word + 'js')) {
+          foundSkills.push(skill.name)
+        }
+      }
     })
   })
   foundSkills = _.uniq(foundSkills)