Merge branch 'develop'

Author: James Cori

src/services/challengeInformixService.js

@@ -9,7 +9,7 @@ const { executeQueryAsync } = require('../util/informixWrapper')
  * @param {Number} legacyId the legacy ID
  */
 async function getEffortHoursFromIfx (legacyId) {
-  const sql = `SELECT LIMIT 1
+  const sql = `SELECT 
     project_info_type_id,
     value
     FROM project_info

src/services/challengeService.js

@@ -689,7 +689,7 @@ async function buildV5Challenge (legacyId, challengeListing, challengeDetails) {
     })
   }
 
-  logger.debug(`v4 Phases ${JSON.stringify(challengeListing.phases)}`)
+  // logger.debug(`v4 Phases ${JSON.stringify(challengeListing.phases)}`)
   newChallenge.startDate = moment(challengeListing.registrationStartDate).utc().format()
   let challengeEndDate = newChallenge.startDate
   const phases = _.map(challengeListing.phases, phase => {
@@ -719,7 +719,7 @@ async function buildV5Challenge (legacyId, challengeListing, challengeDetails) {
     return newPhase
   })
   newChallenge.endDate = challengeEndDate
-  logger.debug(`Final Phase Array ${JSON.stringify(phases)}`)
+  // logger.debug(`Final Phase Array ${JSON.stringify(phases)}`)
 
   if (phases.length > 0) {
     const registrationPhase = _.find(phases, p => p.name === 'Registration')
@@ -764,6 +764,7 @@ async function buildV5Challenge (legacyId, challengeListing, challengeDetails) {
   }
 
   // const legacyEffortHoursData = await challengeInformixService.getEffortHoursFromIfx(legacyId)
+  // logger.debug(`Legacy Effort Hours ${JSON.stringify(legacyEffortHoursData)}`)
   // if (legacyEffortHoursData.length > 0) {
   //   _.keys(effortHoursMapping, (key) => {
   //     const legacyIndex = _.findIndex(legacyEffortHoursData, entry => entry.project_info_type_id === effortHoursMapping[key])
@@ -775,9 +776,11 @@ async function buildV5Challenge (legacyId, challengeListing, challengeDetails) {
   // }
 
   const legacyEffortHoursData = await challengeInformixService.getEffortHoursFromIfx(legacyId)
+  logger.debug(`Legacy Effort Hours ${JSON.stringify(legacyEffortHoursData)}`)
+  logger.debug(`Metadata: ${JSON.stringify(metadata)}`)
   if (legacyEffortHoursData.length > 0) {
     _.forEach(effortHoursMapping, (mappingValue, key) => {
-      // logger.debug(`${JSON.stringify(mappingValue)} -> ${key}`)
+      logger.debug(`${JSON.stringify(mappingValue)} -> ${key}`)
       const v5Index = _.findIndex(metadata, meta => meta.name === key)
       const legacyIndex = _.findIndex(legacyEffortHoursData, entry => entry.project_info_type_id === mappingValue)
       if (legacyIndex > -1) {
@@ -786,17 +789,18 @@ async function buildV5Challenge (legacyId, challengeListing, challengeDetails) {
             name: key,
             value: legacyEffortHoursData[legacyIndex].value
           }
-          // logger.debug(`Not found in v5, adding ${JSON.stringify(newData)}`)
+          logger.debug(`Not found in v5, adding ${JSON.stringify(newData)}`)
           metadata.push(newData)
         } else {
           metadata[v5Index].value = legacyEffortHoursData[legacyIndex].value
-          // logger.debug(`Metadata found in v5, updating v5 index: ${v5Index} ${legacyIndex} V5 Metadata ${JSON.stringify(challenge.metadata[v5Index])} -- Legacy Data ${JSON.stringify(legacyData[legacyIndex])}`)
+          logger.debug(`Metadata found in v5, updating v5 index: ${v5Index} ${legacyIndex} V5 Metadata ${JSON.stringify(metadata[v5Index])} -- Legacy Data ${JSON.stringify(legacyData[legacyIndex])}`)
         }
       } else {
-        // logger.debug(`Key ${key} not found in legacy array`)
+        logger.debug(`Key ${key} not found in legacy array`)
       }
     })
   }
+  logger.debug(`Finished Metadata: ${JSON.stringify(metadata)}`)
 
   const events = []
   if (challengeListing.events && challengeListing.events.length > 0) {

src/services/syncService.js

@@ -63,7 +63,7 @@ async function processChallenge (legacyId, challengeListing, challengeDetails) {
   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}`)
+  // 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`)
@@ -90,7 +90,7 @@ async function processChallenge (legacyId, challengeListing, challengeDetails) {
     logger.logFullError(e)
   }
 
-  const ommittedFields = ['id', 'type', 'track', 'typeId', 'trackId', 'prizeSets', 'descriptionFormat']
+  const ommittedFields = ['id', 'type', 'track', 'typeId', 'trackId', 'prizeSets', 'descriptionFormat', 'metadata']
 
   // logger.info(`After V5 Sub Sync: ${challengeObj.numOfSubmissions} ${v5ChallengeFromAPI.numOfSubmissions}`)
   if (v5ChallengeObjectFromV4.track.toUpperCase() === V4_TRACKS.DESIGN) {
@@ -131,7 +131,7 @@ async function processChallenge (legacyId, challengeListing, challengeDetails) {
     })
   }
 
-  logger.debug(`Syncing Prize Sets for Challenge ${legacyId}, ${JSON.stringify(prizeSets)}`)
+  // logger.debug(`Syncing Prize Sets for Challenge ${legacyId}, ${JSON.stringify(prizeSets)}`)
 
   const updatedV5Object = {
     ..._.omit(v5ChallengeFromAPI, ['prizeSets']),
@@ -140,7 +140,7 @@ async function processChallenge (legacyId, challengeListing, challengeDetails) {
     tags: _.filter(_.uniq(_.concat(_.get(v5ChallengeFromAPI, 'tags'), _.get(v5ChallengeObjectFromV4, 'tags'))), t => _.toLower(t) !== 'other'),
     ...additionalInformation
   }
-  logger.debug(`new V5 Object: ${JSON.stringify(updatedV5Object)}`)
+  // logger.debug(`new V5 Object: ${JSON.stringify(updatedV5Object)}`)
   return challengeService.save(updatedV5Object)
 }
 
@@ -154,8 +154,8 @@ async function processResources (legacyId, challengeId, force) {
   const currentV4Array = await resourceService.getResourcesForChallenge(legacyId, challengeId)
   const currentV5Array = await resourceService.getResourcesFromV5API(challengeId)
 
-  logger.debug(`Resources V4 Array ${JSON.stringify(currentV4Array)}`)
-  logger.debug(`Resources V5 Array ${JSON.stringify(currentV5Array)}`)
+  // logger.debug(`Resources V4 Array ${JSON.stringify(currentV4Array)}`)
+  // logger.debug(`Resources V5 Array ${JSON.stringify(currentV5Array)}`)
 
   for (let i = 0; i < currentV4Array.length; i += 1) {
     const v4Obj = currentV4Array[i]