Merge pull request #364 from xxcxy/dev

fix Inconsistency in payment step between Scheduler and WorkPeriodPay…

Author: nkumar-topcoder

migrations/2021-06-18-make-payment-scheduler-step-optional.js

@@ -0,0 +1,15 @@
+const config = require('config')
+const _ = require('lodash')
+const { PaymentSchedulerStatus } = require('../app-constants')
+/*
+ * Make Job payment_schedulers step optional.
+ */
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.sequelize.query(`ALTER TABLE ${config.DB_SCHEMA_NAME}.payment_schedulers ALTER COLUMN step DROP NOT NULL`)
+  },
+  down: async (queryInterface, Sequelize) => {
+    await queryInterface.sequelize.query(`ALTER TABLE ${config.DB_SCHEMA_NAME}.payment_schedulers ALTER COLUMN step SET NOT NULL`)
+  }
+}

scripts/demo-payment-scheduler/data.json

@@ -43,6 +43,8 @@
           "startDate":"2020-09-27",
           "endDate":"2020-10-03",
           "daysWorked":4,
+          "daysPaid": 3,
+          "paymentTotal": 0,
           "memberRate":27.06,
           "customerRate":13.13,
           "paymentStatus":"partially-completed",
@@ -59,6 +61,8 @@
           "startDate":"2020-10-18",
           "endDate":"2020-10-24",
           "daysWorked":4,
+          "daysPaid": 3,
+          "paymentTotal": 0,
           "memberRate":4.08,
           "customerRate":3.89,
           "paymentStatus":"cancelled",
@@ -75,6 +79,8 @@
           "startDate":"2020-10-25",
           "endDate":"2020-10-31",
           "daysWorked":3,
+          "daysPaid": 3,
+          "paymentTotal": 0,
           "memberRate":15.61,
           "customerRate":9.76,
           "paymentStatus":"pending",
@@ -91,6 +97,8 @@
           "startDate":"2020-10-11",
           "endDate":"2020-10-17",
           "daysWorked":4,
+          "daysPaid": 3,
+          "paymentTotal": 0,
           "memberRate":10.82,
           "customerRate":30.71,
           "paymentStatus":"pending",

scripts/demo-payment-scheduler/index.js

@@ -13,6 +13,8 @@ for (let i = 0; i < 1000; i++) {
     amount: _.round(_.random(1000, true), 2),
     status: 'scheduled',
     billingAccountId: data.ResourceBooking.billingAccountId,
+    memberRate: data.ResourceBooking.memberRate,
+    days: 4,
     createdBy: '57646ff9-1cd3-4d3c-88ba-eb09a395366c',
     updatedBy: null,
     createdAt: `2021-05-19T21:3${i % 10}:46.507Z`,

src/models/PaymentScheduler.js

@@ -50,8 +50,7 @@ module.exports = (sequelize) => {
         allowNull: false
       },
       step: {
-        type: Sequelize.ENUM(_.values(PaymentSchedulerStatus)),
-        allowNull: false
+        type: Sequelize.ENUM(_.values(PaymentSchedulerStatus))
       },
       status: {
         type: Sequelize.ENUM(

src/services/PaymentSchedulerService.js

@@ -131,7 +131,7 @@ async function processPayment (workPeriodPayment) {
     await postEvent(config.TAAS_WORK_PERIOD_PAYMENT_UPDATE_TOPIC, updated.toJSON(), { oldValue })
 
     if (paymentScheduler) {
-      await paymentScheduler.update({ step: PaymentSchedulerStatus.CLOSE_CHALLENGE, userId: paymentScheduler.userId, status: 'failed' })
+      await paymentScheduler.update({ step: _.get(err, 'step'), userId: paymentScheduler.userId, status: 'failed' })
     }
     localLogger.error(`Processed workPeriodPayment ${workPeriodPayment.id} failed`, 'processPayment')
     return processResult.FAIL