refactor for performance improvements

Author: ThomasKranitsas

src/common/helper.js

@@ -301,73 +301,66 @@ function * getM2Mtoken () {
 }
 
 /**
- * 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
+ * Function to get challenge by id
+ * @param {String} challengeId Challenge id
+ * @returns {Promise}
  */
-function * getLegacyChallengeId (challengeId) {
+function * getChallenge (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`)
     const token = yield getM2Mtoken()
     try {
       const response = yield request.get(`${config.CHALLENGEAPI_V5_URL}/${challengeId}`)
         .set('Authorization', `Bearer ${token}`)
         .set('Content-Type', 'application/json')
-      if (_.get(response.body, 'legacy.pureV5')) {
-        // pure V5 challenges don't have a legacy ID
-        return null
-      }
-      const legacyId = parseInt(response.body.legacyId, 10)
-      logger.debug(`Legacy challenge id is ${legacyId} for v5 challenge id ${challengeId}`)
-      return legacyId
+      return response.body
     } catch (err) {
       logger.error(`Error while accessing ${config.CHALLENGEAPI_V5_URL}/${challengeId}`)
       throw err
     }
-  }
-  return challengeId
-}
-
-/**
- * Get v5 challenge id (uuid) if legacy challenge id
- * @param {Integer} challengeId Challenge ID
- * @returns {String} v5 uuid Challenge ID of the given challengeId
- */
-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))) {
+  } else {
     logger.debug(`${challengeId} detected as legacy challenge id. Fetching legacy challenge id`)
     const token = yield getM2Mtoken()
     try {
       const response = yield request.get(`${config.CHALLENGEAPI_V5_URL}?legacyId=${challengeId}`)
         .set('Authorization', `Bearer ${token}`)
         .set('Content-Type', 'application/json')
-      const v5Uuid = _.get(response, 'body[0].id')
-      logger.debug(`V5 challenge id is ${v5Uuid} for legacy challenge id ${challengeId}`)
-      return v5Uuid
+      return response.body[0]
     } catch (err) {
       logger.error(`Error while accessing ${config.CHALLENGEAPI_V5_URL}?legacyId=${challengeId}`)
       throw err
     }
   }
-  return challengeId
 }
 
 /**
- * Get challenge details from Challenge API
+ * Get legacy challenge id if the challenge id is uuid form
  * @param {String} challengeId Challenge ID
- * @returns {Object} Challenge details
+ * @returns {String} Legacy Challenge ID of the given challengeId
  */
-function * getChallenge (challengeId) {
-  try {
-    const token = yield getM2Mtoken()
-    const response = yield request.get(`${config.CHALLENGEAPI_V5_URL}/${challengeId}`)
-      .set('Authorization', `Bearer ${token}`)
-      .set('Content-Type', 'application/json')
-    return response.body
-  } catch (e) {
-    logger.error(`Error while accessing ${config.CHALLENGEAPI_V5_URL}/${challengeId}`)
-    throw e
+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)) {
+    const challenge = yield getChallenge(challengeId)
+    if (_.get(challenge, 'legacy.pureV5')) {
+      return null
+    }
+    const legacyId = parseInt(challenge.legacyId, 10)
+    return legacyId
   }
+  return challengeId
+}
+
+/**
+ * Get v5 challenge id (uuid) if legacy challenge id
+ * @param {Integer} challengeId Challenge ID
+ * @returns {String} v5 uuid Challenge ID of the given challengeId
+ */
+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))) {
+    const challenge = yield getChallenge(challengeId)
+    return challenge.id
+  }
+  return challengeId
 }
 
 /*
@@ -930,8 +923,8 @@ module.exports = {
   cleanseReviews,
   getRoleIdToRoleNameMap,
   getV5ChallengeId,
+  getChallenge,
   adjustSubmissionChallengeId,
   getLatestChallenges,
-  getLegacyScoreCardId,
-  getChallenge
+  getLegacyScoreCardId
 }

src/services/SubmissionService.js

@@ -281,12 +281,15 @@ function * createSubmission (authUser, files, entity) {
 
   // Submission api only works with legacy challenge id
   // If it is a v5 challenge id, get the associated legacy challenge id
-  const challengeId = yield helper.getV5ChallengeId(entity.challengeId)
-  const legacyChallengeId = yield helper.getLegacyChallengeId(entity.challengeId)
+  const {
+    id: challengeId,
+    status,
+    phases,
+    legacyId: legacyChallengeId
+  } = yield helper.getChallenge(entity.challengeId)
   const currDate = (new Date()).toISOString()
-  const challenge = yield helper.getChallenge(challengeId)
 
-  if (challenge.status !== 'Active') {
+  if (status !== 'Active') {
     throw new errors.HttpStatusError(400, 'Challenge is not active')
   }
 
@@ -323,7 +326,7 @@ function * createSubmission (authUser, files, entity) {
 
   if (item.submissionPhaseId) {
     // make sure the phase is open
-    const openPhase = _.find(challenge.phases, { phaseId: item.submissionPhaseId, isOpen: true })
+    const openPhase = _.find(phases, { phaseId: item.submissionPhaseId, isOpen: true })
     if (!openPhase) {
       throw new errors.HttpStatusError(400, `The phase ${item.submissionPhaseId} is not open`)
     }