From 0f8fa514da28762a7a2956a4a0c8ff06eb694628 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Fri, 18 Jun 2021 12:23:55 +0530 Subject: [PATCH 1/2] fix: allow empty for job locations and job timezone --- src/services/JobService.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/services/JobService.js b/src/services/JobService.js index 3348a295..aca7dcae 100644 --- a/src/services/JobService.js +++ b/src/services/JobService.js @@ -208,9 +208,9 @@ createJob.schema = Joi.object() minSalary: Joi.number().integer().allow(null), maxSalary: Joi.number().integer().allow(null), hoursPerWeek: Joi.number().integer().allow(null), - jobLocation: Joi.string().allow(null).allow(''), - jobTimezone: Joi.string().allow(null).allow(''), - currency: Joi.string().allow(null).allow(''), + jobLocation: Joi.stringAllowEmpty().allow(null), + jobTimezone: Joi.stringAllowEmpty().allow(null), + currency: Joi.stringAllowEmpty().allow(null), roleIds: Joi.array().items(Joi.string().uuid().required()), }) .required(), From 9a268400477c56fd7b9056ff62884f1849cc8849 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Fri, 18 Jun 2021 12:26:47 +0530 Subject: [PATCH 2/2] fix: allow empty for job locations and job timezone --- src/services/JobCandidateService.js | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/services/JobCandidateService.js b/src/services/JobCandidateService.js index 9a152c49..5ca4df1d 100644 --- a/src/services/JobCandidateService.js +++ b/src/services/JobCandidateService.js @@ -195,18 +195,22 @@ async function fullyUpdateJobCandidate (currentUser, id, data) { return updateJobCandidate(currentUser, id, data) } -fullyUpdateJobCandidate.schema = Joi.object().keys({ - currentUser: Joi.object().required(), - id: Joi.string().uuid().required(), - data: Joi.object().keys({ - jobId: Joi.string().uuid().required(), - userId: Joi.string().uuid().required(), - status: Joi.jobCandidateStatus().default('open'), - externalId: Joi.string().allow(null).default(null), - resume: Joi.string().uri().allow('').allow(null).default(null), - remark: Joi.string().allow('').allow(null).default(null) - }).required() -}).required() +fullyUpdateJobCandidate.schema = Joi.object() + .keys({ + currentUser: Joi.object().required(), + id: Joi.string().uuid().required(), + data: Joi.object() + .keys({ + jobId: Joi.string().uuid().required(), + userId: Joi.string().uuid().required(), + status: Joi.jobCandidateStatus().default("open"), + externalId: Joi.string().allow(null).default(null), + resume: Joi.string().uri().allow("").allow(null).default(null), + remark: Joi.stringAllowEmpty().allow(null), + }) + .required(), + }) + .required(); /** * Delete jobCandidate by id