Merge branch 'develop'

Author: James Cori

config/default.js

@@ -70,6 +70,10 @@ module.exports = {
 
   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_STANDARD_ID: process.env.V5_TERMS_STANDARD_ID || 'e5811a7b-43d1-407a-a064-69e5015b4900',
+  LEGACY_TERMS_STANDARD_ID: process.env.LEGACY_TERMS_STANDARD_ID || 21233,
+
   LEGACY_SUBMITTER_ROLE_ID: process.env.LEGACY_SUBMITTER_ROLE_ID || 1,
 
   COPILOT_PAYMENT_TYPE: process.env.COPILOT_PAYMENT_TYPE || 'copilot',

src/services/ProcessorService.js

@@ -67,23 +67,33 @@ async function associateChallengeGroups (toBeAdded = [], toBeDeleted = [], legac
  * @param {String|Number} legacyChallengeId the legacy challenge ID
  */
 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 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))
 
-  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, createdBy, updatedBy)
+  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))
+
+  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.')
+    const v5StandardTerm = await getV5Terms(standardTerms.id, m2mToken)
+    await termsService.addTermsToChallenge(legacyChallengeId, v5StandardTerm.legacyId, config.LEGACY_SUBMITTER_ROLE_ID, createdBy, updatedBy)
+  } else if (!standardTerms && legacyStandardTerms && legacyStandardTerms.id) {
+    logger.debug('Associate Challenge Terms - Legacy NDA exist, not in V5. Removing from Legacy.')
+    await termsService.removeTermsFromChallenge(legacyChallengeId, legacyStandardTerms.id, config.LEGACY_SUBMITTER_ROLE_ID)
   }
 
-  if (!nda && legacyNDA && legacyNDA.id) {
+  if (nda && nda.id && !legacyNDA) {
+    logger.debug('Associate Challenge Terms - v5 NDA exist, not in legacy. Adding to Legacy.')
+    const v5NDATerm = await getV5Terms(nda.id, m2mToken)
+    await termsService.addTermsToChallenge(legacyChallengeId, v5NDATerm.legacyId, config.LEGACY_SUBMITTER_ROLE_ID, createdBy, updatedBy, true)
+  } else if (!nda && legacyNDA && legacyNDA.id) {
     logger.debug('Associate Challenge Terms - Legacy NDA exist, not in V5. Removing from Legacy.')
-    return termsService.removeTermsFromChallenge(legacyChallengeId, legacyNDA.id, config.LEGACY_SUBMITTER_ROLE_ID)
+    await termsService.removeTermsFromChallenge(legacyChallengeId, legacyNDA.id, config.LEGACY_SUBMITTER_ROLE_ID, true)
   }
 
-  logger.debug('Associate Challenge Terms - Nothing to Do')
+  // logger.debug('Associate Challenge Terms - Nothing to Do')
 }
 
 /**
@@ -203,7 +213,7 @@ async function parsePayload (payload, m2mToken, isCreated = true, informixGroupI
     const data = {
       ...legacyTrackInfo,
       name: payload.name,
-      reviewType: _.get(payload, 'legacy.reviewType'),
+      reviewType: _.get(payload, 'legacy.reviewType', 'INTERNAL'),
       projectId,
       status: payload.status
     }
@@ -357,6 +367,12 @@ async function processCreate (message) {
   logger.debug('processCreate :: beforeTry')
   try {
     const newChallenge = await helper.postRequest(`${config.V4_CHALLENGE_API_URL}`, { param: _.omit(saveDraftContestDTO, ['groupsToBeAdded', 'groupsToBeDeleted']) }, m2mToken)
+
+    let forumId = 0
+    if (message.payload.legacy && message.payload.legacy.forumId) {
+      forumId = message.payload.legacy.forumId
+    }
+    forumId = _.get(newChallenge, 'body.result.content.forumId', forumId)
     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)
@@ -368,7 +384,7 @@ async function processCreate (message) {
         subTrack: saveDraftContestDTO.subTrack,
         isTask: saveDraftContestDTO.task || false,
         directProjectId: newChallenge.body.result.content.projectId,
-        forumId: _.get(newChallenge, 'body.result.content.forumId', message.payload.legacy.forumId)
+        forumId
       },
       legacyId: newChallenge.body.result.content.id
     }, m2mToken)

src/services/termsService.js

@@ -43,27 +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, createdBy, updatedBy) {
+async function addTermsToChallenge (challengeLegacyId, legacyTermsId, legacyResourceRoleId, createdBy, updatedBy, isNDA = false) {
   const connection = await helper.getInformixConnection()
   let result = null
   try {
-    logger.debug(`Creating Terms ${legacyTermsId} for Challenge ${challengeLegacyId}`)
+    logger.debug(`Creating Terms ${legacyTermsId} for Challenge ${challengeLegacyId} - NDA Flag: ${isNDA === true ? 'true' : 'false'}`)
     await connection.beginTransactionAsync()
     // create association
     const query = await prepare(connection, QUERY_INSERT_CHALLENGE_TERMS)
     result = await query.executeAsync([challengeLegacyId, legacyResourceRoleId, legacyTermsId])
 
-    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])
+    if (isNDA) {
+      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`)
@@ -76,16 +77,18 @@ async function addTermsToChallenge (challengeLegacyId, legacyTermsId, legacyReso
   return result
 }
 
-async function removeTermsFromChallenge (challengeLegacyId, legacyTermsId, legacyResourceRoleId) {
+async function removeTermsFromChallenge (challengeLegacyId, legacyTermsId, legacyResourceRoleId, isNDA = false) {
   const connection = await helper.getInformixConnection()
   let result = null
   try {
     await connection.beginTransactionAsync()
     const query = await prepare(connection, QUERY_DELETE_CHALLENGE_TERMS)
     result = await query.executeAsync([challengeLegacyId, legacyResourceRoleId, legacyTermsId])
 
-    const piquery = await prepare(connection, QUERY_DELETE_PROJECT_INFO_CHALLENGE_TERMS)
-    await piquery.executeAsync([challengeLegacyId])
+    if (isNDA) {
+      const piquery = await prepare(connection, QUERY_DELETE_PROJECT_INFO_CHALLENGE_TERMS)
+      await piquery.executeAsync([challengeLegacyId])
+    }
 
     await connection.commitTransactionAsync()
   } catch (e) {