Merge pull request #89 from topcoder-platform/dev

[PROD] Next Release

Author: nkumar-topcoder

src/scripts/createIndex.js

@@ -103,10 +103,11 @@ async function createIndex () {
             status: { type: 'keyword' },
             startDate: { type: 'date', format: 'yyyy-MM-dd' },
             endDate: { type: 'date', format: 'yyyy-MM-dd' },
+            sendWeeklySurvey: { type: 'boolean' },
             memberRate: { type: 'float' },
             customerRate: { type: 'float' },
             rateType: { type: 'keyword' },
-            billingAccountId: { type: 'integer' },
+            billingAccountId: { type: 'integer', null_value: 0 },
             workPeriods: {
               type: 'nested',
               properties: {
@@ -116,6 +117,14 @@ async function createIndex () {
                   normalizer: 'lowercaseNormalizer' },
                 projectId: { type: 'integer' },
                 userId: { type: 'keyword' },
+                sentSurvey: { type: 'boolean' },
+                sentSurveyError: {
+                  type: 'nested',
+                  properties: {
+                    errorCode: { type: 'integer' },
+                    errorMessage: { type: 'keyword' }
+                  }
+                },
                 startDate: { type: 'date', format: 'yyyy-MM-dd' },
                 endDate: { type: 'date', format: 'yyyy-MM-dd' },
                 daysWorked: { type: 'integer' },

src/services/ResourceBookingProcessorService.js

@@ -37,6 +37,7 @@ processCreate.schema = {
       id: Joi.string().uuid().required(),
       projectId: Joi.number().integer().required(),
       userId: Joi.string().uuid().required(),
+      sendWeeklySurvey: Joi.boolean().required(),
       jobId: Joi.string().uuid().allow(null),
       startDate: Joi.string().regex(/^(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$/).allow(null),
       endDate: Joi.string().regex(/^(19|20)\d\d-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$/).allow(null),

src/services/WorkPeriodPaymentProcessorService.js

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

src/services/WorkPeriodProcessorService.js

@@ -72,8 +72,13 @@ processCreate.schema = {
       projectId: Joi.number().integer().required(),
       startDate: Joi.string().required(),
       endDate: Joi.string().required(),
-      daysWorked: Joi.number().integer().min(0).max(5).required(),
-      daysPaid: Joi.number().integer().min(0).max(5).required(),
+      sentSurvey: Joi.boolean().required(),
+      sentSurveyError: Joi.object().keys({
+        errorCode: Joi.number().integer().min(0),
+        errorMessage: Joi.string()
+      }).allow(null),
+      daysWorked: Joi.number().integer().min(0).max(10).required(),
+      daysPaid: Joi.number().integer().min(0).max(10).required(),
       paymentTotal: Joi.number().min(0).required(),
       paymentStatus: Joi.paymentStatus().required(),
       createdAt: Joi.date().required(),