changes related to https://www.topcoder.com/challenges/30065364/?type=develop

Author: dilipkrthapa

README.md

@@ -29,7 +29,7 @@ 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                  |
-| MONGODB_URL  | the MongoDB URL which must be same as Ragnar tool | mongodb://127.0.0.1:27017/ragnar |
+| MONGODB_URL  | the MongoDB URL which must be same as Topcoder x tool | mongodb://127.0.0.1:27017/topcoderx |
 |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` |
@@ -61,20 +61,17 @@ npm start
 ```
 
 ## Setup for verification
-Before verifying the tool, 4 service needs be configured and run them
+Before verifying the tool, 3 service needs be configured and run them
 - processor
 - receiver
-- Ragnar Tool
-- Topcoder X (both backend and UI)
-
-First login in Ragnar tool with admin and Add owner for which requires topcoder handle, git host's username and type of git host.
+- Topcoder X
 
 Go to Topcoder X UI login with above used topcoder username and
 - go to settings and make sure git hosts are correctly setup, if not click setup and authorize to setup.
 
-- Go to Topcoder X UI and go to project management and add a project from git account and click save, and edit the same project and click 'Add Webhooks' button (you need to add personnel access token), verify that webhooks are set up correctly on git host's project.
+- Go to Topcoder X UI and go to project management and add a project from git account and click save, and edit the same project and click 'Add Webhooks' button, verify that webhooks are set up correctly on git host's project.
 
-Now, receiver service can receive the webhooks from git host's project and processor can processes the requests. Now you can verify this service by following the verfication steps below
+Now, receiver service can receive the webhooks from git host's project and processor can processes the requests. Now you can verify this service by following the verification steps below
 
 ## Verification
 
@@ -106,7 +103,7 @@ Now, receiver service can receive the webhooks from git host's project and proce
   ```
   debug: new challenge created with id 30051089 for issue 3
   ```
-- Wait a minute or 2 for Topcoder internal systems to process the new challenge. You may get an error page `HTTP Status 404` if the internal processings haven't completed yet.
+- Wait a minute or 2 for Topcoder internal systems to process the new challenge. You may get an error page `HTTP Status 404` if the internal processing haven't completed yet.
 - Visit challenge url to verify the challenge:
   ```
   https://www.topcoder-dev.com/challenge-details/30051089/?type=develop&noncache=true
@@ -157,6 +154,6 @@ When an user is assigned to an issue then 'issue.assigned' event will be capture
 - if user is not found in mapping
   - comment on github/gitlab issue will added as :
   ```
-  @username, please sign-up with Ragnar Self-service tool.
+  @username, please sign-up with Topcoder x Self-service tool.
   ```
   - user will be unassigned from issue

config/default.js

@@ -14,16 +14,16 @@ const fs = require('fs');
 
 module.exports = {
   LOG_LEVEL: process.env.LOG_LEVEL || 'debug',
-  TOPIC: process.env.TOPIC || 'tc-x-events',
   PARTITION: process.env.PARTITION || 0,
+  TOPIC: process.env.TOPIC || 'tc-x-events',
   KAFKA_OPTIONS: {
     kafkaHost: process.env.KAFKA_HOST || 'localhost:9092',
     sslOptions: {
-      cert: process.env.KAFKA_CLIENT_CERT || fs.readFileSync('./kafka_client.cer'),
-      key: process.env.KAFKA_CLIENT_CERT_KEY || fs.readFileSync('./kafka_client.key')
-   }
+      cert: process.env.KAFKA_CLIENT_CERT || fs.readFileSync('./kafka_client.cer'), // eslint-disable-line no-sync
+      key: process.env.KAFKA_CLIENT_CERT_KEY || fs.readFileSync('./kafka_client.key'), // eslint-disable-line no-sync
+    }
   },
-  MONGODB_URL: process.env.MONGODB_URI || 'mongodb://127.0.0.1:27017/ragnar',
+  MONGODB_URL: process.env.MONGODB_URI || 'mongodb://127.0.0.1:27017/topcoderx',
   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: {

models/Challenge.js

@@ -11,13 +11,18 @@
 const mongoose = require('mongoose');
 
 const schema = new mongoose.Schema({
-  provider: {type: String, required: true}, // github or gitlab
-  repositoryId: {type: Number, required: true, unique: true},
-  projectId: {type: Number, required: true, unique: true}
+  title: {type: String, required: true},
+  tcDirectId: {type: Number, required: true},
+  repoUrl: {type: String, required: true},
+  rocketChatWebhook: {type: String, required: true},
+  rocketChatChannelName: {type: String, required: true},
+  archived: {type: String, required: true},
+  username: {type: String, required: true},
+  secretWebhookKey: {type: String, required: true}
 });
 
 // project id, provider, repositoryId must be unique
-schema.index({projectId: 1, provider: 1, repositoryId: 1}, {unique: true});
+schema.index({tcDirectId: 1}, {unique: true});
 
 
 module.exports = schema;

models/Project.js

@@ -13,7 +13,6 @@ const constants = require('../constants');
 const Schema = mongoose.Schema;
 
 const schema = new Schema({
-  topcoderUsername: {type: String, required: true},
   userProviderId: {type: Number, required: true},
   username: {type: String, required: true},
   role: {type: String, required: true, enum: _.values(constants.USER_ROLES)},
@@ -24,11 +23,9 @@ const schema = new Schema({
   refreshToken: String
 });
 
-schema.index({topcoderUsername: 1});
 schema.index({userProviderId: 1});
 schema.index({username: 1});
 schema.index({role: 1});
 schema.index({type: 1});
-schema.index({topcoderUsername: 1, type: 1}, {unique: true});
 
 module.exports = schema;

models/User.js

@@ -21,7 +21,6 @@ const models = {
   Issue: connection.model('Issue', require('./Issue')),
   Project: connection.model('Project', require('./Project')),
   User: connection.model('User', require('./User')),
-  Challenge: connection.model('Challenge', require('./Challenge')),
   UserMapping: connection.model('UserMapping', require('./UserMapping'))
 };
 /* eslint-enable global-require */

models/index.js

@@ -147,7 +147,7 @@ async function createComment(copilot, repo, number, body) {
   const github = await _authenticate(copilot.accessToken);
   const owner = await _getUsernameById(github, copilot.userProviderId);
   await github.issues.createComment({owner, repo, number, body});
-  logger.debug('Github comment is added on issue notifying user to assign using Ragnar tool');
+  logger.debug('Github comment is added on issue notifying user to assign using Topcoder x tool');
 }
 
 createComment.schema = {

services/GithubService.js

@@ -24,7 +24,6 @@ const ragnarService = require('./RagnarToolService');
 const gitlabService = require('./GitlabService');
 
 const Issue = models.Issue;
-const Project = models.Project;
 const md = new MarkdownIt();
 
 /**
@@ -120,7 +119,7 @@ async function handleIssueAssignment(event, issue) {
     }
 
     // Update the challenge
-    logger.debug(`Assinging user to challenge: ${userMapping.topcoderUsername}`);
+    logger.debug(`Assigning user to challenge: ${userMapping.topcoderUsername}`);
     await topcoderApiHelper.updateChallenge(dbIssue.challengeId, {
       // task: true,
       assignees: [userMapping.topcoderUsername]
@@ -132,8 +131,8 @@ async function handleIssueAssignment(event, issue) {
 
     logger.debug(`Member ${userMapping.topcoderUsername} is assigned to challenge with id ${dbIssue.challengeId}`);
   } else {
-    // comment on the git ticket for the user to self-sign up with the Ragnar Self-Service tool
-    const comment = `@${assigneeUsername}, please sign-up with Ragnar Self-service tool`;
+    // comment on the git ticket for the user to self-sign up with the Topcoder x Self-Service tool
+    const comment = `@${assigneeUsername}, please sign-up with Topcoder X tool`;
     if (event.provider === 'github') {
       await gitHubService.createComment(event.copilot, event.data.repository.name, issue.number, comment);
       // un-assign the user from the ticket
@@ -218,7 +217,7 @@ async function handleIssueUpdate(event, issue) {
     prizes: issue.prizes
   });
   await dbIssue.save();
-  // comment on the git ticket for the user to self-sign up with the Ragnar Self-Service tool
+  // comment on the git ticket for the user to self-sign up with the Topcoder x Self-Service tool
   const contestUrl = getUrlForChallengeId(dbIssue.challengeId);
   const comment = `Contest ${contestUrl} has been updated - the new changes has been updated for this ticket.`;
   if (event.provider === 'github') {
@@ -238,9 +237,15 @@ async function handleIssueUpdate(event, issue) {
  */
 async function handleIssueCreate(event, issue) {
   // check if project for such repository is already created
-  const project = await Project.findOne({
-    provider: issue.provider,
-    repositoryId: issue.repositoryId
+
+  let fullRepoUrl;
+  if (issue.provider === 'github') {
+    fullRepoUrl = `https://github.com/${event.data.repository.full_name}`;
+  } else if (issue.provider === 'gitlab') {
+    fullRepoUrl = `${config.GITLAB_API_BASE_URL}/${event.data.repository.full_name}`;
+  }
+  const project = await models.Project.findOne({
+    repoUrl: fullRepoUrl
   });
 
   // Check if duplicated
@@ -254,23 +259,13 @@ async function handleIssueCreate(event, issue) {
     throw new Error(
       `challenge ${dbIssue.challengeId} existed already for the issue ${issue.number}`);
   }
-  let projectId;
-  if (project) { // if existing found don't create a project
-    projectId = project.projectId;
-    logger.debug(`existing project was found with id ${projectId} for repository ${event.data.repository.full_name}`);
-  } else {
-    // Create a new project
-    projectId = await topcoderApiHelper.createProject(event.data.repository.full_name);
-
-    // save project and repository mapping in db
-    await Project.create({
-      projectId,
-      provider: issue.provider,
-      repositoryId: issue.repositoryId
-    });
 
-    logger.debug(`new project created with id ${projectId} for issue ${issue.number}`);
-  }
+  if (!project) {
+    throw new Error(
+      'There is no project associated with this repository');
+  }// if existing found don't create a project
+  const projectId = project.tcDirectId;
+  logger.debug(`existing project was found with id ${projectId} for repository ${event.data.repository.full_name}`);
 
   // Create a new challenge
   issue.challengeId = await topcoderApiHelper.createChallenge({
@@ -279,7 +274,7 @@ async function handleIssueCreate(event, issue) {
     detailedRequirements: issue.body,
     prizes: issue.prizes,
     task: true
-  });
+  }, issue.provider, event.data.repository.full_name);
 
   // Save
   await Issue.create(issue);

services/IssueService.js

@@ -4,7 +4,7 @@
 'use strict';
 
 /**
- * This provides methods around Ragnar Self service tool.
+ * This provides methods around Self service tool.
  * @author TCSCODER
  * @version 1.0
  */
@@ -14,7 +14,7 @@ const config = require('config');
 const models = require('../models');
 
 /**
- * gets the tc handle for given username from a provider captured by Ragnar tool
+ * gets the tc handle for given username from a provider captured by Topcoder x tool
  * @param {String} provider the username provider
  * @param {String} username the username
  * @returns {Object} user mapping if found else null
@@ -36,7 +36,7 @@ getTCUserName.schema = {
 };
 
 /**
- * gets the access token of repository's copilot captured by Ragnar tool
+ * gets the access token of repository's copilot captured by Topcoder x tool
  * @param {String} provider the repo provider
  * @param {String} repoFullName the full name of repository
  * @returns {String} the copilot if exists
@@ -50,16 +50,25 @@ async function getRepositoryCopilot(provider, repoFullName) {
     fullRepoUrl = `${config.GITLAB_API_BASE_URL}/${repoFullName}`;
   }
 
-  const challenge = await models.Challenge.findOne({
+  const project = await models.Project.findOne({
     repoUrl: fullRepoUrl
   });
 
-  if (!challenge || !challenge.username) {
-    // throw this repo is not managed by Ragnar tool
-    throw new Error(`This repository '${provider}' is not managed by Ragnar tool.`);
+  if (!project || !project.username) {
+    // throw this repo is not managed by Topcoder x tool
+    throw new Error(`This repository '${repoFullName}' is not managed by Topcoder X tool.`);
   }
+
+  const userMapping = await models.UserMapping.findOne({
+    topcoderUsername: project.username.toLowerCase()
+  });
+
+  if (!userMapping || (provider === 'github' && !userMapping.githubUserId) || (provider === 'gitlab' && !userMapping.gitlabUserId)) {
+    throw new Error(`Couldn't find githost username for '${provider}' for this repository '${repoFullName}'.`);
+  }
+
   const copilot = await models.User.findOne({
-    topcoderUsername: challenge.username.toLowerCase(),
+    username: provider === 'github' ? userMapping.githubUsername : userMapping.gitlabUsername,
     type: provider
   });