Merge pull request #31 from imcaizheng/add-workload-field

add workload field to Job model

Author: nkumar-topcoder

docs/Topcoder-bookings-api.postman_collection.json

@@ -145,6 +145,13 @@ paths:
           schema:
             type: string
           description: The skill.
+        - in: query
+          name: workload
+          required: false
+          schema:
+            type: string
+            enum: ['full-time', 'fractional']
+          description: The rate type.
         - in: query
           name: rateType
           required: false
@@ -1479,6 +1486,10 @@ components:
           type: string
           enum: ['hourly', 'daily', 'weekly', 'monthly']
           description: "The rate type of the job."
+        workload:
+          type: string
+          enum: ['full-time', 'fractional']
+          description: "The workload of the job."
         skills:
           type: array
           description: "The skills."
@@ -1557,6 +1568,10 @@ components:
           type: string
           enum: ['hourly', 'daily', 'weekly', 'monthly']
           description: "The rate type of the job."
+        workload:
+          type: string
+          enum: ['full-time', 'fractional']
+          description: "The workload of the job."
         skills:
           type: array
           description: "The skills."
@@ -1654,6 +1669,10 @@ components:
           type: string
           enum: ['hourly', 'daily', 'weekly', 'monthly']
           description: "The rate type of the job."
+        workload:
+          type: string
+          enum: ['full-time', 'fractional']
+          description: "The workload of the job."
         skills:
           type: array
           description: "The skills."

docs/swagger.yaml

@@ -23,6 +23,7 @@ async function createIndex () {
             numPositions: { type: 'integer' },
             resourceType: { type: 'keyword' },
             rateType: { type: 'keyword' },
+            workload: { type: 'keyword' },
             skills: { type: 'keyword' },
             status: { type: 'keyword' },
             createdAt: { type: 'date' },

scripts/createIndex.js

@@ -5,6 +5,7 @@ const logger = require('./common/logger')
 
 Joi.rateType = () => Joi.string().valid('hourly', 'daily', 'weekly', 'monthly')
 Joi.jobStatus = () => Joi.string().valid('sourcing', 'in-review', 'assigned', 'closed', 'cancelled')
+Joi.workload = () => Joi.string().valid('full-time', 'fractional')
 Joi.jobCandidateStatus = () => Joi.string().valid('open', 'selected', 'shortlist', 'rejected')
 
 function buildServices (dir) {

src/bootstrap.js

@@ -98,6 +98,11 @@ module.exports = (sequelize) => {
         type: Sequelize.STRING,
         allowNull: false
       },
+      workload: {
+        field: 'workload',
+        type: Sequelize.STRING,
+        allowNull: false
+      },
       skills: {
         type: Sequelize.JSONB,
         allowNull: false

src/models/Job.js

@@ -142,6 +142,7 @@ createJob.schema = Joi.object().keys({
     numPositions: Joi.number().integer().min(1).required(),
     resourceType: Joi.string().required(),
     rateType: Joi.rateType(),
+    workload: Joi.workload().default('full-time'),
     skills: Joi.array().items(Joi.string().uuid()).required()
   }).required()
 }).required()
@@ -200,6 +201,7 @@ partiallyUpdateJob.schema = Joi.object().keys({
     numPositions: Joi.number().integer().min(1),
     resourceType: Joi.string(),
     rateType: Joi.rateType(),
+    workload: Joi.workload(),
     skills: Joi.array().items(Joi.string().uuid())
   }).required()
 }).required()
@@ -227,6 +229,7 @@ fullyUpdateJob.schema = Joi.object().keys({
     numPositions: Joi.number().integer().min(1).required(),
     resourceType: Joi.string().required(),
     rateType: Joi.rateType().required(),
+    workload: Joi.workload().required(),
     skills: Joi.array().items(Joi.string().uuid()).required(),
     status: Joi.jobStatus()
   }).required()
@@ -286,7 +289,18 @@ async function searchJobs (criteria) {
       }
     }
 
-    _.each(_.pick(criteria, ['projectId', 'externalId', 'description', 'startDate', 'endDate', 'resourceType', 'skill', 'rateType', 'status']), (value, key) => {
+    _.each(_.pick(criteria, [
+      'projectId',
+      'externalId',
+      'description',
+      'startDate',
+      'endDate',
+      'resourceType',
+      'skill',
+      'rateType',
+      'workload',
+      'status'
+    ]), (value, key) => {
       let must
       if (key === 'description') {
         must = {
@@ -347,7 +361,16 @@ async function searchJobs (criteria) {
   const filter = {
     [Op.and]: [{ deletedAt: null }]
   }
-  _.each(_.pick(criteria, ['projectId', 'externalId', 'startDate', 'endDate', 'resourceType', 'rateType', 'status']), (value, key) => {
+  _.each(_.pick(criteria, [
+    'projectId',
+    'externalId',
+    'startDate',
+    'endDate',
+    'resourceType',
+    'rateType',
+    'workload',
+    'status'
+  ]), (value, key) => {
     filter[Op.and].push({ [key]: value })
   })
   if (criteria.description) {
@@ -403,6 +426,7 @@ searchJobs.schema = Joi.object().keys({
     resourceType: Joi.string(),
     skill: Joi.string().uuid(),
     rateType: Joi.rateType(),
+    workload: Joi.workload(),
     status: Joi.jobStatus(),
     projectIds: Joi.array().items(Joi.number().integer()).single()
   }).required()