Merge pull request #88 from topcoder-platform/dev

[PROD] Next Release

Author: urwithat

src/bootstrap.js

@@ -12,7 +12,7 @@ global.Promise = require('bluebird')
 Joi.rateType = () => Joi.string().valid('hourly', 'daily', 'weekly', 'monthly', 'annual')
 Joi.jobStatus = () => Joi.string().valid('sourcing', 'in-review', 'assigned', 'closed', 'cancelled')
 Joi.resourceBookingStatus = () => Joi.string().valid('placed', 'closed', 'cancelled')
-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.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', 'withdrawn', 'withdrawn-prescreen')
 Joi.workload = () => Joi.string().valid('full-time', 'fractional')
 Joi.title = () => Joi.string().max(128)
 Joi.paymentStatus = () => Joi.string().valid('pending', 'in-progress', 'partially-completed', 'completed', 'failed', 'no-days')

src/services/JobCandidateProcessorService.js

@@ -26,7 +26,7 @@ async function updateCandidateStatus ({ type, payload, previousData }) {
     return
   }
   // if (!['rejected', 'shortlist',].includes(payload.status)) {
-  if (!['client rejected - screening', 'client rejected - interview', 'interview', 'selected'].includes(payload.status)) {
+  if (!['client rejected - screening', 'client rejected - interview', 'interview', 'selected', 'withdrawn', 'withdrawn-prescreen'].includes(payload.status)) {
     localLogger.debug({ context: 'updateCandidateStatus', message: `not interested status: ${payload.status}` })
     return
   }
@@ -104,8 +104,8 @@ processCreate.schema = {
           updatedBy: Joi.string().uuid().allow(null),
           status: Joi.jobCandidateStatus().required(),
           externalId: Joi.string().allow(null),
-          resume: Joi.string().uri().allow(null).allow(""),
-          remark: Joi.stringAllowEmpty().allow(null),
+          resume: Joi.string().uri().allow(null).allow(''),
+          remark: Joi.stringAllowEmpty().allow(null)
         })
         .required()
     })

src/services/JobProcessorService.js

@@ -65,7 +65,7 @@ processCreate.schema = {
       topic: Joi.string().required(),
       originator: Joi.string().required(),
       timestamp: Joi.date().required(),
-      "mime-type": Joi.string().required(),
+      'mime-type': Joi.string().required(),
       payload: Joi.object()
         .keys({
           id: Joi.string().uuid().required(),
@@ -95,13 +95,13 @@ processCreate.schema = {
           currency: Joi.stringAllowEmpty().allow(null),
           roleIds: Joi.array()
             .items(Joi.string().uuid().required())
-            .allow(null),
+            .allow(null)
         })
-        .required(),
+        .required()
     })
     .required(),
-  transactionId: Joi.string().required(),
-};
+  transactionId: Joi.string().required()
+}
 
 /**
  * Process update entity message

src/services/RoleProcessorService.js

@@ -42,10 +42,13 @@ processCreate.schema = {
         global: Joi.smallint().required(),
         inCountry: Joi.smallint().required(),
         offShore: Joi.smallint().required(),
+        niche: Joi.smallint().allow(null),
         rate30Global: Joi.smallint().allow(null),
+        rate30Niche: Joi.smallint().allow(null),
         rate30InCountry: Joi.smallint().allow(null),
         rate30OffShore: Joi.smallint().allow(null),
         rate20Global: Joi.smallint().allow(null),
+        rate20Niche: Joi.smallint().allow(null),
         rate20InCountry: Joi.smallint().allow(null),
         rate20OffShore: Joi.smallint().allow(null)
       }).required()).required(),