Merge branch dev into feature/roles-backend-repost

eisbilir · eisbilir · commit 56484f5216d3 · 2021-05-31T18:27:00.000+03:00
diff --git a/config/default.js b/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,
 
diff --git a/docs/Topcoder-bookings-api.postman_collection.json b/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": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
@@ -183,6 +183,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
@@ -605,6 +610,12 @@ paths:
                 "cancelled",
                 "interview",
                 "topcoder-rejected",
+                "applied",
+                "rejected-pre-screen",
+                "skills-test",
+                "phone-screen",
+                "job-closed",
+                "offered"
               ]
           description: The job candidate status.
         - in: query
@@ -3633,6 +3644,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
diff --git a/src/bootstrap.js b/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)
diff --git a/src/common/helper.js b/src/common/helper.js
@@ -1333,21 +1333,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
 }
 
 /**
@@ -1356,17 +1353,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
 }
 
 /**
@@ -1785,7 +1779,7 @@ module.exports = {
   getAuditM2Muser,
   checkIsMemberOfProject,
   getMemberDetailsByHandles,
-  getV3MemberDetailsByHandle,
+  getMemberDetailsByHandle,
   getMemberDetailsByEmails,
   createProjectMember,
   listProjectMembers,
diff --git a/src/controllers/JobController.js b/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)
diff --git a/src/services/JobService.js b/src/services/JobService.js
@@ -376,7 +376,8 @@ async function searchJobs (currentUser, criteria, options = { returnAll: false }
       body: {
         query: {
           bool: {
-            must: []
+            must: [],
+            filter: []
           }
         },
         from: (page - 1) * perPage,
@@ -425,11 +426,19 @@ async function searchJobs (currentUser, criteria, options = { returnAll: false }
     })
     // If criteria contains projectIds, filter projectId with this value
     if (criteria.projectIds) {
-      esQuery.body.query.bool.filter = [{
+      esQuery.body.query.bool.filter.push({
         terms: {
           projectId: criteria.projectIds
         }
-      }]
+      })
+    }
+    // if criteria contains jobIds, filter jobIds with this value
+    if (criteria.jobIds && criteria.jobIds.length > 0) {
+      esQuery.body.query.bool.filter.push({
+        terms: {
+          _id: criteria.jobIds
+        }
+      })
     }
     logger.debug({ component: 'JobService', context: 'searchJobs', message: `Query: ${JSON.stringify(esQuery)}` })
 
@@ -454,7 +463,7 @@ async function searchJobs (currentUser, criteria, options = { returnAll: false }
     logger.logFullError(err, { component: 'JobService', context: 'searchJobs' })
   }
   logger.info({ component: 'JobService', context: 'searchJobs', message: 'fallback to DB query' })
-  const filter = {}
+  const filter = { [Op.and]: [] }
   _.each(_.pick(criteria, [
     'projectId',
     'externalId',
@@ -481,6 +490,9 @@ async function searchJobs (currentUser, criteria, options = { returnAll: false }
       [Op.contains]: [criteria.skill]
     }
   }
+  if (criteria.jobIds && criteria.jobIds.length > 0) {
+    filter[Op.and].push({ id: criteria.jobIds })
+  }
   const jobs = await Job.findAll({
     where: filter,
     offset: ((page - 1) * perPage),
@@ -518,7 +530,8 @@ searchJobs.schema = Joi.object().keys({
     rateType: Joi.rateType(),
     workload: Joi.workload(),
     status: Joi.jobStatus(),
-    projectIds: Joi.array().items(Joi.number().integer()).single()
+    projectIds: Joi.array().items(Joi.number().integer()).single(),
+    jobIds: Joi.array().items(Joi.string().uuid())
   }).required(),
   options: Joi.object()
 }).required()
diff --git a/src/services/PaymentService.js b/src/services/PaymentService.js
@@ -153,7 +153,7 @@ async function activateChallenge (id, token) {
 async function closeChallenge (id, userHandle, token) {
   localLogger.info({ context: 'closeChallenge', message: `Closing challenge ${id}` })
   try {
-    const { userId } = await helper.getV3MemberDetailsByHandle(userHandle)
+    const { userId } = await helper.getMemberDetailsByHandle(userHandle)
     const body = {
       status: constants.ChallengeStatus.COMPLETED,
       winners: [{
diff --git a/src/services/WorkPeriodService.js b/src/services/WorkPeriodService.js
@@ -177,8 +177,9 @@ async function getWorkPeriod (currentUser, id, fromDb = false) {
       if (!resourceBooking.body.hits.total.value) {
         throw new errors.NotFoundError()
       }
-      await _checkUserPermissionForGetWorkPeriod(currentUser, resourceBooking.body.hits.hits[0]._source.workPeriods.projectId) // check user permission
-      return _.find(resourceBooking.body.hits.hits[0]._source.workPeriods, { id })
+      const workPeriod = _.find(resourceBooking.body.hits.hits[0]._source.workPeriods, { id })
+      await _checkUserPermissionForGetWorkPeriod(currentUser, workPeriod.projectId) // check user permission
+      return workPeriod
     } catch (err) {
       if (helper.isDocumentMissingException(err)) {
         throw new errors.NotFoundError(`id: ${id} "WorkPeriod" not found`)
