Skip to content

Commit e845cef

Browse files
committed
Merge branch 'dev' into feature/weekly-surveys
# Conflicts: # src/services/WorkPeriodProcessorService.js
2 parents aae8f75 + dab8d4c commit e845cef

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/scripts/createIndex.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ async function createIndex () {
107107
memberRate: { type: 'float' },
108108
customerRate: { type: 'float' },
109109
rateType: { type: 'keyword' },
110-
billingAccountId: { type: 'integer' },
110+
billingAccountId: { type: 'integer', null_value: 0 },
111111
workPeriods: {
112112
type: 'nested',
113113
properties: {

src/services/JobCandidateProcessorService.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ async function updateCandidateStatus ({ type, payload, previousData }) {
2626
return
2727
}
2828
// if (!['rejected', 'shortlist',].includes(payload.status)) {
29-
if (!['client rejected - screening', 'client rejected - interview', 'interview', 'selected'].includes(payload.status)) {
29+
if (!['client rejected - screening', 'client rejected - interview', 'interview', 'selected', 'withdrawn', 'withdrawn-prescreen'].includes(payload.status)) {
3030
localLogger.debug({ context: 'updateCandidateStatus', message: `not interested status: ${payload.status}` })
3131
return
3232
}

src/services/WorkPeriodPaymentProcessorService.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ processCreate.schema = {
6262
challengeId: Joi.string().uuid().allow(null),
6363
memberRate: Joi.number().required(),
6464
customerRate: Joi.number().allow(null),
65-
days: Joi.number().integer().min(1).max(5).required(),
65+
days: Joi.number().integer().min(0).max(10).required(),
6666
amount: Joi.number().greater(0).allow(null),
6767
status: Joi.workPeriodPaymentStatus().required(),
6868
billingAccountId: Joi.number().allow(null),

src/services/WorkPeriodProcessorService.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ processCreate.schema = {
7777
errorCode: Joi.number().integer().min(0),
7878
errorMessage: Joi.string()
7979
}).allow(null),
80-
daysWorked: Joi.number().integer().min(0).max(5).required(),
81-
daysPaid: Joi.number().integer().min(0).max(5).required(),
80+
daysWorked: Joi.number().integer().min(0).max(10).required(),
81+
daysPaid: Joi.number().integer().min(0).max(10).required(),
8282
paymentTotal: Joi.number().min(0).required(),
8383
paymentStatus: Joi.paymentStatus().required(),
8484
createdAt: Joi.date().required(),

0 commit comments

Comments
 (0)