From 0e55d65e01e600f3a58e98b0cedd0fb36bdb4f06 Mon Sep 17 00:00:00 2001 From: xxcxy Date: Fri, 11 Jun 2021 16:43:44 +0800 Subject: [PATCH 1/2] Include addition param key to Postevent method #329 --- src/services/InterviewProcessorService.js | 2 ++ src/services/JobCandidateProcessorService.js | 2 ++ src/services/JobProcessorService.js | 2 ++ src/services/ResourceBookingProcessorService.js | 2 ++ src/services/RoleProcessorService.js | 2 ++ src/services/WorkPeriodPaymentProcessorService.js | 1 + src/services/WorkPeriodProcessorService.js | 1 + 7 files changed, 12 insertions(+) diff --git a/src/services/InterviewProcessorService.js b/src/services/InterviewProcessorService.js index b7d2e2e..3af01a8 100644 --- a/src/services/InterviewProcessorService.js +++ b/src/services/InterviewProcessorService.js @@ -56,6 +56,7 @@ processRequestInterview.schema = { originator: Joi.string().required(), timestamp: Joi.date().required(), 'mime-type': Joi.string().required(), + key: Joi.string().allow(null), payload: Joi.object().keys({ id: Joi.string().uuid().required(), xaiId: Joi.string().allow(null), @@ -176,6 +177,7 @@ processBulkUpdateInterviews.schema = { originator: Joi.string().required(), timestamp: Joi.date().required(), 'mime-type': Joi.string().required(), + key: Joi.string().allow(null), payload: Joi.object().pattern( Joi.string().uuid(), // key - jobCandidateId Joi.object().pattern( diff --git a/src/services/JobCandidateProcessorService.js b/src/services/JobCandidateProcessorService.js index bde7e88..87e66bf 100644 --- a/src/services/JobCandidateProcessorService.js +++ b/src/services/JobCandidateProcessorService.js @@ -91,6 +91,7 @@ processCreate.schema = { originator: Joi.string().required(), timestamp: Joi.date().required(), 'mime-type': Joi.string().required(), + key: Joi.string().allow(null), payload: Joi.object().keys({ id: Joi.string().uuid().required(), jobId: Joi.string().uuid().required(), @@ -160,6 +161,7 @@ processDelete.schema = { originator: Joi.string().required(), timestamp: Joi.date().required(), 'mime-type': Joi.string().required(), + key: Joi.string().allow(null), payload: Joi.object().keys({ id: Joi.string().uuid().required() }).required() diff --git a/src/services/JobProcessorService.js b/src/services/JobProcessorService.js index 08f5525..1fdb954 100644 --- a/src/services/JobProcessorService.js +++ b/src/services/JobProcessorService.js @@ -65,6 +65,7 @@ processCreate.schema = { originator: Joi.string().required(), timestamp: Joi.date().required(), 'mime-type': Joi.string().required(), + key: Joi.string().allow(null), payload: Joi.object().keys({ id: Joi.string().uuid().required(), projectId: Joi.number().integer().required(), @@ -142,6 +143,7 @@ processDelete.schema = { originator: Joi.string().required(), timestamp: Joi.date().required(), 'mime-type': Joi.string().required(), + key: Joi.string().allow(null), payload: Joi.object().keys({ id: Joi.string().uuid().required() }).required() diff --git a/src/services/ResourceBookingProcessorService.js b/src/services/ResourceBookingProcessorService.js index f407b2b..836e3e1 100644 --- a/src/services/ResourceBookingProcessorService.js +++ b/src/services/ResourceBookingProcessorService.js @@ -32,6 +32,7 @@ processCreate.schema = { originator: Joi.string().required(), timestamp: Joi.date().required(), 'mime-type': Joi.string().required(), + key: Joi.string().allow(null), payload: Joi.object().keys({ id: Joi.string().uuid().required(), projectId: Joi.number().integer().required(), @@ -94,6 +95,7 @@ processDelete.schema = { originator: Joi.string().required(), timestamp: Joi.date().required(), 'mime-type': Joi.string().required(), + key: Joi.string().allow(null), payload: Joi.object().keys({ id: Joi.string().uuid().required() }).required() diff --git a/src/services/RoleProcessorService.js b/src/services/RoleProcessorService.js index cf1386f..b183577 100644 --- a/src/services/RoleProcessorService.js +++ b/src/services/RoleProcessorService.js @@ -32,6 +32,7 @@ processCreate.schema = { originator: Joi.string().required(), timestamp: Joi.date().required(), 'mime-type': Joi.string().required(), + key: Joi.string().allow(null), payload: Joi.object().keys({ id: Joi.string().uuid().required(), name: Joi.string().max(50).required(), @@ -103,6 +104,7 @@ processDelete.schema = { originator: Joi.string().required(), timestamp: Joi.date().required(), 'mime-type': Joi.string().required(), + key: Joi.string().allow(null), payload: Joi.object().keys({ id: Joi.string().uuid().required() }).required() diff --git a/src/services/WorkPeriodPaymentProcessorService.js b/src/services/WorkPeriodPaymentProcessorService.js index 736cacb..e1bc583 100644 --- a/src/services/WorkPeriodPaymentProcessorService.js +++ b/src/services/WorkPeriodPaymentProcessorService.js @@ -62,6 +62,7 @@ processCreate.schema = { originator: Joi.string().required(), timestamp: Joi.date().required(), 'mime-type': Joi.string().required(), + key: Joi.string().allow(null), payload: Joi.object().keys({ id: Joi.string().uuid().required(), workPeriodId: Joi.string().uuid().required(), diff --git a/src/services/WorkPeriodProcessorService.js b/src/services/WorkPeriodProcessorService.js index 8350056..eaff8a9 100644 --- a/src/services/WorkPeriodProcessorService.js +++ b/src/services/WorkPeriodProcessorService.js @@ -201,6 +201,7 @@ processDelete.schema = { originator: Joi.string().required(), timestamp: Joi.date().required(), 'mime-type': Joi.string().required(), + key: Joi.string().allow(null), payload: Joi.object().keys({ id: Joi.string().uuid().required() }).required() From 20ed3dbc2a5c0ec3796bee5438e8c303da38d22e Mon Sep 17 00:00:00 2001 From: Maksym Mykhailenko Date: Fri, 11 Jun 2021 13:35:24 +0300 Subject: [PATCH 2/2] fix: lint --- config/test.js | 2 +- src/bootstrap.js | 2 +- src/services/JobCandidateProcessorService.js | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/test.js b/config/test.js index 3ca4ffe..c5b51db 100644 --- a/config/test.js +++ b/config/test.js @@ -8,5 +8,5 @@ module.exports = { ZAPIER_JOB_CANDIDATE_SWITCH: process.env.ZAPIER_JOB_CANDIDATE_SWITCH || 'ON' }, // don't retry actions during tests because tests for now don't expect it and should be updated first - MAX_RETRY: 0, + MAX_RETRY: 0 } diff --git a/src/bootstrap.js b/src/bootstrap.js index 0ded4b9..8b9bf51 100644 --- a/src/bootstrap.js +++ b/src/bootstrap.js @@ -9,7 +9,7 @@ const allowedInterviewStatuses = _.values(Interview.Status) global.Promise = require('bluebird') -Joi.rateType = () => Joi.string().valid('hourly', 'daily', 'weekly', 'monthly','annual') +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') diff --git a/src/services/JobCandidateProcessorService.js b/src/services/JobCandidateProcessorService.js index dfa9b97..5e6a044 100644 --- a/src/services/JobCandidateProcessorService.js +++ b/src/services/JobCandidateProcessorService.js @@ -91,7 +91,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(), key: Joi.string().allow(null), payload: Joi.object() .keys({ @@ -107,10 +107,10 @@ processCreate.schema = { resume: Joi.string().uri().allow(null).allow(''), remark: Joi.string().allow(null).allow('') }) - .required(), + .required() }) .required(), - transactionId: Joi.string().required(), + transactionId: Joi.string().required() } /**