Merge branch 'develop'

Author: James Cori

README.md

@@ -31,7 +31,6 @@ The following config parameters are supported, they are defined in `config/defau
 | 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_AUTHN_REQUEST_BODY | the Topcoder authentication request body. This makes use of some environment variables: `TC_USERNAME`, `TC_PASSWORD`, `TC_CLIENT_ID`, `CLIENT_V2CONNECTION` | see `default.js` |
 | 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 |
@@ -54,6 +53,12 @@ The following config parameters are supported, they are defined in `config/defau
 |TOKEN_CACHE_TIME| The machine-to-machine token cache validation time |43200|
 |AUTH0_CLIENT_ID| The Auth0 ClientID for generating Machine-to-machine token ||
 |AUTH0_CLIENT_SECRET| The Auth0 Client Secret for generating Machine-to-machine token ||
+|ROLE_ID_COPILOT| The registered role id of copilot ||
+|ROLE_ID_SUBMITTER| The registered role id of submitter ||
+|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
@@ -172,7 +177,7 @@ This is a description
 
 - You will see a new comments
 
-Contest https://www.topcoder-dev.com/challenges/30054075 has been created for this ticket.
+Challenge 17ab4b5b-fad6-405a-8abb-9f23e9fa3730 has been created for this ticket
 
 ```This is an automated message for tonyj via Topcoder X```
 
@@ -212,7 +217,7 @@ https://www.topcoder-dev.com/challenges/30054075
 - ticket added assignee
 - add comments
 
-Contest https://www.topcoder-dev.com/challenges/30054075 has been updated - it has been assigned to tonyj.<br/><br/>```This is an automated message for tonyj via Topcoder X```
+Challenge 17ab4b5b-fad6-405a-8abb-9f23e9fa3730 has been assigned to mess.<br/><br/>```This is an automated message for tonyj via Topcoder X```
 
 - Visit the challenge url to verify registered member
 
@@ -232,7 +237,7 @@ Contest https://www.topcoder-dev.com/challenges/30054075 has been updated - it h
 - Unassign member of issue
 - Wait a minute or more
 - Ticket adds comments
-Contest https://www.topcoder-dev.com/challenges/30054075 has been updated - tonyj has been unassigned.<br/><br/>```This is an automated message for tonyj via Topcoder X```
+Challenge 17ab4b5b-fad6-405a-8abb-9f23e9fa3730 mess has been unassigned.<br/><br/>```This is an automated message for tonyj via Topcoder X```
 - Ticket updated labels
 added  tcx_OpenForPickup and removed  tcx_Assigned labels
 - Visit the challenge url to verify no registered member
@@ -264,7 +269,7 @@ This ticket was not processed for payment. If you would like to process it for p
   - Close ticket
   - Ticket adds tcx_Paid label
   - Ticket adds comments
-  Payment task has been updated: https://software.topcoder-dev.com/review/actions/ViewProjectDetails?pid=30054000<br/><br/>```This is an automated message for tonyj via Topcoder X```
+  Challenge 17ab4b5b-fad6-405a-8abb-9f23e9fa3730 has been paid and closed<br/><br/>```This is an automated message for tonyj via Topcoder X```
   - Ticket closed comment
   - Wait a long time (Challenge status will change to Active and then change to Completed for long time later)
   - Visit  the challenge on TC Direct to verify challenge status is Active and change to Completed after 17 minute or more

config/default.js

@@ -27,47 +27,18 @@ module.exports = {
   },
   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_AUTHN_REQUEST_BODY: {
-    username: process.env.TC_USERNAME || 'mess',
-    password: process.env.TC_PASSWORD || 'appirio123',
-    client_id: process.env.TC_CLIENT_ID || 'JFDo7HMkf0q2CkVFHojy3zHWafziprhT',
-    sso: false,
-    scope: 'openid profile offline_access',
-    response_type: 'token',
-    connection: process.env.CLIENT_V2CONNECTION || 'TC-User-Database',
-    grant_type: 'password',
-    device: 'Browser'
-  },
   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 || {
-    milestoneId: 1,
-    subTrack: 'FIRST_2_FINISH',
-    reviewType: 'COMMUNITY',
-    technologies: [],
-    platforms: [],
-    finalDeliverableTypes: [],
-    confidentialityType: 'PUBLIC',
-    submissionGuidelines: 'Upload the updated code to TopCoder',
-
-    // From here, the properties will be set by the processor.
-    // Just leave them here for readability
-    name: null,
-    projectId: null,
-    registrationStartDate: null,
-    registrationStartsAt: null,
-
-    // NOTE: if subTrack is FIRST_2_FINISH,
-    // the ***EndsAt will be set automatically by TC APIs
-    registrationEndsAt: null,
-    submissionEndsAt: null,
-    detailedRequirements: null,
-    prizes: null
+    status: 'Draft'
   },
 
   // NOTE: if subTrack is FIRST_2_FINISH,
   // this config has no effect since the ***EndsAt will be set automatically by TC APIs
   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 || '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',
@@ -93,5 +64,16 @@ module.exports = {
   TOKEN_CACHE_TIME: process.env.TOKEN_CACHE_TIME || 43200,
   AUTH0_CLIENT_ID: process.env.AUTH0_CLIENT_ID,
   AUTH0_CLIENT_SECRET: process.env.AUTH0_CLIENT_SECRET,
-  AUTH0_PROXY_SERVER_URL: process.env.AUTH0_PROXY_SERVER_URL
+  AUTH0_PROXY_SERVER_URL: process.env.AUTH0_PROXY_SERVER_URL,
+  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',
+  ROLE_ID_SUBMITTER: process.env.ROLE_ID_SUBMITTER || '732339e7-8e30-49d7-9198-cccf9451e221',
+  TYPE_ID_TASK: process.env.TYPE_ID_TASK || 'ecd58c69-238f-43a4-a4bb-d172719b9f31',
+  DEFAULT_TIMELINE_TEMPLATE_ID: process.env.DEFAULT_TIMELINE_TEMPLATE_ID || '53a307ce-b4b3-4d6f-b9a1-3741a58f77e6',
+  DEFAULT_TRACK_ID: process.env.DEFAULT_TIMELINE_TEMPLATE_ID || '9b6fc876-f4d9-4ccb-9dfd-419247628825'
 };

configuration.md

@@ -14,7 +14,6 @@ The following config parameters are supported, they are defined in `config/defau
 |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_AUTHN_REQUEST_BODY | the Topcoder authentication request body. This makes use of some environment variables: `TC_USERNAME`, `TC_PASSWORD`, `TC_CLIENT_ID`, `CLIENT_V2CONNECTION` | see `default.js` |
 | 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 |
@@ -40,6 +39,13 @@ The following config parameters are supported, they are defined in `config/defau
 |TOKEN_CACHE_TIME| The machine-to-machine token cache validation time |43200|
 |AUTH0_CLIENT_ID| The Auth0 ClientID for generating Machine-to-machine token ||
 |AUTH0_CLIENT_SECRET| The Auth0 Client Secret for generating Machine-to-machine token ||
+|ROLE_ID_COPILOT| The registered role id of copilot ||
+|ROLE_ID_SUBMITTER| The registered role id of submitter ||
+|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
 For using with SSL, the options should be as

constants.js

@@ -22,10 +22,31 @@ const USER_ROLES = {
   OWNER: 'owner'
 };
 
+// The challenge status
+const CHALLENGE_STATUS = {
+  ACTIVE: 'Active',
+  COMPLETED: 'Completed',
+  CANCELED: 'Cancelled'
+};
+
 const SERVICE_ERROR_STATUS = 500;
 
+// issue status
+const ISSUE_STATUS = {
+  CHALLENGE_CANCELLED: 'challenge_cancelled',
+  CHALLENGE_CREATION_PENDING: 'challenge_creation_pending',
+  CHALLENGE_CREATION_SUCCESSFUL: 'challenge_creation_successful',
+  CHALLENGE_CREATION_FAILED: 'challenge_creation_failed',
+  CHALLENGE_CREATION_RETRIED: 'challenge_creation_retried',
+  CHALLENGE_PAYMENT_SUCCESSFUL: 'challenge_payment_successful',
+  CHALLENGE_PAYMENT_PENDING: 'challenge_payment_pending',
+  CHALLENGE_PAYMENT_FAILED: 'challenge_payment_failed'
+};
+
 module.exports = {
   USER_ROLES,
   USER_TYPES,
-  SERVICE_ERROR_STATUS
+  SERVICE_ERROR_STATUS,
+  CHALLENGE_STATUS,
+  ISSUE_STATUS
 };

models/CopilotPayment.js

@@ -41,6 +41,15 @@ const schema = new Schema({
       name: 'ChallengeIdIndex'
     }
   },
+  challengeUUID: {
+    type: String,
+    required: false,
+    index: {
+      global: true,
+      project: true,
+      name: 'ChallengeUUIdIndex'
+    }
+  },
   closed: {
     type: String,
     required: true,

models/Issue.js

@@ -48,6 +48,7 @@ const schema = new Schema({
       name: 'RepositoryIdIndex'
     }
   },
+  repositoryIdStr: {type: String, required: false},
   labels: {
     type: Array,
     required: false
@@ -59,6 +60,7 @@ const schema = new Schema({
   },
   // From topcoder api
   challengeId: {type: Number, required: false},
+  challengeUUID: {type: String, required: false},
   projectId: {type: String},
   status: {type: String},
   assignedAt: {type: Date, required: false}

models/Project.js

@@ -30,13 +30,20 @@ const schema = new Schema({
     }
   },
   repoUrl: {type: String, required: true},
+  repoId: {type: String, required: false},
   rocketChatWebhook: {type: String, required: false},
   rocketChatChannelName: {type: String, required: false},
   archived: {type: String, required: true},
   owner: {type: String, required: true},
   secretWebhookKey: {type: String, required: true},
   copilot: {type: String, required: false},
-  registeredWebhookId: {type: String, required: false}
+  registeredWebhookId: {type: String, required: false},
+  updatedAt: {
+    type: Date,
+    default: Date.now
+  },
+  createCopilotPayments: {type: String, required: false},
+  isConnect: {type: Boolean, required: false, default: true}
 });
 
 module.exports = schema;

models/User.js

@@ -28,6 +28,10 @@ const schema = new Schema({
       name: 'UsesProviderIdIndex'
     }
   },
+  userProviderIdStr: {
+    type: String,
+    required: false
+  },
   username: {
     type: String,
     required: true,

models/index.js

@@ -26,6 +26,13 @@ dynamoose.setDefaults({
   update: false
 });
 
+if (process.env.CREATE_DB) {
+  dynamoose.setDefaults({
+    create: true,
+    update: true
+  });
+}
+
 /* eslint-disable global-require */
 const models = {
   Issue: dynamoose.model('Topcoder_X.Issue', require('./Issue')),