Merge pull request #254 from topcoder-platform/Issue_253

HOTFIX - do not store legacy challenge id if there isnt one

Author: ThomasKranitsas

src/common/helper.js

@@ -766,6 +766,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

@@ -282,13 +282,17 @@ function * createSubmission (authUser, files, entity) {
     url: url,
     memberId: entity.memberId,
     challengeId,
-    legacyChallengeId,
     created: currDate,
     updated: currDate,
     createdBy: authUser.handle || authUser.sub,
     updatedBy: authUser.handle || authUser.sub
   }
 
+  // Pure v5 challenges won't have a legacy challenge id
+  if (legacyChallengeId) {
+    item.legacyChallengeId = legacyChallengeId
+  }
+
   if (entity.legacySubmissionId) {
     item.legacySubmissionId = entity.legacySubmissionId
   }
@@ -405,20 +409,26 @@ 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,
     Key: {
       id: submissionId
     },
     UpdateExpression: `set #type = :t, #url = :u, memberId = :m, challengeId = :c,
-                        legacyChallengeId = :lc, updated = :ua, updatedBy = :ub, submittedDate = :sb`,
+                        updated = :ua, updatedBy = :ub, submittedDate = :sb`,
     ExpressionAttributeValues: {
       ':t': entity.type || exist.type,
       ':u': entity.url || exist.url,
       ':m': entity.memberId || exist.memberId,
       ':c': challengeId,
-      ':lc': legacyChallengeId,
       ':ua': currDate,
       ':ub': authUser.handle || authUser.sub,
       ':sb': entity.submittedDate || exist.submittedDate || exist.created
@@ -429,6 +439,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'