Fixes

Author: rootelement

src/services/ProcessorService.js

@@ -69,9 +69,10 @@ async function associateChallengeTerms (toBeAdded = [], toBeDeleted = [], legacy
   for (const terms of toBeAdded) {
     await termsService.addTermsToChallenge(legacyChallengeId, terms.termsId, terms.roleId)
   }
-  for (const terms of toBeDeleted) {
-    await termsService.removeTermsFromChallenge(legacyChallengeId, terms.termsId, terms.roleId)
-  }
+  // TODO :: For now, don't remove terms from legacy
+  // for (const terms of toBeDeleted) {
+  //   await termsService.removeTermsFromChallenge(legacyChallengeId, terms.termsId, terms.roleId)
+  // }
 }
 
 /**
@@ -319,9 +320,11 @@ async function parsePayload (payload, m2mToken, isCreated = true, informixGroupI
       if (data.termsToBeDeleted.length > 0) {
         logger.debug(`parsePayload :: Deleting Terms ${JSON.stringify(data.termsToBeDeleted)}`)
       }
-    } else if (informixTermsArray && informixTermsArray.length > 0) {
-      data.termsToBeDeleted = _.map(informixTermsArray, o => ({ id: o.id, roleId: o.roleId }))
     }
+    // TODO Do not remove terms
+    // } else if (informixTermsArray && informixTermsArray.length > 0) {
+    //   data.termsToBeDeleted = _.map(informixTermsArray, o => ({ id: o.id, roleId: o.roleId }))
+    // }
 
     return data
   } catch (err) {

src/services/termsService.js

@@ -3,7 +3,7 @@ const _ = require('lodash')
 const util = require('util')
 const helper = require('../common/helper')
 
-const QUERY_GET_CHALLENGE_TERMS = 'SELECT resource_role_id as roleId, terms_of_use_id as id FROM project_role_terms_of_use_xref WHERE project_id = %d'
+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)`
@@ -33,7 +33,7 @@ async function getTermsForChallenge (challengeLegacyId) {
   } finally {
     await connection.closeAsync()
   }
-  return _.map(result, r => ({ termsId: r.terms_of_use_id, roleId: r.resource_role_id }))
+  return _.map(result, r => ({ id: r.terms_of_use_id, roleId: r.resource_role_id }))
 }
 
 async function addTermsToChallenge (challengeLegacyId, legacyTermsId, legacyResourceRoleId) {