Merge branch 'develop' into fix-wm-974

Author: ThomasKranitsas

config/default.js

@@ -68,16 +68,18 @@ module.exports = {
   SUBMISSION_PHASE_ID: process.env.SUBMISSION_PHASE_ID || '6950164f-3c5e-4bdc-abc8-22aaf5a1bd49',
   CHECKPOINT_SUBMISSION_PHASE_ID: process.env.CHECKPOINT_SUBMISSION_PHASE_ID || 'd8a2cdbe-84d1-4687-ab75-78a6a7efdcc8',
 
-  V5_TERMS_NDA_ID: process.env.V5_TERMS_NDA_ID || '77f558c1-56fb-427c-b974-61ea0a060ca7',
-  LEGACY_TERMS_NDA_ID: process.env.LEGACY_TERMS_NDA_ID || 21343,
+  V5_TERMS_NDA_ID: process.env.V5_TERMS_NDA_ID || 'e5811a7b-43d1-407a-a064-69e5015b4900',
+  LEGACY_TERMS_NDA_ID: process.env.LEGACY_TERMS_NDA_ID || 21233,
 
-  V5_TERMS_STANDARD_ID: process.env.V5_TERMS_STANDARD_ID || 'e5811a7b-43d1-407a-a064-69e5015b4900',
-  LEGACY_TERMS_STANDARD_ID: process.env.LEGACY_TERMS_STANDARD_ID || 21233,
+  V5_TERMS_STANDARD_ID: process.env.V5_TERMS_STANDARD_ID || '317cd8f9-d66c-4f2a-8774-63c612d99cd4',
+  LEGACY_TERMS_STANDARD_ID: process.env.LEGACY_TERMS_STANDARD_ID || 21305,
 
   LEGACY_SUBMITTER_ROLE_ID: process.env.LEGACY_SUBMITTER_ROLE_ID || 1,
 
   COPILOT_PAYMENT_TYPE: process.env.COPILOT_PAYMENT_TYPE || 'copilot',
 
+  COPILOT_ROLE_ID: process.env.COPILOT_ROLE_ID || 'cfe12b3f-2a24-4639-9d8b-ec86726f76bd',
+
   // V5 Term UUID
   SYNC_V5_TERM_UUID: process.env.SYNC_V5_TERM_UUID || '317cd8f9-d66c-4f2a-8774-63c612d99cd4',
   SYNC_V5_WRITE_ENABLED: process.env.SYNC_V5_WRITE_ENABLED === 'true' || false

src/services/ProcessorService.js

@@ -32,7 +32,9 @@ async function getGroup (v5GroupId, m2mToken) {
  * @param {String} m2mToken token for accessing the API
  */
 async function getV5Terms (v5TermsId, m2mToken) {
+  logger.debug(`Get V5 Terms: ${config.V5_TERMS_API_URL}/${v5TermsId}`)
   const response = await helper.getRequest(`${config.V5_TERMS_API_URL}/${v5TermsId}`, m2mToken)
+  logger.debug(`Get v5 terms response: ${JSON.stringify(response.body)}`)
   return response.body
 }
 
@@ -68,13 +70,20 @@ async function associateChallengeGroups (toBeAdded = [], toBeDeleted = [], legac
  * @param {String|Number} legacyChallengeId the legacy challenge ID
  */
 async function associateChallengeTerms (v5Terms, legacyChallengeId, createdBy, updatedBy) {
+  // logger.debug(`v5Terms Terms Array: ${JSON.stringify(v5Terms)}`)
   const legacyTermsArray = await termsService.getTermsForChallenge(legacyChallengeId)
+  // logger.debug(`Legacy Terms Array: ${JSON.stringify(legacyTermsArray)}`)
   const nda = _.find(v5Terms, e => e.id === config.V5_TERMS_NDA_ID)
   const legacyNDA = _.find(legacyTermsArray, e => _.toNumber(e.id) === _.toNumber(config.LEGACY_TERMS_NDA_ID))
 
   const standardTerms = _.find(v5Terms, e => e.id === config.V5_TERMS_STANDARD_ID)
   const legacyStandardTerms = _.find(legacyTermsArray, e => _.toNumber(e.id) === _.toNumber(config.LEGACY_TERMS_STANDARD_ID))
 
+  // logger.debug(`NDA: ${config.V5_TERMS_NDA_ID} - ${JSON.stringify(nda)}`)
+  // logger.debug(`Standard Terms: ${config.V5_TERMS_STANDARD_ID} - ${JSON.stringify(standardTerms)}`)
+  // logger.debug(`Legacy NDA: ${JSON.stringify(legacyNDA)}`)
+  // logger.debug(`Legacy Standard Terms: ${JSON.stringify(legacyStandardTerms)}`)
+
   const m2mToken = await helper.getM2MToken()
   if (standardTerms && standardTerms.id && !legacyStandardTerms) {
     logger.debug('Associate Challenge Terms - v5 Standard Terms exist, not in legacy. Adding to Legacy.')
@@ -99,16 +108,27 @@ async function associateChallengeTerms (v5Terms, legacyChallengeId, createdBy, u
 
 /**
  * Set the copilot payment on legacy
+ * @param {String} challengeId the V5 challenge ID
  * @param {Number|String} legacyChallengeId the legacy challenge ID
  * @param {Array} prizeSets the prizeSets array
  * @param {String} createdBy the created by handle
  * @param {String} updatedBy the updated by handle
+ * @param {String} m2mToken the m2m token
  */
-async function setCopilotPayment (legacyChallengeId, prizeSets = [], createdBy, updatedBy) {
+async function setCopilotPayment (challengeId, legacyChallengeId, prizeSets = [], createdBy, updatedBy, m2mToken) {
   try {
     const copilotPayment = _.get(_.find(prizeSets, p => p.type === config.COPILOT_PAYMENT_TYPE), 'prizes[0].value', null)
-    logger.debug(`Setting Copilot Payment: ${copilotPayment} for legacyId ${legacyChallengeId}`)
-    await copilotPaymentService.setCopilotPayment(legacyChallengeId, copilotPayment, createdBy, updatedBy)
+    if (copilotPayment) {
+      logger.debug('Fetching challenge copilot...')
+      const res = await helper.getRequest(`${config.V5_RESOURCES_API_URL}?challengeId=${challengeId}&roleId=${config.COPILOT_ROLE_ID}`, m2mToken)
+      const [copilotResource] = res.body
+      if (!copilotResource) {
+        logger.warn(`Copilot does not exist for challenge ${challengeId} (legacy: ${legacyChallengeId})`)
+        return
+      }
+      logger.debug(`Setting Copilot Payment: ${copilotPayment} for legacyId ${legacyChallengeId} for copilot ${copilotResource.memberId}`)
+      await copilotPaymentService.setCopilotPayment(legacyChallengeId, copilotPayment, createdBy, updatedBy)
+    }
   } catch (e) {
     logger.error('Failed to set the copilot payment!')
     logger.debug(e)
@@ -392,7 +412,7 @@ async function processCreate (message) {
     await helper.forceV4ESFeeder(newChallenge.body.result.content.id)
     await associateChallengeGroups(saveDraftContestDTO.groupsToBeAdded, saveDraftContestDTO.groupsToBeDeleted, newChallenge.body.result.content.id)
     // await associateChallengeTerms(saveDraftContestDTO.termsToBeAdded, saveDraftContestDTO.termsToBeRemoved, newChallenge.body.result.content.id)
-    await setCopilotPayment(newChallenge.body.result.content.id, _.get(message, 'payload.prizeSets'), _.get(message, 'payload.createdBy'), _.get(message, 'payload.updatedBy'))
+    await setCopilotPayment(challengeUuid, newChallenge.body.result.content.id, _.get(message, 'payload.prizeSets'), _.get(message, 'payload.createdBy'), _.get(message, 'payload.updatedBy'), m2mToken)
     await helper.patchRequest(`${config.V5_CHALLENGE_API_URL}/${challengeUuid}`, {
       legacy: {
         ...message.payload.legacy,
@@ -516,7 +536,7 @@ async function processUpdate (message) {
     await helper.putRequest(`${config.V4_CHALLENGE_API_URL}/${message.payload.legacyId}`, { param: _.omit(saveDraftContestDTO, ['groupsToBeAdded', 'groupsToBeDeleted']) }, m2mToken)
     await associateChallengeGroups(saveDraftContestDTO.groupsToBeAdded, saveDraftContestDTO.groupsToBeDeleted, message.payload.legacyId)
     await associateChallengeTerms(message.payload.terms, message.payload.legacyId, _.get(message, 'payload.createdBy'), _.get(message, 'payload.updatedBy'))
-    await setCopilotPayment(message.payload.legacyId, _.get(message, 'payload.prizeSets'), _.get(message, 'payload.createdBy'), _.get(message, 'payload.updatedBy'))
+    await setCopilotPayment(message.payload.id, message.payload.legacyId, _.get(message, 'payload.prizeSets'), _.get(message, 'payload.createdBy'), _.get(message, 'payload.updatedBy'), m2mToken)
 
     // Update metadata in IFX
     if (message.payload.metadata && message.payload.metadata.length > 0) {

src/services/copilotPaymentService.js

@@ -5,6 +5,7 @@ const helper = require('../common/helper')
 
 const COPILOT_PAYMENT_PROJECT_INFO_ID = 49
 const COPILOT_PAYMENT_RESOURCE_INFO_ID = 7
+const COPILOT_PAYMENT_TYPE_ID = 15
 const COPILOT_RESOURCE_ROLE_ID = 14
 
 const QUERY_GET_COPILOT_RESOURCE_FOR_CHALLENGE = `SELECT limit 1 resource_id as resourceid FROM resource WHERE project_id = %d AND resource_role_id = ${COPILOT_RESOURCE_ROLE_ID}`
@@ -32,6 +33,10 @@ const QUERY_DELETE_COPILOT_PAYMENT = `DELETE FROM project_info WHERE project_inf
 const QUERY_UPDATE_COPILOT_RESOURCE_PAYMENT = `UPDATE resource_info SET value = ?, modify_user = ?, modify_date = CURRENT WHERE resource_id = ? AND resource_info_type_id = ${COPILOT_PAYMENT_RESOURCE_INFO_ID}`
 // const QUERY_DELETE_COPILOT_RESOURCE_PAYMENT = `DELETE FROM resource_info WHERE resource_id = ? AND resource_info_type_id = ${COPILOT_PAYMENT_RESOURCE_INFO_ID}`
 
+const QUERY_SELECT_PAYMENT_TYPE = `SELECT value FROM resource_info WHERE resource_info_type_id = ${COPILOT_PAYMENT_TYPE_ID} AND resource_id = %d`
+const QUERY_INSERT_PAYMENT_TYPE = `INSERT INTO resource_info (resource_id, resource_info_type_id, value, create_user, create_date, modify_user, modify_date) VALUES (?, "${COPILOT_PAYMENT_TYPE_ID}", ?, ?, CURRENT, ?, CURRENT)`
+const QUERY_UPDATE_PAYMENT_TYPE = `UPDATE resource_info SET value = ?, modify_user = ?, modify_date = CURRENT WHERE resource_id = ? AND resource_info_type_id = ${COPILOT_PAYMENT_TYPE_ID}`
+
 /**
  * Prepare Informix statement
  * @param {Object} connection the Informix connection
@@ -58,6 +63,14 @@ async function setCopilotPayment (challengeLegacyId, amount, createdBy, updatedB
     const copilotResourceId = await getCopilotResourceId(connection, challengeLegacyId)
     const copilotPayment = await getCopilotPayment(connection, challengeLegacyId)
     if (amount != null && amount >= 0) {
+      // Make sure the payment type is set to manual
+      // TODO: Figure out why data is not saved in IFX even when there are no errors
+      // const paymentType = await getCopilotPaymentType(connection, copilotResourceId)
+      // if (!paymentType) {
+      //   await createCopilotPaymentType(connection, copilotResourceId, 'TRUE', updatedBy || createdBy)
+      // } else if (_.toLower(_.toString(paymentType.value)) !== 'true') {
+      //   await updateCopilotPaymentType(connection, copilotResourceId, 'TRUE', updatedBy || createdBy)
+      // }
       if (copilotPayment) {
         logger.debug(`Copilot payment exists, updating: ${challengeLegacyId}`)
         return updateCopilotPayment(connection, copilotResourceId, challengeLegacyId, amount, updatedBy)
@@ -78,6 +91,43 @@ async function setCopilotPayment (challengeLegacyId, amount, createdBy, updatedB
   }
 }
 
+/**
+ * Gets the copilot payment type for a legacyId
+ * @param {Object} connection the connection
+ * @param {Number} resourceId the resource ID
+ */
+async function getCopilotPaymentType (connection, resourceId) {
+  const result = await connection.queryAsync(util.format(QUERY_SELECT_PAYMENT_TYPE, resourceId))
+  logger.debug(`Result: ${JSON.stringify(result, null, 2)}`)
+  return _.get(result, '[0]', null)
+}
+
+/**
+ * Create the copilot payment type record
+ * @param {Object} connection the connection
+ * @param {Number} resourceId the resource ID
+ * @param {Boolean} value the value
+ * @param {String} createdBy the create user handle
+ */
+async function createCopilotPaymentType (connection, resourceId, value, createdBy) {
+  const query = await prepare(connection, QUERY_INSERT_PAYMENT_TYPE)
+  logger.debug(`Create Copilot Payment Type Values: ${[resourceId, value, createdBy, createdBy]}`)
+  await query.executeAsync([resourceId, value, createdBy, createdBy])
+}
+
+/**
+ * Update the copilot payment type record
+ * @param {Object} connection the connection
+ * @param {Number} resourceId the resource ID
+ * @param {Boolean} value the value
+ * @param {String} createdBy the create user handle
+ */
+async function updateCopilotPaymentType (connection, resourceId, value, createdBy) {
+  const query = await prepare(connection, QUERY_UPDATE_PAYMENT_TYPE)
+  logger.debug(`Update Copilot Payment Type Values: ${[value, createdBy, resourceId]}`)
+  await query.executeAsync([value, createdBy, resourceId])
+}
+
 /**
  * Gets the copilot payment for a legacyId
  * @param {Object} connection