Merge branch 'develop' of https://github.com/topcoder-platform/legacy-challenge-processor into PROD-2397

Author: marioskranitsas

src/services/ProcessorService.js

@@ -18,6 +18,7 @@ const metadataService = require('./metadataService')
 const paymentService = require('./paymentService')
 const { createOrSetNumberOfReviewers } = require('./selfServiceReviewerService')
 const { disableTimelineNotifications } = require('./selfServiceNotificationService')
+const legacyChallengeService = require('./legacyChallengeService')
 
 /**
  * Drop and recreate phases in ifx
@@ -341,7 +342,7 @@ async function getLegacyTrackInformation (trackId, typeId, tags, m2mToken) {
     `typeId=${typeId}`
   ]
   _.each((tags || []), (tag) => {
-    query.push(`tags[]=${tag}`)
+    query.push(`tags[]=${encodeURIComponent(tag)}`)
   })
   try {
     const res = await helper.getRequest(`${config.V5_CHALLENGE_MIGRATION_API_URL}/convert-to-v4?${query.join('&')}`, m2mToken)
@@ -656,7 +657,6 @@ async function processMessage (message) {
     if (_.get(message, 'payload.legacy.selfService')) {
       await disableTimelineNotifications(legacyId, createdByUserId) // disable
     }
-
   }
 
   logger.debug('Result from parsePayload:')
@@ -734,6 +734,11 @@ async function processMessage (message) {
     } else {
       logger.info('Will skip syncing phases as the challenge is a task...')
     }
+    if (message.payload.status === constants.challengeStatuses.CancelledClientRequest && challenge.currentStatus !== constants.challengeStatuses.CancelledClientRequest) {
+      logger.info('Cancelling challenge...')
+      await legacyChallengeService.cancelChallenge(legacyId, updatedByUserId)
+      needSyncV4ES = true
+    }
     if (needSyncV4ES) {
       try {
         logger.info(`Resync V4 ES for the legacy challenge ${legacyId}`)

src/services/legacyChallengeService.js

@@ -0,0 +1,50 @@
+/**
+ * Legacy Challenge Service
+ * Interacts with InformixDB
+ */
+const logger = require('../common/logger')
+const util = require('util')
+const helper = require('../common/helper')
+const { createChallengeStatusesMap } = require('../constants')
+
+const QUERY_UPDATE_PROJECT = 'UPDATE project SET project_status_id = ?, modify_user = ? WHERE project_id = %d'
+
+/**
+ * Prepare Informix statement
+ * @param {Object} connection the Informix connection
+ * @param {String} sql the sql
+ * @return {Object} Informix statement
+ */
+async function prepare (connection, sql) {
+  // logger.debug(`Preparing SQL ${sql}`)
+  const stmt = await connection.prepareAsync(sql)
+  return Promise.promisifyAll(stmt)
+}
+
+/**
+ * Update a challenge in IFX
+ * @param {Number} challengeLegacyId the legacy challenge ID
+ * @param {Number} createdBy the creator user ID
+ */
+async function cancelChallenge (challengeLegacyId, createdBy) {
+  const connection = await helper.getInformixConnection()
+  let result = null
+  try {
+    await connection.beginTransactionAsync()
+    const query = await prepare(connection, util.format(QUERY_UPDATE_PROJECT, challengeLegacyId))
+    result = await query.executeAsync([createChallengeStatusesMap.CancelledClientRequest, createdBy])
+    await connection.commitTransactionAsync()
+  } catch (e) {
+    logger.error(`Error in 'cancelChallenge' ${e}, rolling back transaction`)
+    await connection.rollbackTransactionAsync()
+    throw e
+  } finally {
+    logger.info(`Challenge ${challengeLegacyId} has been cancelled`)
+    await connection.closeAsync()
+  }
+  return result
+}
+
+module.exports = {
+  cancelChallenge
+}

src/services/selfServiceReviewerService.js

@@ -6,10 +6,10 @@ const util = require('util')
 const logger = require('../common/logger')
 const helper = require('../common/helper')
 
-const QUERY_GET_ENTRY = 'SELECT parameter FROM phase_criteria WHERE project_phase_id = %d'
+const QUERY_GET_ENTRY = 'SELECT parameter FROM phase_criteria WHERE project_phase_id = %d AND phase_criteria_type_id = 6'
 const QUERY_CREATE = 'INSERT INTO phase_criteria (project_phase_id, phase_criteria_type_id, parameter, create_user, create_date, modify_user, modify_date) VALUES (?, 6, ?, ?, CURRENT, ?, CURRENT)'
-const QUERY_UPDATE = 'UPDATE phase_criteria SET parameter = ?, modify_user = ?, modify_date = CURRENT WHERE project_phase_id = ?'
-const QUERY_DELETE = 'DELETE FROM phase_criteria WHERE project_phase_id = ?'
+const QUERY_UPDATE = 'UPDATE phase_criteria SET parameter = ?, modify_user = ?, modify_date = CURRENT WHERE project_phase_id = ? AND phase_criteria_type_id = 6'
+const QUERY_DELETE = 'DELETE FROM phase_criteria WHERE project_phase_id = ? AND phase_criteria_type_id = 6'
 
 /**
  * Prepare Informix statement
@@ -43,10 +43,9 @@ async function getEntry (phaseId) {
 }
 
 /**
- * Enable timeline notifications
+ * Merge number of reviewers
  * @param {Number} phaseId the legacy challenge ID
- * @param {Number} typeId the type ID
- * @param {Any} value the value
+ * @param {Number=} value the value
  * @param {String} createdBy the created by
  */
 async function createOrSetNumberOfReviewers (phaseId, value, createdBy) {
@@ -67,7 +66,7 @@ async function createOrSetNumberOfReviewers (phaseId, value, createdBy) {
       }
     } else {
       const query = await prepare(connection, QUERY_CREATE)
-      logger.info(`Will delete with values: ${phaseId}, ${value}, ${createdBy}, ${createdBy}`)
+      logger.info(`Will create with values: ${phaseId}, ${value}, ${createdBy}, ${createdBy}`)
       result = await query.executeAsync([phaseId, value, createdBy, createdBy])
     }
     await connection.commitTransactionAsync()