Merge pull request #280 from topcoder-platform/feature/role-intake

urwithat · web-flow · commit 59c6e41ea452 · 2021-06-02T11:15:04.000+05:30
Feature/role intake
diff --git a/data/demo-data.json b/data/demo-data.json
@@ -708,9 +708,6 @@
                     "id": "077aa2ca-5b60-4ad9-a965-1b37e08a5046",
                     "xaiId": null,
                     "jobCandidateId": "881a19de-2b0c-4bb9-b36a-4cb5e223bdb5",
-                    "googleCalendarId": null,
-                    "customMessage": null,
-                    "templateUrl": "interview-30",
                     "calendarEventId": null,
                     "templateUrl": "interview-30",
                     "templateId": null,
@@ -752,9 +749,6 @@
                     "id": "b1f7ba76-640f-47e2-9463-59e51b51ec60",
                     "xaiId": null,
                     "jobCandidateId": "827ee401-df04-42e1-abbe-7b97ce7937ff",
-                    "googleCalendarId": "dummyId",
-                    "customMessage": "This is a custom message",
-                    "templateUrl": "interview-30",
                     "calendarEventId": null,
                     "templateUrl": "interview-30",
                     "templateId": null,
@@ -781,9 +775,6 @@
                     "id": "3144fa65-ea1a-4bec-81b0-7cb1c8845826",
                     "xaiId": null,
                     "jobCandidateId": "827ee401-df04-42e1-abbe-7b97ce7937ff",
-                    "googleCalendarId": null,
-                    "customMessage": null,
-                    "templateUrl": "interview-30",
                     "calendarEventId": null,
                     "templateUrl": "interview-30",
                     "templateId": null,
@@ -825,9 +816,6 @@
                     "id": "976d23a9-5710-453f-99d9-f57a588bb610",
                     "xaiId": null,
                     "jobCandidateId": "a4ea7bcf-5b99-4381-b99c-a9bd05d83a36",
-                    "googleCalendarId": "dummyId",
-                    "customMessage": "This is a custom message",
-                    "templateUrl": "interview-30",
                     "calendarEventId": null,
                     "templateUrl": "interview-30",
                     "templateId": null,
@@ -854,9 +842,6 @@
                     "id": "a23e1bf2-1084-4cfe-a0d8-d83bc6fec655",
                     "xaiId": null,
                     "jobCandidateId": "a4ea7bcf-5b99-4381-b99c-a9bd05d83a36",
-                    "googleCalendarId": "dummyId",
-                    "customMessage": "This is a custom message",
-                    "templateUrl": "interview-30",
                     "calendarEventId": null,
                     "templateUrl": "interview-30",
                     "templateId": null,
@@ -883,9 +868,6 @@
                     "id": "9efd72c3-1dc7-4ce2-9869-8cca81d0adeb",
                     "xaiId": null,
                     "jobCandidateId": "a4ea7bcf-5b99-4381-b99c-a9bd05d83a36",
-                    "googleCalendarId": null,
-                    "customMessage": null,
-                    "templateUrl": "interview-30",
                     "calendarEventId": null,
                     "templateUrl": "interview-30",
                     "templateId": null,
diff --git a/src/services/JobService.js b/src/services/JobService.js
@@ -411,6 +411,7 @@ async function searchJobs (currentUser, criteria, options = { returnAll: false }
       'startDate',
       'resourceType',
       'skill',
+      'role',
       'rateType',
       'workload',
       'title',
@@ -425,10 +426,10 @@ async function searchJobs (currentUser, criteria, options = { returnAll: false }
             }
           }
         }
-      } else if (key === 'skill') {
+      } else if (key === 'skill' || key === 'role') {
         must = {
           terms: {
-            skills: [value]
+            [`${key}s`]: [value]
           }
         }
       } else {
@@ -508,6 +509,11 @@ async function searchJobs (currentUser, criteria, options = { returnAll: false }
       [Op.contains]: [criteria.skill]
     }
   }
+  if (criteria.role) {
+    filter.roles = {
+      [Op.contains]: [criteria.role]
+    }
+  }
   if (criteria.jobIds && criteria.jobIds.length > 0) {
     filter[Op.and].push({ id: criteria.jobIds })
   }
@@ -545,6 +551,7 @@ searchJobs.schema = Joi.object().keys({
     startDate: Joi.date(),
     resourceType: Joi.string(),
     skill: Joi.string().uuid(),
+    role: Joi.string().uuid(),
     rateType: Joi.rateType(),
     workload: Joi.workload(),
     status: Joi.jobStatus(),

Original file line number	Diff line number	Diff line change
`@@ -411,6 +411,7 @@ async function searchJobs (currentUser, criteria, options = { returnAll: false }`
`411`	`411`	`'startDate',`
`412`	`412`	`'resourceType',`
`413`	`413`	`'skill',`
	`414`	`+ 'role',`
`414`	`415`	`'rateType',`
`415`	`416`	`'workload',`
`416`	`417`	`'title',`
`@@ -425,10 +426,10 @@ async function searchJobs (currentUser, criteria, options = { returnAll: false }`
`425`	`426`	`}`
`426`	`427`	`}`
`427`	`428`	`}`
`428`		`- } else if (key === 'skill') {`
	`429`	`+ } else if (key === 'skill' \|\| key === 'role') {`
`429`	`430`	`must = {`
`430`	`431`	`terms: {`
`431`		`- skills: [value]`
	`432`	+ [`${key}s`]: [value]
`432`	`433`	`}`
`433`	`434`	`}`
`434`	`435`	`} else {`
`@@ -508,6 +509,11 @@ async function searchJobs (currentUser, criteria, options = { returnAll: false }`
`508`	`509`	`[Op.contains]: [criteria.skill]`
`509`	`510`	`}`
`510`	`511`	`}`
	`512`	`+ if (criteria.role) {`
	`513`	`+ filter.roles = {`
	`514`	`+ [Op.contains]: [criteria.role]`
	`515`	`+ }`
	`516`	`+ }`
`511`	`517`	`if (criteria.jobIds && criteria.jobIds.length > 0) {`
`512`	`518`	`filter[Op.and].push({ id: criteria.jobIds })`
`513`	`519`	`}`
`@@ -545,6 +551,7 @@ searchJobs.schema = Joi.object().keys({`
`545`	`551`	`startDate: Joi.date(),`
`546`	`552`	`resourceType: Joi.string(),`
`547`	`553`	`skill: Joi.string().uuid(),`
	`554`	`+ role: Joi.string().uuid(),`
`548`	`555`	`rateType: Joi.rateType(),`
`549`	`556`	`workload: Joi.workload(),`
`550`	`557`	`status: Joi.jobStatus(),`