Skip to content

Commit 8ce1707

Browse files
authored
Merge pull request #363 from topcoder-platform/fix-empty-string
fix: allow empty string
2 parents ae14315 + 98a5c60 commit 8ce1707

File tree

2 files changed

+35
-31
lines changed

2 files changed

+35
-31
lines changed

src/services/JobCandidateService.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ createJobCandidate.schema = Joi.object().keys({
131131
userId: Joi.string().uuid().required(),
132132
externalId: Joi.string().allow(null),
133133
resume: Joi.string().uri().allow(null),
134-
remark: Joi.string().allow(null)
134+
remark: Joi.stringAllowEmpty().allow(null)
135135
}).required()
136136
}).required()
137137

@@ -178,7 +178,7 @@ partiallyUpdateJobCandidate.schema = Joi.object().keys({
178178
status: Joi.jobCandidateStatus(),
179179
externalId: Joi.string().allow(null),
180180
resume: Joi.string().uri().allow(null),
181-
remark: Joi.string().allow(null)
181+
remark: Joi.stringAllowEmpty().allow(null)
182182
}).required()
183183
}).required()
184184

@@ -206,7 +206,7 @@ fullyUpdateJobCandidate.schema = Joi.object()
206206
status: Joi.jobCandidateStatus().default("open"),
207207
externalId: Joi.string().allow(null).default(null),
208208
resume: Joi.string().uri().allow("").allow(null).default(null),
209-
remark: Joi.stringAllowEmpty().allow(null),
209+
remark: Joi.stringAllowEmpty().allow(null)
210210
})
211211
.required(),
212212
})

src/services/JobService.js

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -270,31 +270,35 @@ async function partiallyUpdateJob (currentUser, id, data) {
270270
return updateJob(currentUser, id, data, false)
271271
}
272272

273-
partiallyUpdateJob.schema = Joi.object().keys({
274-
currentUser: Joi.object().required(),
275-
id: Joi.string().guid().required(),
276-
data: Joi.object().keys({
277-
status: Joi.jobStatus(),
278-
externalId: Joi.string().allow(null),
279-
description: Joi.stringAllowEmpty().allow(null),
280-
title: Joi.title(),
281-
startDate: Joi.date().allow(null),
282-
duration: Joi.number().integer().min(1).allow(null),
283-
numPositions: Joi.number().integer().min(1),
284-
resourceType: Joi.stringAllowEmpty().allow(null),
285-
rateType: Joi.rateType().allow(null),
286-
workload: Joi.workload().allow(null),
287-
skills: Joi.array().items(Joi.string().uuid()),
288-
isApplicationPageActive: Joi.boolean(),
289-
minSalary: Joi.number().integer(),
290-
maxSalary: Joi.number().integer(),
291-
hoursPerWeek: Joi.number().integer(),
292-
jobLocation: Joi.string(),
293-
jobTimezone: Joi.string(),
294-
currency: Joi.string(),
295-
roleIds: Joi.array().items(Joi.string().uuid().required()).allow(null)
296-
}).required()
297-
}).required()
273+
partiallyUpdateJob.schema = Joi.object()
274+
.keys({
275+
currentUser: Joi.object().required(),
276+
id: Joi.string().guid().required(),
277+
data: Joi.object()
278+
.keys({
279+
status: Joi.jobStatus(),
280+
externalId: Joi.string().allow(null),
281+
description: Joi.stringAllowEmpty().allow(null),
282+
title: Joi.title(),
283+
startDate: Joi.date().allow(null),
284+
duration: Joi.number().integer().min(1).allow(null),
285+
numPositions: Joi.number().integer().min(1),
286+
resourceType: Joi.stringAllowEmpty().allow(null),
287+
rateType: Joi.rateType().allow(null),
288+
workload: Joi.workload().allow(null),
289+
skills: Joi.array().items(Joi.string().uuid()),
290+
isApplicationPageActive: Joi.boolean(),
291+
minSalary: Joi.number().integer(),
292+
maxSalary: Joi.number().integer(),
293+
hoursPerWeek: Joi.number().integer(),
294+
jobLocation: Joi.stringAllowEmpty().allow(null),
295+
jobTimezone: Joi.stringAllowEmpty().allow(null),
296+
currency: Joi.stringAllowEmpty().allow(null),
297+
roleIds: Joi.array().items(Joi.string().uuid().required()).allow(null),
298+
})
299+
.required(),
300+
})
301+
.required();
298302

299303
/**
300304
* Fully update job by id
@@ -327,9 +331,9 @@ fullyUpdateJob.schema = Joi.object().keys({
327331
minSalary: Joi.number().integer().allow(null),
328332
maxSalary: Joi.number().integer().allow(null),
329333
hoursPerWeek: Joi.number().integer().allow(null),
330-
jobLocation: Joi.string().allow(null),
331-
jobTimezone: Joi.string().allow(null),
332-
currency: Joi.string().allow(null),
334+
jobLocation: Joi.stringAllowEmpty().allow(null),
335+
jobTimezone: Joi.stringAllowEmpty().allow(null),
336+
currency: Joi.stringAllowEmpty().allow(null),
333337
roleIds: Joi.array().items(Joi.string().uuid().required()).default(null)
334338
}).required()
335339
}).required()

0 commit comments

Comments
 (0)