Merge branch 'develop' into scheduling-api-changes

Author: ThomasKranitsas

src/constants.js

@@ -9,6 +9,15 @@ const prizeSetTypes = {
   CheckpointPrizes: 'checkpoint'
 }
 
+const challengeStatusOrders = {
+  draft: 0,
+  active: 1,
+  completed: 2,
+  deleted: 2,
+  cancelled: 2
+}
+
 module.exports = {
-  prizeSetTypes
+  prizeSetTypes,
+  challengeStatusOrders
 }

src/services/challengeInformixService.js

@@ -9,10 +9,11 @@ const { executeQueryAsync } = require('../util/informixWrapper')
  * @param {Number} legacyId the legacy ID
  */
 async function getCopilotPaymentFromIfx (legacyId) {
-  const sql = `SELECT limit 1 * FROM project_info WHERE project_id = ${_.toInteger(legacyId)} AND project_info_type_id = 49`
-  const result = await execQuery(sql)
-  if (result && result[0]) return result[0]
-  return false
+  const getCopilotResourceRes = await execQuery(`SELECT limit 1 resource_id as resourceid FROM resource WHERE project_id = ${_.toInteger(legacyId)} AND resource_role_id = 14`)
+  const copilotResourceId = _.get(getCopilotResourceRes, '[0].resourceid', null)
+  if (!copilotResourceId) return null
+  const result = await execQuery(`SELECT amount FROM project_payment where resource_id = ${_.toInteger(copilotResourceId)} AND project_payment_type_id = 4`)
+  return _.get(result, '[0]', null)
 }
 
 /**

src/services/challengeService.js

@@ -714,13 +714,19 @@ async function buildV5Challenge (legacyId, challengeListing, challengeDetails) {
     } else {
       newPhase.isOpen = false
     }
+    logger.debug(`Challenge ${legacyId} Phase ${phase.type} id ${newPhase.phaseId} Duration ${v5duration} = ${(v5duration / 60 / 60)} hrs or ${(v5duration / 60 / 60 / 24)} days`)
     return newPhase
   })
   newChallenge.endDate = challengeEndDate
+  logger.debug(`Final Phase Array ${JSON.stringify(phases)}`)
 
   if (phases.length > 0) {
     const registrationPhase = _.find(phases, p => p.name === 'Registration')
     const submissionPhase = _.find(phases, p => p.name === 'Submission')
+
+    logger.debug(`Registration Phase ${JSON.stringify(registrationPhase)}`)
+    logger.debug(`Submission Phase ${JSON.stringify(submissionPhase)}`)
+
     newChallenge.currentPhaseNames = _.map(_.filter(phases, p => p.isOpen === true), 'name')
     if (registrationPhase) {
       newChallenge.registrationStartDate = registrationPhase.actualStartDate || registrationPhase.scheduledStartDate
@@ -741,7 +747,12 @@ async function buildV5Challenge (legacyId, challengeListing, challengeDetails) {
 
   const metadataList = ['allowStockArt', 'drPoints', 'submissionViewable', 'submissionLimit', 'codeRepo', 'environment']
   const allMetadata = _.map(metadataList, item => {
-    if (challengeListing[item]) return { name: item, value: _.toString(challengeListing[item]) }
+    if (challengeListing[item]) {
+      if (item === 'submissionLimit') {
+        return { name: item, value: _.toString(_.get(challengeListing[item], 'count', 0)) }
+      }
+      return { name: item, value: _.toString(challengeListing[item]) }
+    }
   })
   metadata.push(..._.compact(allMetadata))
 

src/services/syncService.js

@@ -8,6 +8,7 @@ const challengeMigrationStatusService = require('../services/challengeMigrationS
 const migrationService = require('../services/migrationService')
 const challengeIfxService = require('../services/challengeInformixService')
 const { V4_TRACKS } = require('../util/conversionMappings')
+const { challengeStatusOrders } = require('../constants')
 
 async function syncLegacyId (legacyId, force) {
   // const legacyId = queuedChallenges.items[i].legacyId
@@ -59,6 +60,16 @@ async function processChallenge (legacyId, challengeListing, challengeDetails) {
   // logger.debug(`V5 Object Built from V4: ${JSON.stringify(v5ChallengeObjectFromV4)}`)
   // logger.debug(`V5 Object from API: ${JSON.stringify(v5ChallengeFromAPI)}`)
 
+  const v4StatusNumber = challengeStatusOrders[_.toLower(v5ChallengeObjectFromV4.status)] || challengeStatusOrders.cancelled
+  const v5StatusNumber = challengeStatusOrders[_.toLower(v5ChallengeFromAPI.status)] || challengeStatusOrders.cancelled
+
+  logger.debug(`v4 Status Number: ${v4StatusNumber} - v5 Status Number: ${v5StatusNumber}`)
+
+  if (v4StatusNumber < v5StatusNumber) {
+    logger.warn(`Status in v4 is: ${_.toLower(v5ChallengeObjectFromV4.status)}  - Status in v5 is: ${_.toLower(v5ChallengeFromAPI.status)} NOT updating v5`)
+    v5ChallengeObjectFromV4.status = v5ChallengeFromAPI.status
+  }
+
   const additionalInformation = {}
 
   // logger.info(`Before V5 Reg Sync: ${challengeObj.numOfRegistrants} ${v5ChallengeFromAPI.numOfRegistrants}`)
@@ -113,7 +124,7 @@ async function processChallenge (legacyId, challengeListing, challengeDetails) {
       prizes: [
         {
           type: 'USD',
-          value: copilotPayment.value
+          value: copilotPayment.amount
         }
       ],
       type: config.COPILOT_PAYMENT_TYPE