Merge branch 'develop'

Author: James Cori

src/services/paymentService.js

@@ -2,6 +2,7 @@
  * Payment Service
  * Interacts with InformixDB
  */
+const util = require('util')
 const logger = require('../common/logger')
 const helper = require('../common/helper')
 const config = require('config');
@@ -12,11 +13,25 @@ const paymentDetailIdGen = new IDGenerator('PAYMENT_DETAIL_SEQ')
 // the paymentId's generator
 const paymentIdGen = new IDGenerator('PAYMENT_SEQ')
 
+// TODO - NOT checking on pd.net_amount = %d for now because you could edit an amount it'd create another payment.
+const QUERY_PAYMENT = `SELECT 
+p.payment_id, pd.payment_detail_id, pd.payment_desc, pd.payment_type_id, pd.payment_method_id, 
+p.create_date, pd.create_date as modify_date, pd.net_amount, 
+pd.payment_status_id, p.user_id,
+pd.date_modified, pd.date_paid, pd.gross_amount,
+pd.parent_payment_id, pd.total_amount, pd.installment_number, pd.jira_issue_id
+FROM payment p
+INNER JOIN payment_detail pd ON pd.payment_detail_id = p.most_recent_detail_id
+WHERE
+  p.user_id = %d
+  AND pd.jira_issue_id = '%s'
+  AND pd.payment_type_id = %d
+`
 // the insert statement of payment detail
 const INSERT_PAYMENT_DETAIL = `INSERT INTO payment_detail (
-  payment_detail_id, net_amount,  gross_amount, payment_status_id, modification_rationale_id,
-  payment_desc, payment_type_id, date_modified, date_due, payment_method_id, component_project_id,
-  create_date, charity_ind, total_amount, installment_number, create_user,
+  payment_detail_id, net_amount,  gross_amount, payment_status_id, modification_rationale_id, 
+  payment_desc, payment_type_id, date_modified, date_due, payment_method_id, component_project_id, 
+  create_date, charity_ind, total_amount, installment_number, create_user, 
   jira_issue_id) VALUES(?,?,?,?,?,?,?, CURRENT, EXTEND(CURRENT + INTERVAL (15) DAY(5) TO DAY, YEAR TO DAY),?,?, CURRENT,?,?,?,?,?)`
 // the insert statement of payment
 const INSERT_PAYMENT = 'INSERT INTO payment (payment_id, user_id, most_recent_detail_id, create_date, modify_date, has_global_ad) VALUES(?,?,?, CURRENT, CURRENT, "f")'
@@ -37,6 +52,20 @@ async function prepare (connection, sql) {
   return Promise.promisifyAll(stmt)
 }
 
+async function paymentExists(payment) {
+  const connection = await helper.getInformixConnection()
+  try {
+    const query = util.format(QUERY_PAYMENT, payment.memberId, payment.v5ChallengeId, payment.typeId)
+    logger.debug(`Checking if paymentExists - ${query}`)
+    return connection.queryAsync(query)
+  } catch (e) {
+    logger.error(`Error in 'paymentExists' ${e}`)
+    throw e
+  } finally {
+    await connection.closeAsync()
+  }
+}
+
 /**
  * Create payment and save it to db
  * @param {Object} payment the payment info
@@ -67,5 +96,6 @@ async function createPayment (payment) {
 }
 
 module.exports = {
-  createPayment
+  createPayment,
+  paymentExists
 }

src/services/processorService.js

@@ -19,8 +19,9 @@ async function processUpdate(message) {
   const legacyId = _.get(message, 'payload.legacyId', null)
   const v5ChallengeId = _.get(message, 'payload.id', null)
 
-  if (!legacyId) {
-    logger.warn(`payload of challenge ${v5ChallengeId} does not contain a legacy id`)
+  if (!v5ChallengeId) {
+    logger.error('Payload of challenge does not contain a v5 Challenge UUID')
+    return false
   }
   //const grossAmount = _.sumBy(_.flatMap(message.payload.prizeSets, 'prizes'), 'value')
 
@@ -29,7 +30,7 @@ async function processUpdate(message) {
     statusId: config.PAYMENT_STATUS_ID,
     modificationRationaleId: config.MODIFICATION_RATIONALE_ID,
     methodId: config.PAYMENT_METHOD_ID,
-    projectId: legacyId,
+    projectId: legacyId, // this is not projectId from v5 - legacy calls a challenge a project
     charityInd: config.CHARITY_IND,
     installmentNumber: config.INSTALLMENT_NUMBER,
     createUser: createUserId,
@@ -42,21 +43,29 @@ async function processUpdate(message) {
     // const winnerPaymentDesc = _.get(_.find(message.payload.prizeSets, ['type', 'placement']), 'description', '')
     const winnerMembers = _.sortBy(_.get(message.payload, 'winners', []), ['placement'])
     if (_.isEmpty(winnerPrizes)) {
-      logger.warn(`For challenge ${legacyId}, no winner payment avaiable`)
+      logger.warn(`For challenge ${v5ChallengeId}, no winner payment avaiable`)
     } else if (winnerPrizes.length !== winnerMembers.length) {
-      logger.error(`For challenge ${legacyId}, there is ${winnerPrizes.length} user prizes but ${winnerMembers.length} winners`)
+      logger.error(`For challenge ${v5ChallengeId}, there is ${winnerPrizes.length} user prizes but ${winnerMembers.length} winners`)
     } else {
       try {
         for (let i = 1; i <= winnerPrizes.length; i++) {
-          await paymentService.createPayment(_.assign({
+          const payment = _.assign({
             memberId: winnerMembers[i - 1].userId,
             amount: winnerPrizes[i - 1].value,
             desc: `Task - ${message.payload.name} - ${i} Place`,
             typeId: config.WINNER_PAYMENT_TYPE_ID
-          }, basePayment))
+          }, basePayment)
+
+          const paymentExists = await paymentService.paymentExists(payment)
+          logger.debug(`Payment Exists Response: ${JSON.stringify(paymentExists)}`)
+          if(!paymentExists || paymentExists.length === 0) {
+            await paymentService.createPayment(payment)
+          } else {
+            logger.error(`Payment Exists for ${v5ChallengeId}, skipping - ${JSON.stringify(paymentExists)}`)
+          }
         }
       } catch (error) {
-        logger.error(`For challenge ${legacyId}, add winner payments error: ${error}`)
+        logger.error(`For challenge ${v5ChallengeId}, add winner payments error: ${error}`)
       }
     }
 
@@ -66,9 +75,9 @@ async function processUpdate(message) {
     const copilotPaymentDesc = _.get(_.find(message.payload.prizeSets, ['type', 'copilot']), 'description', '')
 
     if (!copilotAmount) {
-      logger.warn(`For challenge ${legacyId}, no copilot payment avaiable`)
+      logger.warn(`For challenge ${v5ChallengeId}, no copilot payment available`)
     } else if (!copilotId) {
-      logger.warn(`For challenge ${legacyId}, no copilot memberId avaiable`)
+      logger.warn(`For challenge ${v5ChallengeId}, no copilot memberId available`)
     } else {
       try {
         const copilotPayment = _.assign({
@@ -77,13 +86,19 @@ async function processUpdate(message) {
           desc: (copilotPaymentDesc ? copilotPaymentDesc : `Task - ${message.payload.name} - Copilot`),
           typeId: config.COPILOT_PAYMENT_TYPE_ID
         }, basePayment)
-        await paymentService.createPayment(copilotPayment)
+        const paymentExists = await paymentService.paymentExists(copilotPayment)
+        logger.debug(`Copilot Payment Exists Response: ${JSON.stringify(paymentExists)}`)
+        if(!paymentExists || paymentExists.length === 0) {
+          await paymentService.createPayment(copilotPayment)
+        } else {
+          logger.error(`Copilot Payment Exists for ${v5ChallengeId}, skipping - ${JSON.stringify(paymentExists)}`)
+        }
       } catch (error) {
-        logger.error(`For challenge ${legacyId}, add copilot payments error: ${error}`)
+        logger.error(`For challenge ${v5ChallengeId}, add copilot payments error: ${error}`)
       }
     }
   } catch (error) {
-    logger.error(`For challenge ${legacyId}, error occurred while parsing and preparing payment detail. Error: ${error}`)
+    logger.error(`For challenge ${v5ChallengeId}, error occurred while parsing and preparing payment detail. Error: ${error}`)
   }
 }