Fixing the challenge ID to detect if it's a legacy ID and to convert it to a uuid, which the resource api needs.

Author: rootelement

config/default.js

@@ -33,6 +33,7 @@ module.exports = {
   REGISTRANT_RESOURCE_ROLE_ID: process.env.REGISTRANT_RESOURCE_ROLE_ID || '732339e7-8e30-49d7-9198-cccf9451e221',
   SUBMISSIONS_API_URL: process.env.SUBMISSIONS_API_URL || 'http://localhost:4000/v5/submissions',
   RESOURCES_API_URL: process.env.RESOURCES_API_URL || 'http://localhost:4000/v5/resources',
+  CHALLENGE_API_URL: process.env.RESOURCES_API_URL || 'http://localhost:4000/v5/challenges',
   CONTEST_SUBMISSION_TYPE: process.env.CONTEST_SUBMISSION_TYPE || 'Contest Submission',
   CHECKPOINT_SUBMISSION_TYPE: process.env.CHECKPOINT_SUBMISSION_TYPE || 'Checkpoint Submission',
 

src/common/helper.js

@@ -6,6 +6,7 @@ const AWS = require('aws-sdk')
 const config = require('config')
 const elasticsearch = require('elasticsearch')
 const _ = require('lodash')
+const logger = require('./logger')
 const m2mAuth = require('tc-core-library-js').auth.m2m
 const m2m = m2mAuth(_.pick(config, ['AUTH0_URL', 'AUTH0_AUDIENCE', 'TOKEN_CACHE_TIME', 'AUTH0_PROXY_SERVER_URL']))
 const superagent = require('superagent')
@@ -106,8 +107,52 @@ function getESClient () {
   return esClients['client']
 }
 
+/**
+ * Get v5 challenge uuid if the challenge id is legacyId format form
+ * @param {String} challengeId Challenge ID
+ * @returns {String} Legacy Challenge ID of the given challengeId
+ */
+async function getV5ChallengeId (challengeId) {
+  if (/^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(challengeId)) {
+    return challengeId
+  } else {
+    logger.debug(`${challengeId} detected as legacyId. Fetching challenge uuid`)
+    try {
+      const v5challenge = await getData(`${config.CHALLENGE_API_URL}?legacyId=${challengeId}`)
+      logger.debug(`Legacy challenge id is ${v5challenge.id} for v5 challenge legacyId ${challengeId}`)
+      return v5challenge.id
+    } catch (err) {
+      logger.error(`Error while accessing ${config.CHALLENGE_API_URL}?legacyId=${challengeId} - ${JSON.stringify(err)}`)
+      throw err
+    }
+  }
+}
+
+/**
+ * Get legacy challenge id if the challenge id is uuid form
+ * @param {String} challengeId Challenge ID
+ * @returns {String} Legacy Challenge ID of the given challengeId
+ */
+async function getLegacyChallengeId (challengeId) {
+  if (/^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(challengeId)) {
+    logger.debug(`${challengeId} detected as uuid. Fetching legacy challenge id`)
+    try {
+      const v5challenge = await getData(`${config.CHALLENGE_API_URL}/${challengeId}`)
+      const legacyId = parseInt(v5challenge.legacyId, 10)
+      logger.debug(`Legacy challenge id is ${legacyId} for v5 challenge id ${challengeId}`)
+      return legacyId
+    } catch (err) {
+      logger.error(`Error while accessing ${config.CHALLENGEAPI_V5_URL}/${challengeId}`)
+      throw err
+    }
+  }
+  return challengeId
+}
+
 module.exports = {
   getData,
   getAllPagesData,
-  getESClient
+  getESClient,
+  getV5ChallengeId,
+  getLegacyChallengeId
 }

src/services/ProcessorService.js

@@ -229,22 +229,25 @@ removeResource.schema = createResource.schema
  * @param {String} challengeId the challenge id
  */
 async function updateSubmissionsData (challengeId) {
+  // const v5challengeId = await helper.getV5ChallengeId(challengeId)
+  const legacyId = await helper.getLegacyChallengeId(challengeId)
+  logger.debug(`Update Submissions Data - Legacy ID ${legacyId}`)
   // get all challenge resources
-  const resources = await helper.getData(config.RESOURCES_API_URL, { challengeId })
+  // const resources = await helper.getData(config.RESOURCES_API_URL, { challengeId })
   // get all challenge submissions, all pages are retrieved
-  const subs = await helper.getAllPagesData(config.SUBMISSIONS_API_URL, { challengeId })
+  const subs = await helper.getAllPagesData(config.SUBMISSIONS_API_URL, { legacyId })
 
   // function to find submitter handle by member id among challenge resources
-  const getSubmitter = (memberId) => {
-    const resource = _.find(resources, (r) => String(r.memberId) === String(memberId))
-    if (!resource) {
-      // there are some rare cases that submitter resource is not found,
-      // e.g. user unregisters a challenge after uploading a submission,
-      // in such cases, return null submitter instead of disabling the whole challenge submissions data
-      return null
-    }
-    return resource.memberHandle
-  }
+  // const getSubmitter = (memberId) => {
+  //   const resource = _.find(resources, (r) => String(r.memberId) === String(memberId))
+  //   if (!resource) {
+  //     // there are some rare cases that submitter resource is not found,
+  //     // e.g. user unregisters a challenge after uploading a submission,
+  //     // in such cases, return null submitter instead of disabling the whole challenge submissions data
+  //     return null
+  //   }
+  //   return resource.memberHandle
+  // }
 
   // construct data
   const submissions = []
@@ -255,39 +258,40 @@ async function updateSubmissionsData (challengeId) {
   const submittersMap = {}
 
   _.forEach(subs, (sub) => {
-    let target
+    // let target
     if (sub.type === config.CONTEST_SUBMISSION_TYPE) {
-      target = submissions
+      // target = submissions
       numOfSubmissions += 1
       // count number of submitters, only contest submissions are considered
       if (!submittersMap[sub.memberId]) {
         numOfRegistrants += 1
         submittersMap[sub.memberId] = true
       }
     } else if (sub.type === config.CHECKPOINT_SUBMISSION_TYPE) {
-      target = checkpoints
+      // target = checkpoints
       numOfCheckpointSubmissions += 1
-    } else {
-      // ignore the submission, it is not type of contest submission or checkpoint submission
-      return
     }
+    // } else {
+    // ignore the submission, it is not type of contest submission or checkpoint submission
+    // return
+    // }
     // add submission to submissions or checkpoints
-    const record = _.find(target, (item) => String(item.submitterId) === String(sub.memberId))
-    if (record) {
-      record.submissions.push({
-        submissionId: sub.id,
-        submissionTime: sub.created
-      })
-    } else {
-      target.push({
-        submitter: getSubmitter(sub.memberId),
-        submitterId: sub.memberId,
-        submissions: [{
-          submissionId: sub.id,
-          submissionTime: sub.created
-        }]
-      })
-    }
+    // const record = _.find(target, (item) => String(item.submitterId) === String(sub.memberId))
+    // if (record) {
+    //   record.submissions.push({
+    //     submissionId: sub.id,
+    //     submissionTime: sub.created
+    //   })
+    // } else {
+    //   target.push({
+    //     submitter: getSubmitter(sub.memberId),
+    //     submitterId: sub.memberId,
+    //     submissions: [{
+    //       submissionId: sub.id,
+    //       submissionTime: sub.created
+    //     }]
+    //   })
+    // }
   })
 
   // update challenge's submissions data, only update changed fields to improve performance
@@ -328,19 +332,7 @@ createSubmission.schema = {
     'mime-type': Joi.string().required(),
     payload: Joi.object().keys({
       resource: Joi.string().required(),
-      id: Joi.string().uuid().required(),
-      type: Joi.string().required(),
-      fileType: Joi.string(),
-      url: Joi.string().uri(),
-      memberId: intOrUUID().required(),
-      challengeId: intOrUUID().required(),
-      legacySubmissionId: intOrUUID(),
-      legacyUploadId: intOrUUID(),
-      submissionPhaseId: intOrUUID(),
-      created: Joi.date().required(),
-      updated: Joi.date(),
-      createdBy: Joi.string().required(),
-      updatedBy: Joi.string()
+      challengeId: intOrUUID().required()
     }).unknown(true).required()
   }).required()
 }
@@ -365,14 +357,7 @@ updateSubmission.schema = {
     'mime-type': Joi.string().required(),
     payload: Joi.object().keys({
       resource: Joi.string().required(),
-      id: Joi.string().uuid().required(),
-      type: Joi.string().required(),
-      url: Joi.string().uri(),
-      memberId: intOrUUID().required(),
-      challengeId: intOrUUID().required(),
-      legacySubmissionId: intOrUUID(),
-      legacyUploadId: intOrUUID(),
-      submissionPhaseId: intOrUUID()
+      challengeId: intOrUUID().required()
     }).unknown(true).required()
   }).required()
 }