Merge branch 'develop'

Author: James Cori

README.md

@@ -29,9 +29,6 @@ The following config parameters are supported, they are defined in `config/defau
 | TOPIC                          | the kafka subscribe topic name             |  tc-x-events                    |
 | PARTITION                  | the kafka partition            |  0|
 | KAFKA_OPTIONS                  | the connection option for kafka            |  see below about KAFKA options                  |
-|TC_DEV_ENV| the flag whether to use topcoder development api or production| false|
-| TC_AUTHN_URL | the Topcoder authentication url | https://topcoder-dev.auth0.com/oauth/ro |
-| TC_AUTHZ_URL | the Topcoder authorization url | https://api.topcoder-dev.com/v3/authorizations |
 | NEW_CHALLENGE_TEMPLATE | the body template for new challenge request. You can change the subTrack, reviewTypes, technologies, .. here | see `default.js` |
 | NEW_CHALLENGE_DURATION_IN_DAYS | the duration of new challenge | 5 |
 |TC_URL| the base URL of topcoder to get the challenge URL| defaults to `https://www.topcoder-dev.com`|
@@ -40,7 +37,6 @@ The following config parameters are supported, they are defined in `config/defau
 |FIX_ACCEPTED_ISSUE_LABEL|the label name for fix accepted, should be one of the label configured in topcoder x ui|'tcx_FixAccepted'|
 |ASSIGNED_ISSUE_LABEL| the label name for assigned, should be one of the label configured in topcoder x ui| 'tcx_Assigned'|
 |OPEN_FOR_PICKUP_ISSUE_LABEL| the label name for open for pickup, should be one of the label configured in topcoder x ui| 'tcx_OpenForPickup'|
-|TC_OR_DETAIL_LINK|the link to online review detail of challenge| see `default.js`, OR link for dev environment|
 |RETRY_COUNT| the number of times an event should be retried to process| 3|
 |RETRY_INTERVAL| the interval at which the event should be retried to process in milliseconds | 120000|
 |READY_FOR_REVIEW_ISSUE_LABEL| the label name for ready for review, should be one of the label configured in topcoder x ui|'tcx_ReadyForReview'|
@@ -58,7 +54,6 @@ The following config parameters are supported, they are defined in `config/defau
 |TYPE_ID_TASK| The registered type id of a task ||
 |DEFAULT_TIMELINE_TEMPLATE_ID| The default timeline template id ||
 |TC_API_URL| The topcoder backend API url |`https://api.topcoder-dev.com/v5`|
-|TC_API_URL_V3| The topcoder backend API url V3 |`https://api.topcoder-dev.com/v3`|
 
 KAFKA_OPTIONS should be object as described in https://github.com/oleksiyk/kafka#ssl
 For using with SSL, the options should be as

config/default.js

@@ -25,10 +25,6 @@ module.exports = {
       passphrase: 'secret', // NOTE:* This configuration specifies the private key passphrase used while creating it.
     }
   },
-  TC_DEV_ENV: process.env.NODE_ENV === 'production' ? false : true,
-  TC_AUTHN_URL: process.env.TC_AUTHN_URL || 'https://topcoder-dev.auth0.com/oauth/ro',
-  TC_AUTHZ_URL: process.env.TC_AUTHZ_URL || 'https://api.topcoder-dev.com/v3/authorizations',
-  TC_DIRECT_ID: 7377,
   NEW_CHALLENGE_TEMPLATE: process.env.NEW_CHALLENGE_TEMPLATE || {
     status: 'Draft'
   },
@@ -38,7 +34,6 @@ module.exports = {
   NEW_CHALLENGE_DURATION_IN_DAYS: process.env.NEW_CHALLENGE_DURATION_IN_DAYS || 5,
   TC_URL: process.env.TC_URL || 'https://www.topcoder-dev.com',
   TC_API_URL: process.env.TC_API_URL || 'https://api.topcoder-dev.com/v5',
-  TC_API_URL_V3: process.env.TC_API_URL_V3 || 'https://api.topcoder-dev.com/v3',
   GITLAB_API_BASE_URL: process.env.GITLAB_API_BASE_URL || 'https://gitlab.com',
   ISSUE_LABEL_PREFIX: process.env.ISSUE_LABEL_PREFIX || 'tcx_',
   PAID_ISSUE_LABEL: process.env.PAID_ISSUE_LABEL || 'tcx_Paid',
@@ -48,10 +43,8 @@ module.exports = {
   OPEN_FOR_PICKUP_ISSUE_LABEL: process.env.READY_FOR_REVIEW_ISSUE_LABEL || 'tcx_OpenForPickup',
   NOT_READY_ISSUE_LABEL: process.env.NOT_READY_ISSUE_LABEL || 'tcx_NotReady',
   CANCELED_ISSUE_LABEL: process.env.CANCELED_ISSUE_LABEL || 'tcx_Canceled',
-  TC_OR_DETAIL_LINK: process.env.TC_OR_DETAIL_LINK || 'https://software.topcoder-dev.com/review/actions/ViewProjectDetails?pid=',
   RETRY_COUNT: process.env.RETRY_COUNT || 2,
   RETRY_INTERVAL: process.env.RETRY_INTERVAL || 120000, // 2 minutes
-  CANCEL_CHALLENGE_INTERVAL: process.env.CANCEL_CHALLENGE_INTERVAL || 24 * 60 * 60 * 1000, // 24 Hours
   DYNAMODB: {
     AWS_ACCESS_KEY_ID: process.env.AWS_ACCESS_KEY_ID,
     AWS_SECRET_ACCESS_KEY: process.env.AWS_SECRET_ACCESS_KEY,
@@ -68,7 +61,6 @@ module.exports = {
   GRANT_TYPE: 'client_credentials',
 
   // used as base to construct various URLs
-  WEBSITE: process.env.WEBSITE || 'http://topcoderx.topcoder-dev.com',
   WEBSITE_SECURE: process.env.WEBSITE_SECURE || 'https://topcoderx.topcoder-dev.com',
 
   ROLE_ID_COPILOT: process.env.ROLE_ID_COPILOT || 'cfe12b3f-2a24-4639-9d8b-ec86726f76bd',

configuration.md

@@ -12,9 +12,6 @@ The following config parameters are supported, they are defined in `config/defau
 |KAFKA_GROUP_ID | The Kafka group id name| topcoder-x-processor |
 |KAFKA_CLIENT_CERT | The Kafka SSL certificate to use when connecting| Read from kafka_client.cer file, but this can be set as a string like it is on Heroku |
 |KAFKA_CLIENT_CERT_KEY | The Kafka SSL certificate key to use when connecting| Read from kafka_client.key file, but this can be set as a string like it is on Heroku|
-|TC_DEV_ENV| the flag whether to use topcoder development api or production| false|
-| TC_AUTHN_URL | the Topcoder authentication url | https://topcoder-dev.auth0.com/oauth/ro |
-| TC_AUTHZ_URL | the Topcoder authorization url | https://api.topcoder-dev.com/v3/authorizations |
 | NEW_CHALLENGE_TEMPLATE | the body template for new challenge request. You can change the subTrack, reviewTypes, technologies, .. here | see `default.js` |
 | NEW_CHALLENGE_DURATION_IN_DAYS | the duration of new challenge | 5 |
 |TC_URL| the base URL of topcoder to get the challenge URL| defaults to `https://www.topcoder-dev.com`|
@@ -23,13 +20,11 @@ The following config parameters are supported, they are defined in `config/defau
 |FIX_ACCEPTED_ISSUE_LABEL|the label name for fix accepted, should be one of the label configured in topcoder x ui|'tcx_FixAccepted'|
 |ASSIGNED_ISSUE_LABEL| the label name for assigned, should be one of the label configured in topcoder x ui| 'tcx_Assigned'|
 |OPEN_FOR_PICKUP_ISSUE_LABEL| the label name for open for pickup, should be one of the label configured in topcoder x ui| 'tcx_OpenForPickup'|
-|TC_OR_DETAIL_LINK|the link to online review detail of challenge| see `default.js`, OR link for dev environment|
 |RETRY_COUNT| the number of times an event should be retried to process| 3|
 |RETRY_INTERVAL| the interval at which the event should be retried to process in milliseconds | 120000|
 |READY_FOR_REVIEW_ISSUE_LABEL| the label name for ready for review, should be one of the label configured in topcoder x ui|'tcx_ReadyForReview'|
 |NOT_READY_ISSUE_LABEL| the label name for not ready, should be one of the label configured in topcoder x ui|'tcx_NotReady'|
 |CANCELED_ISSUE_LABEL| the label name for canceled, should be one of the label configured in topcoder x ui|'tcx_Canceled'|
-|CANCEL_CHALLENGE_INTERVAL| the time in millisecond after which the challenge will be closed| '24*60*60*1000'|
 |AWS_ACCESS_KEY_ID | The Amazon certificate key to use when connecting. Use local dynamodb you can set fake value|FAKE_ACCESS_KEY_ID |
 |AWS_SECRET_ACCESS_KEY | The Amazon certificate access key to use when connecting. Use local dynamodb you can set fake value|FAKE_SECRET_ACCESS_KEY |
 |AWS_REGION | The Amazon certificate region to use when connecting. Use local dynamodb you can set fake value|FAKE_REGION |
@@ -44,7 +39,6 @@ The following config parameters are supported, they are defined in `config/defau
 |TYPE_ID_TASK| The registered type id of a task ||
 |DEFAULT_TIMELINE_TEMPLATE_ID| The default timeline template id ||
 |TC_API_URL| The topcoder backend API url |`https://api.topcoder-dev.com/v5`|
-|TC_API_URL_V3| The topcoder backend API url V3 |`https://api.topcoder-dev.com/v3`|
 |DEFAULT_TRACK_ID| The default track id ||
 
 KAFKA_OPTIONS should be object as described in https://github.com/oleksiyk/kafka#ssl

services/IssueService.js

@@ -109,7 +109,8 @@ async function ensureChallengeExists(event, issue, create = true) {
 async function getProjectDetail(event) {
   const fullRepoUrl = gitHelper.getFullRepoUrl(event);
   const project = await dbHelper.scanOne(models.Project, {
-    repoUrl: fullRepoUrl
+    repoUrl: fullRepoUrl,
+    archived: 'false'
   });
 
   return project;
@@ -860,7 +861,8 @@ async function process(event) {
   event.data.repository.repoUrl = fullRepoUrl;
 
   const project = await dbHelper.scanOne(models.Project, {
-    repoUrl: fullRepoUrl
+    repoUrl: fullRepoUrl,
+    archived: 'false'
   });
 
   issue.projectId = project.id;

utils/topcoder-api-helper.js

@@ -266,10 +266,10 @@ async function getProjectBillingAccountId(id) {
  */
 async function getTopcoderMemberId(handle) {
   try {
-    const response = await axios.get(`${config.TC_API_URL_V3}/members/${handle}`);
+    const response = await axios.get(`${config.TC_API_URL}/members/${handle}`);
     const statusCode = response ? response.status : null;
     loggerFile.info(`EndPoint: GET members/${handle},  GET parameters: null, Status Code:${statusCode}, Response:${circularJSON.stringify(response.data)}`);
-    return _.get(response, 'data.result.content.userId');
+    return _.get(response, 'data.userId');
   } catch (err) {
     loggerFile.info(`EndPoint: GET members/${handle}, GET parameters: null, Status Code:null,
     Error: 'Failed to get topcoder member id.', Details: ${circularJSON.stringify(err)}`);