feat(job-service): accept roles array

config/default.js

@@ -40,7 +40,7 @@ module.exports = {
 
   TOPCODER_USERS_API: process.env.TOPCODER_USERS_API || 'https://api.topcoder-dev.com/v3/users',
   // the api to find topcoder members
-  TOPCODER_MEMBERS_API: process.env.TOPCODER_MEMBERS_API || 'https://api.topcoder-dev.com/v3/members',
+  TOPCODER_MEMBERS_API: process.env.TOPCODER_MEMBERS_API || 'https://api.topcoder-dev.com/v5/members',
   // rate limit of requests to user api
   MAX_PARALLEL_REQUEST_TOPCODER_USERS_API: process.env.MAX_PARALLEL_REQUEST_TOPCODER_USERS_API || 100,
 

data/demo-data.json

@@ -184,7 +184,7 @@
                     "jobCandidateId": "881a19de-2b0c-4bb9-b36a-4cb5e223bdb5",
                     "googleCalendarId": null,
                     "customMessage": null,
-                    "xaiTemplate": "interview-30",
+                    "templateUrl": "interview-30",
                     "round": 1,
                     "startTimestamp": null,
                     "attendeesList": null,
@@ -213,7 +213,7 @@
                     "jobCandidateId": "827ee401-df04-42e1-abbe-7b97ce7937ff",
                     "googleCalendarId": "dummyId",
                     "customMessage": "This is a custom message",
-                    "xaiTemplate": "interview-30",
+                    "templateUrl": "interview-30",
                     "round": 2,
                     "startTimestamp": null,
                     "attendeesList": null,
@@ -228,7 +228,7 @@
                     "jobCandidateId": "827ee401-df04-42e1-abbe-7b97ce7937ff",
                     "googleCalendarId": null,
                     "customMessage": null,
-                    "xaiTemplate": "interview-30",
+                    "templateUrl": "interview-30",
                     "round": 1,
                     "startTimestamp": null,
                     "attendeesList": null,
@@ -257,7 +257,7 @@
                     "jobCandidateId": "a4ea7bcf-5b99-4381-b99c-a9bd05d83a36",
                     "googleCalendarId": "dummyId",
                     "customMessage": "This is a custom message",
-                    "xaiTemplate": "interview-30",
+                    "templateUrl": "interview-30",
                     "round": 3,
                     "startTimestamp": null,
                     "attendeesList": [
@@ -275,7 +275,7 @@
                     "jobCandidateId": "a4ea7bcf-5b99-4381-b99c-a9bd05d83a36",
                     "googleCalendarId": "dummyId",
                     "customMessage": "This is a custom message",
-                    "xaiTemplate": "interview-30",
+                    "templateUrl": "interview-30",
                     "round": 2,
                     "startTimestamp": null,
                     "attendeesList": [
@@ -293,7 +293,7 @@
                     "jobCandidateId": "a4ea7bcf-5b99-4381-b99c-a9bd05d83a36",
                     "googleCalendarId": null,
                     "customMessage": null,
-                    "xaiTemplate": "interview-30",
+                    "templateUrl": "interview-30",
                     "round": 1,
                     "startTimestamp": null,
                     "attendeesList": null,

docs/Topcoder-bookings-api.postman_collection.json

@@ -491,6 +491,113 @@
 					},
 					"response": []
 				},
+				{
+					"name": "search jobs with request body",
+					"protocolProfileBehavior": {
+						"disableBodyPruning": true
+					},
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"type": "text",
+								"value": "Bearer {{token_bookingManager}}"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "{\r\n    \"jobIds\": [\"{{jobId}}\",\"{{jobIdCreatedByM2M}}\"]\r\n}",
+							"options": {
+								"raw": {
+									"language": "json"
+								}
+							}
+						},
+						"url": {
+							"raw": "{{URL}}/jobs",
+							"host": [
+								"{{URL}}"
+							],
+							"path": [
+								"jobs"
+							],
+							"query": [
+								{
+									"key": "page",
+									"value": "0",
+									"disabled": true
+								},
+								{
+									"key": "perPage",
+									"value": "3",
+									"disabled": true
+								},
+								{
+									"key": "sortBy",
+									"value": "id",
+									"disabled": true
+								},
+								{
+									"key": "sortOrder",
+									"value": "asc",
+									"disabled": true
+								},
+								{
+									"key": "projectId",
+									"value": "21",
+									"disabled": true
+								},
+								{
+									"key": "externalId",
+									"value": "1212",
+									"disabled": true
+								},
+								{
+									"key": "description",
+									"value": "Dummy",
+									"disabled": true
+								},
+								{
+									"key": "startDate",
+									"value": "2020-09-27T04:17:23.131Z",
+									"disabled": true
+								},
+								{
+									"key": "resourceType",
+									"value": "Dummy Resource Type",
+									"disabled": true
+								},
+								{
+									"key": "skill",
+									"value": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+									"disabled": true
+								},
+								{
+									"key": "rateType",
+									"value": "hourly",
+									"disabled": true
+								},
+								{
+									"key": "status",
+									"value": "sourcing",
+									"disabled": true
+								},
+								{
+									"key": "workload",
+									"value": "full-time",
+									"disabled": true
+								},
+								{
+									"key": "title",
+									"value": "dummy",
+									"disabled": true
+								}
+							]
+						}
+					},
+					"response": []
+				},
 				{
 					"name": "search jobs with with m2m all",
 					"request": {

docs/swagger.yaml

@@ -181,6 +181,11 @@ paths:
             type: string
             enum: ["sourcing", "in-review", "assigned", "closed", "cancelled"]
           description: The rate type.
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/JobSearchBody"
       responses:
         "200":
           description: OK
@@ -603,6 +608,12 @@ paths:
                 "cancelled",
                 "interview",
                 "topcoder-rejected",
+                "applied",
+                "rejected-pre-screen",
+                "skills-test",
+                "phone-screen",
+                "job-closed",
+                "offered"
               ]
           description: The job candidate status.
         - in: query
@@ -3363,6 +3374,15 @@ components:
           type: string
           example: "topcoder user"
           description: "The user who updated the job last time.(Will get the user info from the token)"
+    JobSearchBody:
+      properties:
+        jobIds:
+          type: array
+          items:
+            type: string
+            format: uuid
+            description: "The array of job ids"
+
     JobRequestBody:
       required:
         - projectId

src/bootstrap.js

@@ -16,7 +16,7 @@ Joi.rateType = () => Joi.string().valid('hourly', 'daily', 'weekly', 'monthly')
 Joi.jobStatus = () => Joi.string().valid('sourcing', 'in-review', 'assigned', 'closed', 'cancelled')
 Joi.resourceBookingStatus = () => Joi.string().valid('placed', 'closed', 'cancelled')
 Joi.workload = () => Joi.string().valid('full-time', 'fractional')
-Joi.jobCandidateStatus = () => Joi.string().valid('open', 'placed', 'selected', 'client rejected - screening', 'client rejected - interview', 'rejected - other', 'cancelled', 'interview', 'topcoder-rejected', 'applied','rejected-pre-screen','skills-test','skills-test','phone-screen','job-closed')
+Joi.jobCandidateStatus = () => Joi.string().valid('open', 'placed', 'selected', 'client rejected - screening', 'client rejected - interview', 'rejected - other', 'cancelled', 'interview', 'topcoder-rejected', 'applied','rejected-pre-screen','skills-test','skills-test','phone-screen','job-closed','offered')
 Joi.title = () => Joi.string().max(128)
 Joi.paymentStatus = () => Joi.string().valid('pending', 'partially-completed', 'completed', 'cancelled')
 Joi.xaiTemplate = () => Joi.string().valid(...allowedXAITemplate)

src/common/helper.js

@@ -111,6 +111,7 @@ esIndexPropertyMapping[config.get('esConfig.ES_INDEX_JOB')] = {
   rateType: { type: 'keyword' },
   workload: { type: 'keyword' },
   skills: { type: 'keyword' },
+  roles: { type: 'keyword' },
   status: { type: 'keyword' },
   isApplicationPageActive: { type: 'boolean' },
   createdAt: { type: 'date' },
@@ -1304,21 +1305,18 @@ async function getMemberDetailsByHandles(handles) {
   }
   const token = await getM2MToken();
   const res = await request
-    .get(`${config.TOPCODER_MEMBERS_API}/_search`)
+    .get(`${config.TOPCODER_MEMBERS_API}/`)
     .query({
-      query: _.map(
-        handles,
-        (handle) => `handleLower:${handle.toLowerCase()}`
-      ).join(' OR '),
-      fields: 'userId,handle,firstName,lastName,email',
+      'handlesLower[]': handles.map(handle => handle.toLowerCase()),
+      fields: 'userId,handle,handleLower,firstName,lastName,email',
     })
     .set('Authorization', `Bearer ${token}`)
     .set('Accept', 'application/json');
   localLogger.debug({
     context: 'getMemberDetailsByHandles',
     message: `response body: ${JSON.stringify(res.body)}`,
   });
-  return _.get(res.body, 'result.content');
+  return res.body;
 }
 
 /**
@@ -1327,17 +1325,14 @@ async function getMemberDetailsByHandles(handles) {
  * @param {String} handle the user handle
  * @returns {Object} the member details
  */
-async function getV3MemberDetailsByHandle(handle) {
-  const token = await getM2MToken();
-  const res = await request
-    .get(`${config.TOPCODER_MEMBERS_API}/${handle}`)
-    .set('Authorization', `Bearer ${token}`)
-    .set('Accept', 'application/json');
-  localLogger.debug({
-    context: 'getV3MemberDetailsByHandle',
-    message: `response body: ${JSON.stringify(res.body)}`,
-  });
-  return _.get(res.body, 'result.content');
+async function getMemberDetailsByHandle(handle) {
+  const [memberDetails] = await getMemberDetailsByHandles([handle])
+
+  if (!memberDetails) {
+    throw new errors.NotFoundError(`Member details are not found by handle "${handle}".`)
+  }
+
+  return memberDetails
 }
 
 /**
@@ -1756,7 +1751,7 @@ module.exports = {
   getAuditM2Muser,
   checkIsMemberOfProject,
   getMemberDetailsByHandles,
-  getV3MemberDetailsByHandle,
+  getMemberDetailsByHandle,
   getMemberDetailsByEmails,
   createProjectMember,
   listProjectMembers,

src/controllers/JobController.js

@@ -57,6 +57,9 @@ async function deleteJob (req, res) {
  * @param res the response
  */
 async function searchJobs (req, res) {
+  if (req.body && req.body.jobIds) {
+    req.query.jobIds = req.body.jobIds
+  }
   const result = await service.searchJobs(req.authUser, req.query)
   helper.setResHeaders(req, res, result)
   res.send(result.result)

src/models/Job.js

@@ -94,6 +94,9 @@ module.exports = (sequelize) => {
         type: Sequelize.JSONB,
         allowNull: false
       },
+      roles: {
+        type: Sequelize.ARRAY(Sequelize.UUID)
+      },
       status: {
         type: Sequelize.STRING(255),
         allowNull: false