Merge pull request #81 from topcoder-platform/feature/work-periods-automation

Work periods automation

Author: nkumar-topcoder

src/bootstrap.js

@@ -15,7 +15,7 @@ Joi.resourceBookingStatus = () => Joi.string().valid('placed', 'closed', 'cancel
 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')
 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.paymentStatus = () => Joi.string().valid('pending', 'in-progress', 'partially-completed', 'completed', 'failed', 'no-days')
 Joi.xaiTemplate = () => Joi.string().valid(...allowedXAITemplates)
 Joi.interviewStatus = () => Joi.string().valid(...allowedInterviewStatuses)
 Joi.workPeriodPaymentStatus = () => Joi.string().valid('completed', 'scheduled', 'in-progress', 'failed', 'cancelled')

src/scripts/createIndex.js

@@ -119,15 +119,18 @@ async function createIndex () {
                 startDate: { type: 'date', format: 'yyyy-MM-dd' },
                 endDate: { type: 'date', format: 'yyyy-MM-dd' },
                 daysWorked: { type: 'integer' },
-                memberRate: { type: 'float' },
-                customerRate: { type: 'float' },
+                daysPaid: { type: 'integer' },
+                paymentTotal: { type: 'float' },
                 paymentStatus: { type: 'keyword' },
                 payments: {
                   type: 'nested',
                   properties: {
                     id: { type: 'keyword' },
                     workPeriodId: { type: 'keyword' },
                     challengeId: { type: 'keyword' },
+                    memberRate: { type: 'float' },
+                    customerRate: { type: 'float' },
+                    days: { type: 'integer' },
                     amount: { type: 'float' },
                     status: { type: 'keyword' },
                     statusDetails: {

src/services/WorkPeriodPaymentProcessorService.js

@@ -60,6 +60,9 @@ processCreate.schema = {
       id: Joi.string().uuid().required(),
       workPeriodId: Joi.string().uuid().required(),
       challengeId: Joi.string().uuid().allow(null),
+      memberRate: Joi.number().required(),
+      customerRate: Joi.number().allow(null),
+      days: Joi.number().integer().min(1).max(5).required(),
       amount: Joi.number().greater(0).allow(null),
       status: Joi.workPeriodPaymentStatus().required(),
       billingAccountId: Joi.number().allow(null),

src/services/WorkPeriodProcessorService.js

@@ -72,9 +72,9 @@ processCreate.schema = {
       projectId: Joi.number().integer().required(),
       startDate: Joi.string().required(),
       endDate: Joi.string().required(),
-      daysWorked: Joi.number().integer().min(0).allow(null),
-      memberRate: Joi.number().allow(null),
-      customerRate: Joi.number().allow(null),
+      daysWorked: Joi.number().integer().min(0).max(5).required(),
+      daysPaid: Joi.number().integer().min(0).max(5).required(),
+      paymentTotal: Joi.number().min(0).required(),
       paymentStatus: Joi.paymentStatus().required(),
       createdAt: Joi.date().required(),
       createdBy: Joi.string().uuid().required(),