Merge branch 'master' into develop

Author: ThomasKranitsas

README.md

@@ -315,3 +315,5 @@ npm run update-to-v5-challengeId
 2. There are 3 tokens provided in the environment collection representing each role - Topcoder User, Copilot, Administrator
 
 3. DynamoDB performance seems to be slower in my testing
+
+Token Commit.

src/common/helper.js

@@ -465,6 +465,18 @@ function * checkCreateAccess (authUser, subEntity) {
       throw new errors.HttpStatusError(400, `You cannot create a submission for a challenge while you are an iterative reviewer`)
     }
 
+    // Check if the User is assigned as the reviewer for the contest
+    const reviewers = _.filter(currUserRoles, { role: 'Reviewer' })
+    if (reviewers.length !== 0) {
+      throw new errors.HttpStatusError(400, `You cannot create a submission for a challenge while you are a reviewer`)
+    }
+
+    // Check if the User is assigned as the iterative reviewer for the contest
+    const iterativeReviewers = _.filter(currUserRoles, { role: 'Iterative Reviewer' })
+    if (iterativeReviewers.length !== 0) {
+      throw new errors.HttpStatusError(400, `You cannot create a submission for a challenge while you are an iterative reviewer`)
+    }
+
     // Check if the User is registered for the contest
     const submitters = _.filter(currUserRoles, { role: 'Submitter' })
     if (submitters.length === 0) {
@@ -837,6 +849,8 @@ function adjustSubmissionChallengeId (submission) {
   if (submission.challengeId && submission.legacyChallengeId) {
     submission.v5ChallengeId = submission.challengeId
     submission.challengeId = submission.legacyChallengeId
+  } else if (submission.challengeId && !submission.legacyChallengeId) {
+    submission.v5ChallengeId = submission.challengeId
   }
 }
 

src/services/SubmissionService.js

@@ -298,6 +298,7 @@ function * createSubmission (authUser, files, entity) {
     updatedBy: authUser.handle || authUser.sub
   }
 
+  // Pure v5 challenges won't have a legacy challenge id
   if (legacyChallengeId) {
     item.legacyChallengeId = legacyChallengeId
   }
@@ -343,6 +344,7 @@ function * createSubmission (authUser, files, entity) {
   }
 
   logger.info('Prepared submission item to insert into Dynamodb. Inserting...')
+  logger.info(JSON.stringify(record, null, 2))
   yield dbhelper.insertRecord(record)
 
   // After save to db, adjust challengeId to busApi and response
@@ -417,6 +419,13 @@ function * _updateSubmission (authUser, submissionId, entity) {
     challengeId = yield helper.getV5ChallengeId(entity.challengeId)
     legacyChallengeId = yield helper.getLegacyChallengeId(entity.challengeId)
   }
+  if (exist.legacyChallengeId && !legacyChallengeId) {
+    // Original submission contains a legacy challenge id
+    // But with this update, it does not
+    // Prevent updates to current submission
+    // else we will be left with a submission with wrong legacy challenge id
+    throw new errors.HttpStatusError(400, `Cannot update submission with v5 challenge id since it already has a legacy challenge id associated with it`)
+  }
   // Record used for updating in Database
   const record = {
     TableName: table,
@@ -443,6 +452,11 @@ function * _updateSubmission (authUser, submissionId, entity) {
     }
   }
 
+  if (legacyChallengeId) {
+    record.UpdateExpression = record.UpdateExpression + ', legacyChallengeId = :lc'
+    record.ExpressionAttributeValues[':lc'] = legacyChallengeId
+  }
+
   // If legacy submission ID exists, add it to the update expression
   if (entity.legacySubmissionId || exist.legacySubmissionId) {
     record.UpdateExpression = record.UpdateExpression + ', legacySubmissionId = :ls'