Merge branch 'develop'

Author: James Cori

src/scripts/migrations/010-fix-effort-hours.js

@@ -0,0 +1,96 @@
+/**
+ * Populate the following properties on the challenges:
+ * - metadata.effortHoursEstimate
+ * - metadata.effortHoursOffshore
+ * - metadata.effortHoursOnshore
+ */
+global.Promise = require('bluebird')
+
+const config = require('config')
+const _ = require('lodash')
+const logger = require('../../util/logger')
+const challengeService = require('../../services/challengeService')
+const { getESClient } = require('../../util/helper')
+const { getEffortHoursFromIfx } = require('../../services/challengeInformixService')
+
+const mapping = {
+  effortHoursEstimate: 88,
+  effortHoursOffshore: 89,
+  effortHoursOnshore: 90
+}
+
+const migrationFunction = {
+  run: async () => {
+    const perPage = config.get('MIGRATION_SCRIPT_BATCH_SIZE')
+    let finish = false
+    let page = 0
+    let batch = 1
+
+    while (!finish) {
+      logger.info(`Batch-${batch} - Loading challenges`)
+      const challenges = await getChallengesMissingData(page, perPage)
+      logger.info(`Found ${challenges.length} challenges`)
+      if (challenges.length > 0) {
+        for (const challenge of challenges) {
+          challenge.legacy.migration = 10
+          const legacyData = await getEffortHoursFromIfx(challenge.legacyId)
+          if (legacyData.length > 0) {
+            _.keys(mapping, (key) => {
+              const v5Index = _.findIndex(challenge.metadata, meta => meta.name === key)
+              const legacyIndex = _.findIndex(legacyData, entry => entry.project_info_type_id === mapping[key])
+              if (v5Index === -1) {
+                challenge.metadata.push({
+                  name: key,
+                  value: legacyData[legacyIndex].value
+                })
+              } else {
+                challenge.metadata[v5Index].value = legacyData[legacyIndex].value
+              }
+            })
+            await challengeService.save(challenge)
+          }
+        }
+      } else {
+        finish = true
+      }
+      page++
+      batch++
+    }
+  }
+}
+
+async function getChallengesMissingData (page = 0, perPage = 10) {
+  const esQuery = {
+    index: config.get('ES.CHALLENGE_ES_INDEX'),
+    type: config.get('ES.CHALLENGE_ES_TYPE'),
+    size: perPage,
+    from: page * perPage,
+    body: {
+      query: {
+        range: {
+          'legacy.migration': {
+            lt: 10
+          }
+        }
+      }
+    }
+  }
+  // logger.debug(`ES Query ${JSON.stringify(esQuery)}`)
+  // Search with constructed query
+  let docs
+  try {
+    docs = await getESClient().search(esQuery)
+  } catch (e) {
+    // Catch error when the ES is fresh and has no data
+    docs = {
+      hits: {
+        total: 0,
+        hits: []
+      }
+    }
+  }
+  // Extract data from hits
+  return _.map(docs.hits.hits, item => (item._source))
+}
+
+module.exports = migrationFunction

src/services/challengeInformixService.js

@@ -4,15 +4,30 @@ const helper = require('../util/helper')
 // const getErrorService = require('./errorService')
 const { executeQueryAsync } = require('../util/informixWrapper')
 
+/**
+ * Get effort hours for a legacyId
+ * @param {Number} legacyId the legacy ID
+ */
+async function getEffortHoursFromIfx (legacyId) {
+  const sql = `SELECT LIMIT 1
+    project_info_type_id,
+    value,
+    FROM project_info
+    WHERE project_id = ${legacyId} and project_info_type_id in (88, 89, 90)
+  `
+  return execQuery(sql)
+}
+
 /**
  * Gets the copilot payment for a legacyId
  * @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)
 }
 
 /**
@@ -682,5 +697,6 @@ module.exports = {
   getCopilotPaymentFromIfx,
   createCopilotPaymentInIfx,
   updateCopilotPaymentInIfx,
-  deleteCopilotPaymentFromIfx
+  deleteCopilotPaymentFromIfx,
+  getEffortHoursFromIfx
 }

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,10 +747,32 @@ 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))
 
+  const effortHoursMapping = {
+    effortHoursEstimate: 88,
+    effortHoursOffshore: 89,
+    effortHoursOnshore: 90
+  }
+
+  const legacyEffortHoursData = await challengeInformixService.getEffortHoursFromIfx(legacyId)
+  if (legacyEffortHoursData.length > 0) {
+    _.keys(effortHoursMapping, (key) => {
+      const legacyIndex = _.findIndex(legacyEffortHoursData, entry => entry.project_info_type_id === effortHoursMapping[key])
+      metadata.push({
+        name: key,
+        value: legacyEffortHoursData[legacyIndex].value
+      })
+    })
+  }
+
   const events = []
   if (challengeListing.events && challengeListing.events.length > 0) {
     for (const event of challengeListing.events) {

src/services/syncService.js

@@ -45,9 +45,21 @@ async function syncLegacyId (legacyId, force) {
  * @param {Number} legacyId
  */
 async function processChallenge (legacyId, challengeListing, challengeDetails) {
+  const timelineScheduleFields = ['phases', 'startDate', 'endDate', 'currentPhaseNames', 'registrationStartDate', 'registrationEndDate', 'submissionStartDate', 'submissionEndDate']
   const v5ChallengeObjectFromV4 = await challengeService.buildV5Challenge(legacyId, challengeListing, challengeDetails)
   const [v5ChallengeFromAPI] = await challengeService.getChallengeFromV5API(legacyId)
 
+  // Timeline fields are managed by the V5 Scheduler instead of the legacy autopilot
+  if (_.get(v5ChallengeFromAPI, 'legacy.useSchedulingAPI') === true) {
+    _.set(v5ChallengeObjectFromV4, 'legacy.useSchedulingAPI', true)
+    _.each(timelineScheduleFields, (prop) => {
+      _.unset(v5ChallengeObjectFromV4, prop)
+    })
+  }
+
+  // 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
 
@@ -112,7 +124,7 @@ async function processChallenge (legacyId, challengeListing, challengeDetails) {
       prizes: [
         {
           type: 'USD',
-          value: copilotPayment.value
+          value: copilotPayment.amount
         }
       ],
       type: config.COPILOT_PAYMENT_TYPE

src/util/conversionMappings.js

@@ -135,7 +135,7 @@ module.exports = {
       [V5_TYPE_IDS.TASK]: () => buildV4Data(V4_TRACKS.DEVELOP, V4_SUBTRACKS.FIRST_2_FINISH, true)
     },
     [V5_TRACK_IDS.QA]: {
-      [V5_TYPE_IDS.CHALLENGE]: () => buildV4Data(V4_TRACKS.DEVELOP, V4_SUBTRACKS.TEST_SUITES, false),
+      [V5_TYPE_IDS.CHALLENGE]: () => buildV4Data(V4_TRACKS.DEVELOP, V4_SUBTRACKS.BUG_HUNT, false),
       [V5_TYPE_IDS.FIRST_2_FINISH]: () => buildV4Data(V4_TRACKS.DEVELOP, V4_SUBTRACKS.FIRST_2_FINISH, false),
       [V5_TYPE_IDS.TASK]: () => buildV4Data(V4_TRACKS.DEVELOP, V4_SUBTRACKS.FIRST_2_FINISH, true)
     }