Merge branch 'dev' into change-validatations-in-job-j

sushilshinde · web-flow · commit 143192795800 · 2021-06-18T12:34:50.000+05:30
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+12
diff --git a/README.md b/README.md
@@ -90,7 +90,13 @@ The following parameters can be set in config files or in env variables:
 
 ## Local deployment
 
-1. Make sure that Kafka and Elasticsearch is running as per instructions above.
+0. Make sure that Kafka and Elasticsearch is running as per instructions above.
+
+1. Make sure to use Node v12+ by command `node -v`. We recommend using [NVM](https://github.com/nvm-sh/nvm) to quickly switch to the right version:
+
+   ```bash
+   nvm use
+   ```
 
 2. From the project root directory, run the following command to install the dependencies
 
diff --git a/config/test.js b/config/test.js
@@ -8,5 +8,5 @@ module.exports = {
     ZAPIER_JOB_CANDIDATE_SWITCH: process.env.ZAPIER_JOB_CANDIDATE_SWITCH || 'ON'
   },
   // don't retry actions during tests because tests for now don't expect it and should be updated first
-  MAX_RETRY: 0,
+  MAX_RETRY: 0
 }
diff --git a/src/bootstrap.js b/src/bootstrap.js
@@ -9,16 +9,16 @@ const allowedInterviewStatuses = _.values(Interview.Status)
 
 global.Promise = require('bluebird')
 
-Joi.rateType = () => Joi.string().valid('hourly', 'daily', 'weekly', 'monthly','annual')
+Joi.rateType = () => Joi.string().valid('hourly', 'daily', 'weekly', 'monthly', 'annual')
 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', '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', 'cancelled')
+Joi.workPeriodPaymentStatus = () => Joi.string().valid('completed', 'scheduled', 'in-progress', 'failed', '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/scripts/createIndex.js b/src/scripts/createIndex.js
@@ -119,17 +119,30 @@ 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: {
+                      type: 'nested',
+                      properties: {
+                        errorMessage: { type: 'text' },
+                        errorCode: { type: 'integer' },
+                        retry: { type: 'integer' },
+                        step: { type: 'keyword' },
+                        challengeId: { type: 'keyword' }
+                      }
+                    },
                     billingAccountId: { type: 'integer' },
                     createdAt: { type: 'date' },
                     createdBy: { type: 'keyword' },
diff --git a/src/services/InterviewProcessorService.js b/src/services/InterviewProcessorService.js
@@ -56,6 +56,7 @@ processRequestInterview.schema = {
     originator: Joi.string().required(),
     timestamp: Joi.date().required(),
     'mime-type': Joi.string().required(),
+    key: Joi.string().allow(null),
     payload: Joi.object().keys({
       id: Joi.string().uuid().required(),
       xaiId: Joi.string().allow(null),
@@ -176,6 +177,7 @@ processBulkUpdateInterviews.schema = {
     originator: Joi.string().required(),
     timestamp: Joi.date().required(),
     'mime-type': Joi.string().required(),
+    key: Joi.string().allow(null),
     payload: Joi.object().pattern(
       Joi.string().uuid(), // key - jobCandidateId
       Joi.object().pattern(
diff --git a/src/services/JobCandidateProcessorService.js b/src/services/JobCandidateProcessorService.js
@@ -91,7 +91,8 @@ processCreate.schema = {
       topic: Joi.string().required(),
       originator: Joi.string().required(),
       timestamp: Joi.date().required(),
-      "mime-type": Joi.string().required(),
+      'mime-type': Joi.string().required(),
+      key: Joi.string().allow(null),
       payload: Joi.object()
         .keys({
           id: Joi.string().uuid().required(),
@@ -106,11 +107,11 @@ processCreate.schema = {
           resume: Joi.string().uri().allow(null).allow(""),
           remark: Joi.stringAllowEmpty().allow(null),
         })
-        .required(),
+        .required()
     })
     .required(),
-  transactionId: Joi.string().required(),
-};
+  transactionId: Joi.string().required()
+}
 
 /**
  * Process update entity message
@@ -164,6 +165,7 @@ processDelete.schema = {
     originator: Joi.string().required(),
     timestamp: Joi.date().required(),
     'mime-type': Joi.string().required(),
+    key: Joi.string().allow(null),
     payload: Joi.object().keys({
       id: Joi.string().uuid().required()
     }).required()
diff --git a/src/services/JobProcessorService.js b/src/services/JobProcessorService.js
@@ -148,6 +148,7 @@ processDelete.schema = {
     originator: Joi.string().required(),
     timestamp: Joi.date().required(),
     'mime-type': Joi.string().required(),
+    key: Joi.string().allow(null),
     payload: Joi.object().keys({
       id: Joi.string().uuid().required()
     }).required()
diff --git a/src/services/ResourceBookingProcessorService.js b/src/services/ResourceBookingProcessorService.js
@@ -32,6 +32,7 @@ processCreate.schema = {
     originator: Joi.string().required(),
     timestamp: Joi.date().required(),
     'mime-type': Joi.string().required(),
+    key: Joi.string().allow(null),
     payload: Joi.object().keys({
       id: Joi.string().uuid().required(),
       projectId: Joi.number().integer().required(),
@@ -94,6 +95,7 @@ processDelete.schema = {
     originator: Joi.string().required(),
     timestamp: Joi.date().required(),
     'mime-type': Joi.string().required(),
+    key: Joi.string().allow(null),
     payload: Joi.object().keys({
       id: Joi.string().uuid().required()
     }).required()
diff --git a/src/services/RoleProcessorService.js b/src/services/RoleProcessorService.js
@@ -32,6 +32,7 @@ processCreate.schema = {
     originator: Joi.string().required(),
     timestamp: Joi.date().required(),
     'mime-type': Joi.string().required(),
+    key: Joi.string().allow(null),
     payload: Joi.object().keys({
       id: Joi.string().uuid().required(),
       name: Joi.string().max(50).required(),
@@ -103,6 +104,7 @@ processDelete.schema = {
     originator: Joi.string().required(),
     timestamp: Joi.date().required(),
     'mime-type': Joi.string().required(),
+    key: Joi.string().allow(null),
     payload: Joi.object().keys({
       id: Joi.string().uuid().required()
     }).required()
diff --git a/src/services/WorkPeriodPaymentProcessorService.js b/src/services/WorkPeriodPaymentProcessorService.js
@@ -4,53 +4,46 @@
 
 const Joi = require('@hapi/joi')
 const config = require('config')
-const _ = require('lodash')
 const logger = require('../common/logger')
 const helper = require('../common/helper')
 const constants = require('../common/constants')
 
 const esClient = helper.getESClient()
 
 /**
- * Process create entity message
- * @param {Object} message the kafka message
- * @param {String} transactionId
- */
+  * Process create entity message
+  * @param {Object} message the kafka message
+  * @param {String} transactionId
+  */
 async function processCreate (message, transactionId) {
-  const data = message.payload
+  const workPeriodPayment = message.payload
   // find related resourceBooking
-  const result = await esClient.search({
+  const resourceBooking = await esClient.search({
     index: config.get('esConfig.ES_INDEX_RESOURCE_BOOKING'),
     body: {
       query: {
         nested: {
           path: 'workPeriods',
           query: {
-            match: { 'workPeriods.id': data.workPeriodId }
+            match: { 'workPeriods.id': workPeriodPayment.workPeriodId }
           }
         }
       }
     }
   })
-  if (!result.body.hits.total.value) {
-    throw new Error(`id: ${data.workPeriodId} "WorkPeriod" not found`)
+  if (!resourceBooking.body.hits.total.value) {
+    throw new Error(`id: ${workPeriodPayment.workPeriodId} "WorkPeriod" not found`)
   }
-  const resourceBooking = result.body.hits.hits[0]._source
-  // find related workPeriod record
-  const workPeriod = _.find(resourceBooking.workPeriods, ['id', data.workPeriodId])
-  // Get workPeriod's existing payments
-  const payments = _.isArray(workPeriod.payments) ? workPeriod.payments : []
-  // Append new payment
-  payments.push(data)
-  // Assign new payments array to workPeriod
-  workPeriod.payments = payments
-  // Update ResourceBooking's workPeriods property
-  await esClient.updateExtra({
+  await esClient.update({
     index: config.get('esConfig.ES_INDEX_RESOURCE_BOOKING'),
-    id: resourceBooking.id,
+    id: resourceBooking.body.hits.hits[0]._id,
     transactionId,
     body: {
-      doc: { workPeriods: resourceBooking.workPeriods }
+      script: {
+        lang: 'painless',
+        source: 'def wp = ctx._source.workPeriods.find(workPeriod -> workPeriod.id == params.workPeriodPayment.workPeriodId); if(!wp.containsKey("payments") || wp.payments == null){wp["payments"]=[]}wp.payments.add(params.workPeriodPayment)',
+        params: { workPeriodPayment }
+      }
     },
     refresh: constants.esRefreshOption
   })
@@ -62,13 +55,24 @@ processCreate.schema = {
     originator: Joi.string().required(),
     timestamp: Joi.date().required(),
     'mime-type': Joi.string().required(),
+    key: Joi.string().allow(null),
     payload: Joi.object().keys({
       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),
+      statusDetails: Joi.object().keys({
+        errorMessage: Joi.string().required(),
+        errorCode: Joi.number().integer().allow(null),
+        retry: Joi.number().integer().allow(null),
+        step: Joi.string().allow(null),
+        challengeId: Joi.string().uuid().allow(null)
+      }).unknown(true).allow(null),
       createdAt: Joi.date().required(),
       createdBy: Joi.string().uuid().required(),
       updatedAt: Joi.date().allow(null),
@@ -79,14 +83,14 @@ processCreate.schema = {
 }
 
 /**
- * Process update entity message
- * @param {Object} message the kafka message
- * @param {String} transactionId
- */
+  * Process update entity message
+  * @param {Object} message the kafka message
+  * @param {String} transactionId
+  */
 async function processUpdate (message, transactionId) {
   const data = message.payload
   // find workPeriodPayment in it's parent ResourceBooking
-  let result = await esClient.search({
+  const resourceBooking = await esClient.search({
     index: config.get('esConfig.ES_INDEX_RESOURCE_BOOKING'),
     body: {
       query: {
@@ -99,89 +103,19 @@ async function processUpdate (message, transactionId) {
       }
     }
   })
-  if (!result.body.hits.total.value) {
+  if (!resourceBooking.body.hits.total.value) {
     throw new Error(`id: ${data.id} "WorkPeriodPayment" not found`)
   }
-  const resourceBooking = _.cloneDeep(result.body.hits.hits[0]._source)
-  let workPeriod = null
-  let payment = null
-  let paymentIndex = null
-  // find workPeriod and workPeriodPayment records
-  _.forEach(resourceBooking.workPeriods, wp => {
-    _.forEach(wp.payments, (p, pi) => {
-      if (p.id === data.id) {
-        payment = p
-        paymentIndex = pi
-        return false
-      }
-    })
-    if (payment) {
-      workPeriod = wp
-      return false
-    }
-  })
-  let payments
-  // if WorkPeriodPayment's workPeriodId changed then it must be deleted from the old WorkPeriod
-  // and added to the new WorkPeriod
-  if (payment.workPeriodId !== data.workPeriodId) {
-    // remove payment from payments
-    payments = _.filter(workPeriod.payments, p => p.id !== data.id)
-    // assign payments to workPeriod record
-    workPeriod.payments = payments
-    // Update old ResourceBooking's workPeriods property
-    await esClient.updateExtra({
-      index: config.get('esConfig.ES_INDEX_RESOURCE_BOOKING'),
-      id: resourceBooking.id,
-      transactionId,
-      body: {
-        doc: { workPeriods: resourceBooking.workPeriods }
-      },
-      refresh: constants.esRefreshOption
-    })
-    // find workPeriodPayment's new parent WorkPeriod
-    result = await esClient.search({
-      index: config.get('esConfig.ES_INDEX_RESOURCE_BOOKING'),
-      body: {
-        query: {
-          nested: {
-            path: 'workPeriods',
-            query: {
-              match: { 'workPeriods.id': data.workPeriodId }
-            }
-          }
-        }
-      }
-    })
-    const newResourceBooking = result.body.hits.hits[0]._source
-    // find WorkPeriod record in ResourceBooking
-    const newWorkPeriod = _.find(newResourceBooking.workPeriods, ['id', data.workPeriodId])
-    // Get WorkPeriod's existing payments
-    const newPayments = _.isArray(newWorkPeriod.payments) ? newWorkPeriod.payments : []
-    // Append new payment
-    newPayments.push(data)
-    // Assign new payments array to workPeriod
-    newWorkPeriod.payments = newPayments
-    // Update new ResourceBooking's workPeriods property
-    await esClient.updateExtra({
-      index: config.get('esConfig.ES_INDEX_RESOURCE_BOOKING'),
-      id: newResourceBooking.id,
-      transactionId,
-      body: {
-        doc: { workPeriods: newResourceBooking.workPeriods }
-      },
-      refresh: constants.esRefreshOption
-    })
-    return
-  }
-  // update payment record
-  workPeriod.payments[paymentIndex] = data
-  // Update ResourceBooking's workPeriods property
-  await esClient.updateExtra({
+  await esClient.update({
     index: config.get('esConfig.ES_INDEX_RESOURCE_BOOKING'),
-    id: resourceBooking.id,
+    id: resourceBooking.body.hits.hits[0]._id,
     transactionId,
     body: {
-      doc: { workPeriods: resourceBooking.workPeriods }
+      script: {
+        lang: 'painless',
+        source: 'def wp = ctx._source.workPeriods.find(workPeriod -> workPeriod.id == params.data.workPeriodId); wp.payments.removeIf(payment -> payment.id == params.data.id); wp.payments.add(params.data)',
+        params: { data }
+      }
     },
     refresh: constants.esRefreshOption
   })
diff --git a/src/services/WorkPeriodProcessorService.js b/src/services/WorkPeriodProcessorService.js
diff --git a/test/common/testHelper.js b/test/common/testHelper.js

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@ module.exports = {`
`8`	`8`	`ZAPIER_JOB_CANDIDATE_SWITCH: process.env.ZAPIER_JOB_CANDIDATE_SWITCH \|\| 'ON'`
`9`	`9`	`},`
`10`	`10`	`// don't retry actions during tests because tests for now don't expect it and should be updated first`
`11`		`- MAX_RETRY: 0,`
	`11`	`+ MAX_RETRY: 0`
`12`	`12`	`}`