Merge branch 'dev' into feature/payment-scheduler

maxceem · maxceem · commit 9d4d436272fd · 2021-06-10T17:55:00.000+03:00
diff --git a/README.md b/README.md
@@ -103,10 +103,11 @@
    tc-taas-es-processor | 2021-04-09T21:20:21.469Z DEBUG no-kafka-client Subscribed to taas.workperiodpayment.update:0 offset 0 leader kafka:9093
    tc-taas-es-processor | 2021-04-09T21:20:21.470Z DEBUG no-kafka-client Subscribed to taas.workperiodpayment.delete:0 offset 0 leader kafka:9093
    tc-taas-es-processor | 2021-04-09T21:20:21.471Z DEBUG no-kafka-client Subscribed to taas.workperiodpayment.create:0 offset 0 leader kafka:9093
+   tc-taas-es-processor | 2021-04-09T21:20:21.472Z DEBUG no-kafka-client Subscribed to taas.action.retry:0 offset 0 leader kafka:9093
    tc-taas-es-processor | 2021-04-09T21:20:21.473Z DEBUG no-kafka-client Subscribed to taas.job.update:0 offset 0 leader kafka:9093
    tc-taas-es-processor | 2021-04-09T21:20:21.474Z DEBUG no-kafka-client Subscribed to taas.resourcebooking.update:0 offset 0 leader kafka:9093
    tc-taas-es-processor | [2021-04-09T21:20:21.475Z] app INFO : Initialized.......
-   tc-taas-es-processor | [2021-04-09T21:20:21.479Z] app INFO : taas.job.create,taas.job.update,taas.job.delete,taas.jobcandidate.create,taas.jobcandidate.update,taas.jobcandidate.delete,taas.resourcebooking.create,taas.resourcebooking.update,taas.resourcebooking.delete,taas.workperiod.create,taas.workperiod.update,taas.workperiod.delete,taas.workperiodpayment.create,taas.workperiodpayment.update,taas.interview.requested,taas.interview.update,taas.interview.bulkUpdate,taas.role.requested,taas.role.update,taas.role.delete
+   tc-taas-es-processor | [2021-04-09T21:20:21.479Z] app INFO : common.error.reporting,taas.job.create,taas.job.update,taas.job.delete,taas.jobcandidate.create,taas.jobcandidate.update,taas.jobcandidate.delete,taas.resourcebooking.create,taas.resourcebooking.update,taas.resourcebooking.delete,taas.workperiod.create,taas.workperiod.update,taas.workperiod.delete,taas.workperiodpayment.create,taas.workperiodpayment.update,taas.interview.requested,taas.interview.update,taas.interview.bulkUpdate,taas.role.requested,taas.role.update,taas.role.delete,taas.action.retry
    tc-taas-es-processor | [2021-04-09T21:20:21.480Z] app INFO : Kick Start.......
    tc-taas-es-processor | ********** Topcoder Health Check DropIn listening on port 3001
    tc-taas-es-processor | Topcoder Health Check DropIn started and ready to roll
diff --git a/config/default.js b/config/default.js
@@ -140,6 +140,8 @@ module.exports = {
   TAAS_ROLE_UPDATE_TOPIC: process.env.TAAS_ROLE_UPDATE_TOPIC || 'taas.role.update',
   // the delete role entity Kafka message topic
   TAAS_ROLE_DELETE_TOPIC: process.env.TAAS_ROLE_DELETE_TOPIC || 'taas.role.delete',
+  // special kafka topics
+  TAAS_ACTION_RETRY_TOPIC: process.env.TAAS_ACTION_RETRY_TOPIC || 'taas.action.retry',
 
   // the Kafka message topic for sending email
   EMAIL_TOPIC: process.env.EMAIL_TOPIC || 'external.action.email',
diff --git a/local/kafka-client/topics.txt b/local/kafka-client/topics.txt
@@ -20,3 +20,4 @@ taas.interview.requested
 taas.interview.update
 taas.interview.bulkUpdate
 external.action.email
+taas.action.retry
diff --git a/src/common/helper.js b/src/common/helper.js
@@ -972,6 +972,9 @@ async function postEvent (topic, payload, options = {}) {
     'mime-type': 'application/json',
     payload
   }
+  if (options.key) {
+   message.key = options.key
+   }
   await client.postEvent(message)
   await eventDispatcher.handleEvent(topic, { value: payload, options })
 }
diff --git a/src/controllers/JobController.js b/src/controllers/JobController.js
@@ -2,6 +2,7 @@
  * Controller for Job endpoints
  */
 const HttpStatus = require('http-status-codes')
+const _ = require('lodash')
 const service = require('../services/JobService')
 const helper = require('../common/helper')
 
@@ -57,10 +58,8 @@ async function deleteJob (req, res) {
  * @param res the response
  */
 async function searchJobs (req, res) {
-  if (req.body && req.body.jobIds) {
-    req.query.jobIds = req.body.jobIds
-  }
-  const result = await service.searchJobs(req.authUser, req.query)
+  const query = { ...req.query, jobIds: _.get(req, 'body.jobIds', []) }
+  const result = await service.searchJobs(req.authUser, query)
   helper.setResHeaders(req, res, result)
   res.send(result.result)
 }
diff --git a/src/eventHandlers/JobCandidateEventHandler.js b/src/eventHandlers/JobCandidateEventHandler.js
@@ -23,17 +23,25 @@ async function inReviewJob (payload) {
     })
     return
   }
-  await JobService.partiallyUpdateJob(
-    helper.getAuditM2Muser(),
-    job.id,
-    { status: 'in-review' }
-  ).then(result => {
-    logger.info({
+  if (payload.value.status === 'open') {
+    await JobService.partiallyUpdateJob(
+      helper.getAuditM2Muser(),
+      job.id,
+      { status: 'in-review' }
+    ).then(result => {
+      logger.info({
+        component: 'JobCandidateEventHandler',
+        context: 'inReviewJob',
+        message: `id: ${result.id} job got in-review status.`
+      })
+    })
+  } else {
+    logger.debug({
       component: 'JobCandidateEventHandler',
       context: 'inReviewJob',
-      message: `id: ${result.id} job got in-review status.`
+      message: `id: ${payload.value.id} candidate is not in open status`
     })
-  })
+  }
 }
 
 /**
@@ -46,6 +54,17 @@ async function processCreate (payload) {
   await inReviewJob(payload)
 }
 
+/**
+ * Process job candidate update event.
+ *
+ * @param {Object} payload the event payload
+ * @returns {undefined}
+ */
+async function processUpdate (payload) {
+  await inReviewJob(payload)
+}
+
 module.exports = {
-  processCreate
+  processCreate,
+  processUpdate
 }
diff --git a/src/eventHandlers/index.js b/src/eventHandlers/index.js
@@ -14,6 +14,7 @@ const logger = require('../common/logger')
 const TopicOperationMapping = {
   [config.TAAS_JOB_UPDATE_TOPIC]: JobEventHandler.processUpdate,
   [config.TAAS_JOB_CANDIDATE_CREATE_TOPIC]: JobCandidateEventHandler.processCreate,
+  [config.TAAS_JOB_CANDIDATE_UPDATE_TOPIC]: JobCandidateEventHandler.processUpdate,
   [config.TAAS_RESOURCE_BOOKING_CREATE_TOPIC]: ResourceBookingEventHandler.processCreate,
   [config.TAAS_RESOURCE_BOOKING_UPDATE_TOPIC]: ResourceBookingEventHandler.processUpdate,
   [config.TAAS_RESOURCE_BOOKING_DELETE_TOPIC]: ResourceBookingEventHandler.processDelete,
diff --git a/src/services/WorkPeriodPaymentService.js b/src/services/WorkPeriodPaymentService.js
@@ -81,7 +81,7 @@ async function _createSingleWorkPeriodPaymentWithWorkPeriodAndResourceBooking (w
     if (daysWorked === 0) {
       workPeriodPayment.amount = 0
     } else {
-      workPeriodPayment.amount = _.round(memberRate * 5 / daysWorked, 2)
+      workPeriodPayment.amount = _.round(memberRate * daysWorked / 5, 2)
     }
   }
 
@@ -183,7 +183,7 @@ async function createWorkPeriodPayment (currentUser, workPeriodPayment) {
         const successResult = await _createSingleWorkPeriodPayment(wp, createdBy)
         result.push(successResult)
       } catch (e) {
-        result.push(_.extend(wp, { error: { message: e.message, code: e.httpStatus } }))
+        result.push(_.extend(_.pick(wp, 'workPeriodId'), { error: { message: e.message, code: e.httpStatus } }))
       }
     }
     return result
diff --git a/src/services/WorkPeriodService.js b/src/services/WorkPeriodService.js
@@ -235,7 +235,7 @@ async function createWorkPeriod (currentUser, workPeriod) {
     }
   }
 
-  await helper.postEvent(config.TAAS_WORK_PERIOD_CREATE_TOPIC, created.toJSON())
+  await helper.postEvent(config.TAAS_WORK_PERIOD_CREATE_TOPIC, created.toJSON(),{"key":workPeriod.resourceBookingId})
   return created.dataValues
 }
 
@@ -289,7 +289,8 @@ async function updateWorkPeriod (currentUser, id, data) {
     }
   }
 
-  await helper.postEvent(config.TAAS_WORK_PERIOD_UPDATE_TOPIC, updated.toJSON(), { oldValue: oldValue })
+  //await helper.postEvent(config.TAAS_WORK_PERIOD_UPDATE_TOPIC, updated.toJSON(), { oldValue: oldValue })
+  await helper.postEvent(config.TAAS_WORK_PERIOD_UPDATE_TOPIC, updated.toJSON(), {oldValue: oldValue, "key":data.resourceBookingId})
   return updated.dataValues
 }
 
diff --git a/test/unit/ResourceBookingService.test.js b/test/unit/ResourceBookingService.test.js
@@ -447,7 +447,7 @@ describe('resourceBooking service test', () => {
       expect(esClientSearch.calledOnce).to.be.true
       expect(result).to.deep.eq(data.result)
     })
-    it('T25:Search resource bookin from DB', async () => {
+    it('T25:Search resource booking from DB', async () => {
       const data = testData.T25
       const ESClient = commonData.ESClient
       ESClient.search = () => {}
@@ -456,7 +456,7 @@ describe('resourceBooking service test', () => {
         return data.resourceBookingFindAll
       })
       const stubResourceBookingCount = sinon.stub(ResourceBooking, 'count').callsFake(async () => {
-        return data.resourceBookingFindAll.length
+        return data.resourceBookingCount
       })
       const result = await service.searchResourceBookings(commonData.userWithManagePermission, data.criteria)
       expect(esClientSearch.calledOnce).to.be.true
diff --git a/test/unit/common/ResourceBookingData.js b/test/unit/common/ResourceBookingData.js
@@ -1229,6 +1229,8 @@ const T25 = {
       updatedAt: '2021-05-08T18:47:37.268Z'
     }
   ],
+  resourceBookingCount: [{ id: 'fbe133dd-0e36-4d0c-8197-49307b13ce75', count: 1 },
+    { id: '60e99790-8da0-4596-badc-29a06feb78a0', count: 1 }],
   criteria: {},
   result: {
     fromDb: true,

Original file line number	Diff line number	Diff line change
`@@ -972,6 +972,9 @@ async function postEvent (topic, payload, options = {}) {`
`972`	`972`	`'mime-type': 'application/json',`
`973`	`973`	`payload`
`974`	`974`	`}`
	`975`	`+ if (options.key) {`
	`976`	`+ message.key = options.key`
	`977`	`+ }`
`975`	`978`	`await client.postEvent(message)`
`976`	`979`	`await eventDispatcher.handleEvent(topic, { value: payload, options })`
`977`	`980`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ async function _createSingleWorkPeriodPaymentWithWorkPeriodAndResourceBooking (w`
`81`	`81`	`if (daysWorked === 0) {`
`82`	`82`	`workPeriodPayment.amount = 0`
`83`	`83`	`} else {`
`84`		`- workPeriodPayment.amount = _.round(memberRate * 5 / daysWorked, 2)`
	`84`	`+ workPeriodPayment.amount = _.round(memberRate * daysWorked / 5, 2)`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
`@@ -183,7 +183,7 @@ async function createWorkPeriodPayment (currentUser, workPeriodPayment) {`
`183`	`183`	`const successResult = await _createSingleWorkPeriodPayment(wp, createdBy)`
`184`	`184`	`result.push(successResult)`
`185`	`185`	`} catch (e) {`
`186`		`- result.push(_.extend(wp, { error: { message: e.message, code: e.httpStatus } }))`
	`186`	`+ result.push(_.extend(_.pick(wp, 'workPeriodId'), { error: { message: e.message, code: e.httpStatus } }))`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`	`return result`
Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ async function createWorkPeriod (currentUser, workPeriod) {`
`235`	`235`	`}`
`236`	`236`	`}`
`237`	`237`
`238`		`- await helper.postEvent(config.TAAS_WORK_PERIOD_CREATE_TOPIC, created.toJSON())`
	`238`	`+ await helper.postEvent(config.TAAS_WORK_PERIOD_CREATE_TOPIC, created.toJSON(),{"key":workPeriod.resourceBookingId})`
`239`	`239`	`return created.dataValues`
`240`	`240`	`}`
`241`	`241`
`@@ -289,7 +289,8 @@ async function updateWorkPeriod (currentUser, id, data) {`
`289`	`289`	`}`
`290`	`290`	`}`
`291`	`291`
`292`		`- await helper.postEvent(config.TAAS_WORK_PERIOD_UPDATE_TOPIC, updated.toJSON(), { oldValue: oldValue })`
	`292`	`+ //await helper.postEvent(config.TAAS_WORK_PERIOD_UPDATE_TOPIC, updated.toJSON(), { oldValue: oldValue })`
	`293`	`+ await helper.postEvent(config.TAAS_WORK_PERIOD_UPDATE_TOPIC, updated.toJSON(), {oldValue: oldValue, "key":data.resourceBookingId})`
`293`	`294`	`return updated.dataValues`
`294`	`295`	`}`
`295`	`296`
Original file line number	Diff line number	Diff line change
`@@ -1229,6 +1229,8 @@ const T25 = {`
`1229`	`1229`	`updatedAt: '2021-05-08T18:47:37.268Z'`
`1230`	`1230`	`}`
`1231`	`1231`	`],`
	`1232`	`+ resourceBookingCount: [{ id: 'fbe133dd-0e36-4d0c-8197-49307b13ce75', count: 1 },`
	`1233`	`+ { id: '60e99790-8da0-4596-badc-29a06feb78a0', count: 1 }],`
`1232`	`1234`	`criteria: {},`
`1233`	`1235`	`result: {`
`1234`	`1236`	`fromDb: true,`