Merge remote-tracking branch 'origin/develop'

Author: jmgasper

services/IssueService.js

@@ -26,6 +26,10 @@ const eventService = require('./EventService');
 
 const md = new MarkdownIt();
 
+// A variable to store issue creation lock to prevent duplicate creation process.
+// The key is `${provider}-${repositoryId}-${number}`. The value is True.
+const issueCreationLock = {};
+
 /**
  * Generate the contest url, given the challenge id
  * @param {String} challengeId The id of the challenge in topcoder
@@ -555,6 +559,13 @@ async function handleIssueCreate(event, issue, forceAssign = false) {
     return;
   }
 
+  const creationLockKey = `${issue.provider}-${issue.repositoryId}-${issue.number}`;
+  if (issueCreationLock[creationLockKey]) {
+    throw new Error(
+      `Issue ${creationLockKey} is creating.`);
+  }
+  issueCreationLock[creationLockKey] = true;
+
   // create issue with challenge creation pending
   const issueObject = _.assign({}, _.omit(issue, 'assignee'), {
     id: helper.generateIdentifier(),
@@ -594,6 +605,7 @@ async function handleIssueCreate(event, issue, forceAssign = false) {
     logger.error(`Challenge creation failure: ${e}`);
     await dbHelper.removeIssue(models.Issue, issue.repositoryId, issue.number, issue.provider);
     await eventService.handleEventGracefully(event, issue, e);
+    delete issueCreationLock[creationLockKey];
     return;
   }
 
@@ -610,6 +622,7 @@ async function handleIssueCreate(event, issue, forceAssign = false) {
       await handleIssueAssignment(event, issue, true);
     }
   }
+  delete issueCreationLock[creationLockKey];
   logger.debug(`new challenge created with id ${issue.challengeId} for issue ${issue.number}`);
 }
 

utils/topcoder-api-helper.js

@@ -25,7 +25,6 @@ const m2m = m2mAuth(_.pick(config, ['AUTH0_URL', 'AUTH0_AUDIENCE', 'TOKEN_CACHE_
 
 let topcoderApiProjects = require('topcoder-api-projects');
 let topcoderApiChallenges = require('@topcoder-platform/topcoder-api-challenges-v4-wrapper');
-let topcoderApiChallengesV3 = require('topcoder-api-challenges');
 
 const topcoderDevApiProjects = require('topcoder-dev-api-projects');
 const topcoderDevApiChallenges = require('@topcoder-platform/topcoder-api-challenges-v4-wrapper-dev');
@@ -46,7 +45,6 @@ let cachedAccessToken;
 // Init the API instances
 const projectsClient = topcoderApiProjects.ApiClient.instance;
 const challengesClient = topcoderApiChallenges.ApiClient.instance;
-const challengesClientV3 = topcoderApiChallengesV3.ApiClient.instance;
 
 // Timeout increase to 5 minutes
 challengesClient.timeout = 300000;
@@ -299,13 +297,10 @@ async function getChallengeById(id) {
  * @param {Number} winnerId the winner id
  */
 async function closeChallenge(id, winnerId) {
-  const apiKey = await getAccessToken();
+  const apiKey = await getM2Mtoken();
   logger.debug(`Closing challenge ${id}`);
   try {
     let basePath = challengesClient.basePath;
-    if (!config.TC_DEV_ENV) {
-      basePath = challengesClientV3.basePath;
-    }
     const response = await axios.post(`${basePath}/challenges/${id}/close?winnerId=${winnerId}`, null, {
       headers: {
         authorization: `Bearer ${apiKey}`,