Merge branch 'Issue_179_HOTFIX'

Author: rootelement

config/default.js

@@ -22,13 +22,14 @@ module.exports = {
   KAFKA_ERROR_TOPIC: process.env.KAFKA_ERROR_TOPIC || 'error.notification',
   KAFKA_AGGREGATE_TOPIC: process.env.KAFKA_AGGREGATE_TOPIC || 'submission.notification.aggregate',
   CHALLENGEAPI_URL: process.env.CHALLENGEAPI_URL || 'https://api.topcoder-dev.com/v4/challenges',
+  CHALLENGEAPI_V5_URL: process.env.CHALLENGEAPI_V5_URL || 'https://api.topcoder-dev.com/v5/challenges',
   AUTH0_URL: process.env.AUTH0_URL, // Auth0 credentials for Submission Service
   AUTH0_AUDIENCE: process.env.AUTH0_AUDIENCE || 'https://www.topcoder.com',
   TOKEN_CACHE_TIME: process.env.TOKEN_CACHE_TIME,
   AUTH0_CLIENT_ID: process.env.AUTH0_CLIENT_ID,
   AUTH0_CLIENT_SECRET: process.env.AUTH0_CLIENT_SECRET,
   esConfig: {
-    HOST: process.env.ES_HOST,
+    HOST: process.env.ES_HOST || 'localhost:9200',
     API_VERSION: process.env.ES_API_VERSION || '6.3',
     ES_INDEX: process.env.ES_INDEX || 'submission',
     ES_TYPE: process.env.ES_TYPE || '_doc' // ES 6.x accepts only 1 Type per index and it's mandatory to define it

docs/swagger.yaml

@@ -94,7 +94,7 @@ paths:
                 challengeId: 'a12a4180-65aa-42ec-a945-5fd21dec0502'
                 legacySubmissionId: 'a12a4180-65aa-42ec-a945-5fd21dec0502'
                 legacyUploadId: 'a12a4180-65aa-42ec-a945-5fd21dec0502'
-                submissionPhaseId: 'a12a4180-65aa-42ec-a945-5fd21dec0502'
+                submissionPhaseId: 764567
                 created: '2018-05-20T07:00:30.123Z'
                 updated: '2018-06-01T07:36:28.178Z'
                 createdBy: 'topcoder user'
@@ -106,7 +106,7 @@ paths:
                 challengeId: 'a12a4180-65aa-42ec-a945-5fd21dec0502'
                 legacySubmissionId: 'a12a4180-65aa-42ec-a945-5fd21dec0502'
                 legacyUploadId: 'a12a4180-65aa-42ec-a945-5fd21dec0502'
-                submissionPhaseId: 'a12a4180-65aa-42ec-a945-5fd21dec0502'
+                submissionPhaseId: 764567
                 created: '2018-05-20T08:00:30.000Z'
                 updated: '2018-06-01T09:23:00.178Z'
                 createdBy: 'topcoder user'
@@ -260,9 +260,7 @@ paths:
           description: Legacy Submission Id
         - in: formData
           name: submissionPhaseId
-          oneOf:
-            - type: string
-            - type: integer
+          type: integer
           description: Submission Phase Id
       responses:
         201:
@@ -1599,9 +1597,7 @@ parameters:
     name: submissionPhaseId
     description: The submission phase id filter for submissions.
     required: false
-    oneOf:
-      - type: string
-      - type: integer
+    type: integer
 
   filterSubmissionReviewScore:
     in: query
@@ -1881,9 +1877,7 @@ definitions:
         description: The legacy upload id.
         example: '5da27562-eaec-4c9f-ad1c-ddfbed6ffdbc'
       submissionPhaseId:
-        oneOf:
-          - type: string
-          - type: integer
+        type: integer
         description: The submission phase id.
         example: '5dea6d9e-161a-4c7a-b316-597c73a7b8f4'
 

scripts/createIndex.js

@@ -17,7 +17,7 @@ co(function * createIndex () {
     // fields not specified below will be 'text' by default
     properties: {
       resource: { type: 'keyword' },
-      challengeId: { type: 'keyword' },
+      challengeId: { type: 'long' },
       memberId: { type: 'keyword' },
       type: { type: 'keyword' },
       isFileSubmission: { type: 'boolean' },
@@ -32,7 +32,7 @@ co(function * createIndex () {
       aggregateScore: { type: 'float' },
       isPassing: { type: 'boolean' },
       legacySubmissionId: { type: 'keyword' },
-      submissionPhaseId: { type: 'keyword' },
+      submissionPhaseId: { type: 'long' },
       fileType: { type: 'keyword' },
       filename: { type: 'keyword' },
       review: { type: 'nested' },

src/common/helper.js

@@ -299,6 +299,30 @@ function * getM2Mtoken () {
   return yield m2m.getMachineToken(config.AUTH0_CLIENT_ID, config.AUTH0_CLIENT_SECRET)
 }
 
+/**
+ * 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 * 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`)
+    const token = yield getM2Mtoken()
+    try {
+      const response = yield request.get(`${config.CHALLENGEAPI_V5_URL}/${challengeId}`)
+        .set('Authorization', `Bearer ${token}`)
+        .set('Content-Type', 'application/json')
+      const legacyId = parseInt(response.body.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
+}
+
 /*
  * Get submission phase ID of a challenge from Challenge API
  * @param challengeId Challenge ID
@@ -604,6 +628,7 @@ module.exports = {
   fetchFromES,
   camelize,
   setPaginationHeaders,
+  getLegacyChallengeId,
   getSubmissionPhaseId,
   checkCreateAccess,
   checkGetAccess,

src/services/SubmissionService.js

@@ -181,6 +181,12 @@ function * downloadSubmission (authUser, submissionId) {
  * @return {Object} Data fetched from ES
  */
 function * listSubmissions (authUser, query) {
+  if (query.challengeId) {
+    // Submission api only works with legacy challenge id
+    // If it is a v5 challenge id, get the associated legacy challenge id
+    query.challengeId = yield helper.getLegacyChallengeId(query.challengeId)
+  }
+
   const data = yield helper.fetchFromES(query, helper.camelize(table))
   logger.info(`listSubmissions: returning ${data.length} submissions for query: ${JSON.stringify(query)}`)
 
@@ -200,7 +206,7 @@ const listSubmissionsQuerySchema = {
   challengeId: joi.alternatives().try(joi.id(), joi.string().uuid()),
   legacySubmissionId: joi.alternatives().try(joi.id(), joi.string().uuid()),
   legacyUploadId: joi.alternatives().try(joi.id(), joi.string().uuid()),
-  submissionPhaseId: joi.alternatives().try(joi.id(), joi.string().uuid()),
+  submissionPhaseId: joi.id(),
   page: joi.id(),
   perPage: joi.pageSize(),
   orderBy: joi.sortOrder(),
@@ -262,14 +268,18 @@ function * createSubmission (authUser, files, entity) {
     throw new errors.HttpStatusError(400, 'The file should be uploaded under the "submission" attribute')
   }
 
+  // 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.getLegacyChallengeId(entity.challengeId)
+
   const currDate = (new Date()).toISOString()
 
   const item = {
     id: submissionId,
     type: entity.type,
     url: url,
     memberId: entity.memberId,
-    challengeId: entity.challengeId,
+    challengeId: challengeId,
     created: currDate,
     updated: currDate,
     createdBy: authUser.handle || authUser.sub,
@@ -287,7 +297,7 @@ function * createSubmission (authUser, files, entity) {
   if (entity.submissionPhaseId) {
     item.submissionPhaseId = entity.submissionPhaseId
   } else {
-    item.submissionPhaseId = yield helper.getSubmissionPhaseId(entity.challengeId)
+    item.submissionPhaseId = yield helper.getSubmissionPhaseId(challengeId)
   }
 
   if (entity.fileType) {
@@ -353,7 +363,7 @@ createSubmission.schema = {
     challengeId: joi.alternatives().try(joi.id(), joi.string().uuid()).required(),
     legacySubmissionId: joi.alternatives().try(joi.id(), joi.string().uuid()),
     legacyUploadId: joi.alternatives().try(joi.id(), joi.string().uuid()),
-    submissionPhaseId: joi.alternatives().try(joi.id(), joi.string().uuid())
+    submissionPhaseId: joi.id()
   }).required()
 }
 
@@ -374,6 +384,12 @@ function * _updateSubmission (authUser, submissionId, entity) {
     throw new errors.HttpStatusError(404, `Submission with ID = ${submissionId} is not found`)
   }
 
+  if (entity.challengeId) {
+    // Submission api only works with legacy challenge id
+    // If it is a v5 challenge id, get the associated legacy challenge id
+    entity.challengeId = yield helper.getLegacyChallengeId(entity.challengeId)
+  }
+
   const currDate = (new Date()).toISOString()
   // Record used for updating in Database
   const record = {
@@ -466,7 +482,7 @@ updateSubmission.schema = {
     challengeId: joi.alternatives().try(joi.id(), joi.string().uuid()).required(),
     legacySubmissionId: joi.alternatives().try(joi.id(), joi.string().uuid()),
     legacyUploadId: joi.alternatives().try(joi.id(), joi.string().uuid()),
-    submissionPhaseId: joi.alternatives().try(joi.id(), joi.string().uuid())
+    submissionPhaseId: joi.id()
   }).required()
 }
 
@@ -491,7 +507,7 @@ patchSubmission.schema = {
     challengeId: joi.alternatives().try(joi.id(), joi.string().uuid()),
     legacySubmissionId: joi.alternatives().try(joi.id(), joi.string().uuid()),
     legacyUploadId: joi.alternatives().try(joi.id(), joi.string().uuid()),
-    submissionPhaseId: joi.alternatives().try(joi.id(), joi.string().uuid())
+    submissionPhaseId: joi.id()
   })
 }
 

test/common/testData.js

@@ -129,7 +129,7 @@ const testSubmission = {
     url: 'https://software.topcoder.com/review/actions/DownloadContestSubmission?uid=123456',
     memberId: 'b24d4180-65aa-42ec-a945-5fd21dec0501',
     legacySubmissionId: 'b24d4180-65aa-42ec-a945-5fd21dec0501',
-    submissionPhaseId: 'b24d4180-65aa-42ec-a945-5fd21dec0501',
+    submissionPhaseId: 764567,
     created: '2018-05-20T07:00:30.123Z',
     createdBy: 'topcoder user',
     updated: '2018-06-01T07:36:28.178Z',
@@ -159,7 +159,7 @@ const testSubmissionPatch = {
     url: 'https://software.topcoder.com/review/actions/DownloadContestSubmission?uid=654321',
     memberId: 'b24d4180-65aa-42ec-a945-5fd21dec0501',
     legacySubmissionId: 'b24d4180-65aa-42ec-a945-5fd21dec0502',
-    submissionPhaseId: 'b24d4180-65aa-42ec-a945-5fd21dec0502',
+    submissionPhaseId: 764567,
     created: '2018-05-20T07:00:30.123Z',
     createdBy: 'topcoder user',
     updated: '2018-06-01T07:36:28.178Z',
@@ -184,7 +184,7 @@ const testSubmissionES = {
          url: 'https://software.topcoder.com/review/actions/DownloadContestSubmission?uid=123456',
          memberId: 'b24d4180-65aa-42ec-a945-5fd21dec0501',
          legacySubmissionId: 'b24d4180-65aa-42ec-a945-5fd21dec0501',
-         submissionPhaseId: 'b24d4180-65aa-42ec-a945-5fd21dec0501',
+         submissionPhaseId: 764567,
          created: '2018-05-20T07:00:30.123Z',
          createdBy: 'topcoder user',
          updated: '2018-06-01T07:36:28.178Z',