Skip to content

[PROD] Release 1.5 #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Feb 25, 2021
Merged

[PROD] Release 1.5 #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
181960f
include a new duration field
imcaizheng Jan 26, 2021
6567ede
Merge pull request #16 from imcaizheng/add-duration-field
maxceem Jan 26, 2021
8bfab60
Revert "include a new duration field"
maxceem Jan 27, 2021
6ffb3e0
Merge pull request #17 from topcoder-platform/revert-16-add-duration-…
maxceem Jan 27, 2021
96bcad1
Include the `id` field inside the body of a document
imcaizheng Feb 4, 2021
f93df4f
Merge pull request #21 from imcaizheng/include-id-field-when-index
maxceem Feb 4, 2021
7baecca
fix: allow empty "description" and "resourceType"
maxceem Feb 4, 2021
a86c978
Update joi schemas to allow null values
imcaizheng Feb 6, 2021
ab71b37
Merge pull request #23 from imcaizheng/joi-schemas-allow-null
maxceem Feb 7, 2021
02ce93e
fix: allow null for "resume"
maxceem Feb 7, 2021
d4acb50
Remove `endDate` from Job and add `duration` to Job
imcaizheng Feb 9, 2021
cac295b
Merge pull request #25 from imcaizheng/job-replace-end-date-with-dura…
nkumar-topcoder Feb 10, 2021
5b0985d
add duration to ES mapping for job
imcaizheng Feb 10, 2021
cfbdc0b
Merge pull request #26 from imcaizheng/job-replace-end-date-with-dura…
maxceem Feb 10, 2021
a3baa42
Merge branch 'master' into dev
maxceem Feb 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ Joi.jobStatus = () => Joi.string().valid('sourcing', 'in-review', 'assigned', 'c
Joi.jobCandidateStatus = () => Joi.string().valid('open', 'selected', 'shortlist', 'rejected', 'cancelled', 'interview')
Joi.workload = () => Joi.string().valid('full-time', 'fractional')
Joi.title = () => Joi.string().max(128)
// Empty string is not allowed by Joi by default and must be enabled with allow('').
// See https://joi.dev/api/?v=17.3.0#string fro details why it's like this.
// In many cases we would like to allow empty string to make it easier to create UI for editing data.
Joi.stringAllowEmpty = () => Joi.string().allow('')

const zapierSwitch = Joi.string().label('ZAPIER_SWITCH').valid(...Object.values(constants.Zapier.Switch))

Expand Down
2 changes: 1 addition & 1 deletion src/scripts/createIndex.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ async function createIndex () {
description: { type: 'text' },
title: { type: 'text' },
startDate: { type: 'date' },
endDate: { type: 'date' },
duration: { type: 'integer' },
numPositions: { type: 'integer' },
resourceType: { type: 'keyword' },
rateType: { type: 'keyword' },
Expand Down
31 changes: 7 additions & 24 deletions src/services/JobCandidateProcessorService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
* Jobcandidate Processor Service
*/

const _ = require('lodash')
const Joi = require('@hapi/joi')
const logger = require('../common/logger')
const helper = require('../common/helper')
Expand Down Expand Up @@ -80,7 +79,7 @@ async function processCreate (message, transactionId) {
index: config.get('esConfig.ES_INDEX_JOB_CANDIDATE'),
id: jobcandidate.id,
transactionId,
body: _.omit(jobcandidate, 'id'),
body: jobcandidate,
refresh: constants.esRefreshOption
})
}
Expand All @@ -97,9 +96,11 @@ processCreate.schema = {
userId: Joi.string().uuid().required(),
createdAt: Joi.date().required(),
createdBy: Joi.string().uuid().required(),
updatedAt: Joi.date().allow(null),
updatedBy: Joi.string().uuid().allow(null),
status: Joi.jobCandidateStatus().required(),
externalId: Joi.string(),
resume: Joi.string().uri()
externalId: Joi.string().allow(null),
resume: Joi.string().uri().allow(null)
}).required()
}).required(),
transactionId: Joi.string().required()
Expand All @@ -117,7 +118,7 @@ async function processUpdate (message, transactionId) {
id: data.id,
transactionId,
body: {
doc: _.omit(data, ['id'])
doc: data
},
refresh: constants.esRefreshOption
})
Expand All @@ -127,25 +128,7 @@ async function processUpdate (message, transactionId) {
})
}

processUpdate.schema = {
message: Joi.object().keys({
topic: Joi.string().required(),
originator: Joi.string().required(),
timestamp: Joi.date().required(),
'mime-type': Joi.string().required(),
payload: Joi.object().keys({
id: Joi.string().uuid(),
jobId: Joi.string().uuid(),
userId: Joi.string().uuid(),
status: Joi.jobCandidateStatus(),
externalId: Joi.string(),
resume: Joi.string().uri(),
updatedAt: Joi.date(),
updatedBy: Joi.string().uuid()
}).required()
}).required(),
transactionId: Joi.string().required()
}
processUpdate.schema = processCreate.schema

/**
* Process delete entity message
Expand Down
48 changes: 12 additions & 36 deletions src/services/JobProcessorService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
* Job Processor Service
*/

const _ = require('lodash')
const Joi = require('@hapi/joi')
const logger = require('../common/logger')
const helper = require('../common/helper')
Expand Down Expand Up @@ -51,7 +50,7 @@ async function processCreate (message, transactionId) {
index: config.get('esConfig.ES_INDEX_JOB'),
id: job.id,
transactionId,
body: _.omit(job, 'id'),
body: job,
refresh: constants.esRefreshOption
})
await postMessageToZapier({
Expand All @@ -69,18 +68,20 @@ processCreate.schema = {
payload: Joi.object().keys({
id: Joi.string().uuid().required(),
projectId: Joi.number().integer().required(),
externalId: Joi.string(),
description: Joi.string(),
externalId: Joi.string().allow(null),
description: Joi.stringAllowEmpty().allow(null),
title: Joi.title().required(),
startDate: Joi.date(),
endDate: Joi.date(),
startDate: Joi.date().allow(null),
duration: Joi.number().integer().min(1).allow(null),
numPositions: Joi.number().integer().min(1).required(),
resourceType: Joi.string(),
rateType: Joi.rateType(),
workload: Joi.workload(),
resourceType: Joi.stringAllowEmpty().allow(null),
rateType: Joi.rateType().allow(null),
workload: Joi.workload().allow(null),
skills: Joi.array().items(Joi.string().uuid()).required(),
createdAt: Joi.date().required(),
createdBy: Joi.string().uuid().required(),
updatedAt: Joi.date().allow(null),
updatedBy: Joi.string().uuid().allow(null),
status: Joi.jobStatus().required()
}).required()
}).required(),
Expand All @@ -99,7 +100,7 @@ async function processUpdate (message, transactionId) {
id: data.id,
transactionId,
body: {
doc: _.omit(data, ['id'])
doc: data
},
refresh: constants.esRefreshOption
})
Expand All @@ -109,32 +110,7 @@ async function processUpdate (message, transactionId) {
})
}

processUpdate.schema = {
message: Joi.object().keys({
topic: Joi.string().required(),
originator: Joi.string().required(),
timestamp: Joi.date().required(),
'mime-type': Joi.string().required(),
payload: Joi.object().keys({
id: Joi.string().uuid().required(),
projectId: Joi.number().integer(),
externalId: Joi.string(),
description: Joi.string(),
title: Joi.title(),
startDate: Joi.date(),
endDate: Joi.date(),
numPositions: Joi.number().integer().min(1),
resourceType: Joi.string(),
rateType: Joi.rateType(),
workload: Joi.workload(),
skills: Joi.array().items(Joi.string().uuid()),
status: Joi.jobStatus(),
updatedAt: Joi.date(),
updatedBy: Joi.string().uuid()
}).required()
}).required(),
transactionId: Joi.string().required()
}
processUpdate.schema = processCreate.schema

/**
* Process delete entity message
Expand Down
41 changes: 10 additions & 31 deletions src/services/ResourceBookingProcessorService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
* ResourceBooking Processor Service
*/

const _ = require('lodash')
const Joi = require('@hapi/joi')
const logger = require('../common/logger')
const helper = require('../common/helper')
Expand All @@ -22,7 +21,7 @@ async function processCreate (message, transactionId) {
index: config.get('esConfig.ES_INDEX_RESOURCE_BOOKING'),
id: resourcebooking.id,
transactionId,
body: _.omit(resourcebooking, 'id'),
body: resourcebooking,
refresh: constants.esRefreshOption
})
}
Expand All @@ -37,14 +36,16 @@ processCreate.schema = {
id: Joi.string().uuid().required(),
projectId: Joi.number().integer().required(),
userId: Joi.string().uuid().required(),
jobId: Joi.string().uuid(),
startDate: Joi.date(),
endDate: Joi.date(),
memberRate: Joi.number(),
customerRate: Joi.number(),
jobId: Joi.string().uuid().allow(null),
startDate: Joi.date().allow(null),
endDate: Joi.date().allow(null),
memberRate: Joi.number().allow(null),
customerRate: Joi.number().allow(null),
rateType: Joi.rateType().required(),
createdAt: Joi.date().required(),
createdBy: Joi.string().uuid().required(),
updatedAt: Joi.date().allow(null),
updatedBy: Joi.string().uuid().allow(null),
status: Joi.jobStatus().required()
}).required()
}).required(),
Expand All @@ -63,35 +64,13 @@ async function processUpdate (message, transactionId) {
id: data.id,
transactionId,
body: {
doc: _.omit(data, ['id'])
doc: data
},
refresh: constants.esRefreshOption
})
}

processUpdate.schema = {
message: Joi.object().keys({
topic: Joi.string().required(),
originator: Joi.string().required(),
timestamp: Joi.date().required(),
'mime-type': Joi.string().required(),
payload: Joi.object().keys({
id: Joi.string().uuid().required(),
projectId: Joi.number().integer(),
userId: Joi.string().uuid(),
jobId: Joi.string().uuid(),
startDate: Joi.date(),
endDate: Joi.date(),
memberRate: Joi.number(),
customerRate: Joi.number(),
rateType: Joi.rateType(),
status: Joi.jobStatus(),
updatedAt: Joi.date(),
updatedBy: Joi.string().uuid()
}).required()
}).required(),
transactionId: Joi.string().required()
}
processUpdate.schema = processCreate.schema

/**
* Process delete entity message
Expand Down