Merge branch 'develop'

Author: James Cori

src/services/ProcessorService.js

@@ -65,22 +65,16 @@ async function associateChallengeGroups (toBeAdded = [], toBeDeleted = [], legac
  * @param {Array<Object{termsId, roleId}>} toBeDeleted the array of terms to be deleted
  * @param {String|Number} legacyChallengeId the legacy challenge ID
  */
-async function associateChallengeTerms (v5Terms, legacyChallengeId) {
+async function associateChallengeTerms (v5Terms, legacyChallengeId, createdBy, updatedBy) {
   const nda = _.find(v5Terms, e => e.id === config.V5_TERMS_NDA_ID)
   const legacyTermsArray = await termsService.getTermsForChallenge(legacyChallengeId)
   const legacyNDA = _.find(legacyTermsArray, e => _.toNumber(e.id) === _.toNumber(config.LEGACY_TERMS_NDA_ID))
 
-  // logger.debug(`V5 Terms ${JSON.stringify(v5Terms)}`)
-  // logger.debug(`V5 NDA Found ${nda} ${JSON.stringify(nda)}`)
-
-  // logger.debug(`Legacy Terms ${JSON.stringify(legacyTermsArray)}`)
-  // logger.debug(`Legacy NDA Found ${JSON.stringify(legacyNDA)}`)
-
   if (nda && nda.id && !legacyNDA) {
     logger.debug('Associate Challenge Terms - v5 NDA exist, not in legacy. Adding to Legacy.')
     const m2mToken = await helper.getM2MToken()
     const v5Term = await getV5Terms(nda.id, m2mToken)
-    return termsService.addTermsToChallenge(legacyChallengeId, v5Term.legacyId, config.LEGACY_SUBMITTER_ROLE_ID)
+    return termsService.addTermsToChallenge(legacyChallengeId, v5Term.legacyId, config.LEGACY_SUBMITTER_ROLE_ID, createdBy, updatedBy)
   }
 
   if (!nda && legacyNDA && legacyNDA.id) {
@@ -487,7 +481,7 @@ async function processUpdate (message) {
   try {
     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)
+    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'))
 
     if (message.payload.status) {

src/services/termsService.js

@@ -1,13 +1,20 @@
 const logger = require('../common/logger')
 const _ = require('lodash')
 const util = require('util')
+const config = require('config')
 const helper = require('../common/helper')
 
+
 const QUERY_GET_CHALLENGE_TERMS = 'SELECT resource_role_id, terms_of_use_id FROM project_role_terms_of_use_xref WHERE project_id = %d'
 const QUERY_INSERT_CHALLENGE_TERMS = `INSERT INTO project_role_terms_of_use_xref
   (project_id, resource_role_id, terms_of_use_id, create_date, modify_date, sort_order, group_ind) 
   VALUES (?, ?, ?, CURRENT, CURRENT, 1, 0)`
+
+const QUERY_INSERT_PROJECT_INFO_CHALLENGE_TERMS = `INSERT INTO project_info 
+  (project_id, project_info_type_id, value, create_user, create_date, modify_user, modify_date) 
+  VALUES (?, 34, ?, ?, CURRENT, ?, CURRENT)`
 const QUERY_DELETE_CHALLENGE_TERMS = 'DELETE FROM project_role_terms_of_use_xref WHERE project_id = ? AND resource_role_id = ? AND terms_of_use_id = ?'
+const QUERY_DELETE_PROJECT_INFO_CHALLENGE_TERMS = 'DELETE FROM project_info WHERE project_id = ? AND project_info_type_id = 34'
 
 /**
  * Prepare Informix statement
@@ -36,14 +43,28 @@ async function getTermsForChallenge (challengeLegacyId) {
   return _.map(result, r => ({ id: r.terms_of_use_id, roleId: r.resource_role_id }))
 }
 
-async function addTermsToChallenge (challengeLegacyId, legacyTermsId, legacyResourceRoleId) {
+async function addTermsToChallenge (challengeLegacyId, legacyTermsId, legacyResourceRoleId, createdBy, updatedBy) {
   const connection = await helper.getInformixConnection()
   let result = null
   try {
-    // await connection.beginTransactionAsync()
+    logger.debug(`Creating Terms ${legacyTermsId} for Challenge ${challengeLegacyId}`)
+    await connection.beginTransactionAsync()
+    // create association
     const query = await prepare(connection, QUERY_INSERT_CHALLENGE_TERMS)
     result = await query.executeAsync([challengeLegacyId, legacyResourceRoleId, legacyTermsId])
-    // await connection.commitTransactionAsync()
+
+    logger.debug(`Creating Terms - deleting project info record for ${challengeLegacyId}`)
+    // make sure there are no project info records
+    const piqueryDelete = await prepare(connection, QUERY_DELETE_PROJECT_INFO_CHALLENGE_TERMS)
+    await piqueryDelete.executeAsync([challengeLegacyId])
+
+    logger.debug(`Creating Terms - adding project info record for ${challengeLegacyId} ${legacyTermsId} === ${config.LEGACY_TERMS_NDA_ID}`)
+    // add the project info record for the `Confidentiality Type`
+    const termsProjectInfoValue = (legacyTermsId.toString() === config.LEGACY_TERMS_NDA_ID.toString()) ? 'standard_cca' : 'public'
+    const piquery = await prepare(connection, QUERY_INSERT_PROJECT_INFO_CHALLENGE_TERMS)
+    await piquery.executeAsync([challengeLegacyId, termsProjectInfoValue, createdBy, updatedBy])
+
+    await connection.commitTransactionAsync()
   } catch (e) {
     logger.error(`Error in 'addTermsToChallenge' ${e}, rolling back transaction`)
     await connection.rollbackTransactionAsync()
@@ -59,10 +80,14 @@ async function removeTermsFromChallenge (challengeLegacyId, legacyTermsId, legac
   const connection = await helper.getInformixConnection()
   let result = null
   try {
-    // await connection.beginTransactionAsync()
+    await connection.beginTransactionAsync()
     const query = await prepare(connection, QUERY_DELETE_CHALLENGE_TERMS)
     result = await query.executeAsync([challengeLegacyId, legacyResourceRoleId, legacyTermsId])
-    // await connection.commitTransactionAsync()
+
+    const piquery = await prepare(connection, QUERY_DELETE_PROJECT_INFO_CHALLENGE_TERMS)
+    await piquery.executeAsync([challengeLegacyId])
+
+    await connection.commitTransactionAsync()
   } catch (e) {
     logger.error(`Error in 'removeTermsFromChallenge' ${e}, rolling back transaction`)
     await connection.rollbackTransactionAsync()