diff --git a/src/scripts/createIndex.js b/src/scripts/createIndex.js index 1cb89ce..9aaa396 100644 --- a/src/scripts/createIndex.js +++ b/src/scripts/createIndex.js @@ -103,6 +103,7 @@ async function createIndex () { status: { type: 'keyword' }, startDate: { type: 'date', format: 'yyyy-MM-dd' }, endDate: { type: 'date', format: 'yyyy-MM-dd' }, + sendWeeklySurvey: { type: 'boolean' }, memberRate: { type: 'float' }, customerRate: { type: 'float' }, rateType: { type: 'keyword' }, @@ -116,6 +117,14 @@ async function createIndex () { normalizer: 'lowercaseNormalizer' }, projectId: { type: 'integer' }, userId: { type: 'keyword' }, + sentSurvey: { type: 'boolean' }, + sentSurveyError: { + type: 'nested', + properties: { + errorCode: { type: 'integer' }, + errorMessage: { type: 'keyword' } + } + }, startDate: { type: 'date', format: 'yyyy-MM-dd' }, endDate: { type: 'date', format: 'yyyy-MM-dd' }, daysWorked: { type: 'integer' }, diff --git a/src/services/JobCandidateProcessorService.js b/src/services/JobCandidateProcessorService.js index 8da4cd7..bb73c8e 100644 --- a/src/services/JobCandidateProcessorService.js +++ b/src/services/JobCandidateProcessorService.js @@ -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() }) diff --git a/src/services/JobProcessorService.js b/src/services/JobProcessorService.js index dd40822..9e9cfd0 100644 --- a/src/services/JobProcessorService.js +++ b/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 diff --git a/src/services/ResourceBookingProcessorService.js b/src/services/ResourceBookingProcessorService.js index 836e3e1..f81c231 100644 --- a/src/services/ResourceBookingProcessorService.js +++ b/src/services/ResourceBookingProcessorService.js @@ -37,6 +37,7 @@ processCreate.schema = { id: Joi.string().uuid().required(), projectId: Joi.number().integer().required(), userId: Joi.string().uuid().required(), + sendWeeklySurvey: Joi.boolean().required(), jobId: Joi.string().uuid().allow(null), startDate: Joi.string().regex(/^(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$/).allow(null), endDate: Joi.string().regex(/^(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$/).allow(null), diff --git a/src/services/WorkPeriodProcessorService.js b/src/services/WorkPeriodProcessorService.js index bcf6fc9..a6f9215 100644 --- a/src/services/WorkPeriodProcessorService.js +++ b/src/services/WorkPeriodProcessorService.js @@ -72,6 +72,11 @@ processCreate.schema = { projectId: Joi.number().integer().required(), startDate: Joi.string().required(), endDate: Joi.string().required(), + sentSurvey: Joi.boolean().required(), + sentSurveyError: Joi.object().keys({ + errorCode: Joi.number().integer().min(0), + errorMessage: Joi.string() + }).allow(null), daysWorked: Joi.number().integer().min(0).max(5).required(), daysPaid: Joi.number().integer().min(0).max(5).required(), paymentTotal: Joi.number().min(0).required(),