From c7a47a2ca365786e373fa8ac0d59dcb4d3ab7fa8 Mon Sep 17 00:00:00 2001 From: xxcxy Date: Wed, 26 May 2021 23:22:56 +0800 Subject: [PATCH] Payments - Batch Endpoints --- src/bootstrap.js | 4 ++-- src/services/WorkPeriodPaymentProcessorService.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bootstrap.js b/src/bootstrap.js index be0d1c8..005795e 100644 --- a/src/bootstrap.js +++ b/src/bootstrap.js @@ -12,13 +12,13 @@ global.Promise = require('bluebird') Joi.rateType = () => Joi.string().valid('hourly', 'daily', 'weekly', 'monthly') 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') +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') Joi.workload = () => Joi.string().valid('full-time', 'fractional') Joi.title = () => Joi.string().max(128) Joi.paymentStatus = () => Joi.string().valid('pending', 'partially-completed', 'completed', 'cancelled') Joi.xaiTemplate = () => Joi.string().valid(...allowedXAITemplates) Joi.interviewStatus = () => Joi.string().valid(...allowedInterviewStatuses) -Joi.workPeriodPaymentStatus = () => Joi.string().valid('completed', 'cancelled') +Joi.workPeriodPaymentStatus = () => Joi.string().valid('completed', 'scheduled', 'cancelled') // Empty string is not allowed by Joi by default and must be enabled with allow(''). // See https://joi.dev/api/?v=17.3.0#string fro details why it's like this. // In many cases we would like to allow empty string to make it easier to create UI for editing data. diff --git a/src/services/WorkPeriodPaymentProcessorService.js b/src/services/WorkPeriodPaymentProcessorService.js index 7f30b6e..736cacb 100644 --- a/src/services/WorkPeriodPaymentProcessorService.js +++ b/src/services/WorkPeriodPaymentProcessorService.js @@ -65,7 +65,7 @@ processCreate.schema = { payload: Joi.object().keys({ id: Joi.string().uuid().required(), workPeriodId: Joi.string().uuid().required(), - challengeId: Joi.string().uuid().required(), + challengeId: Joi.string().uuid().allow(null), amount: Joi.number().greater(0).allow(null), status: Joi.workPeriodPaymentStatus().required(), billingAccountId: Joi.number().allow(null),