Merge remote-tracking branch 'origin/develop'

Author: jmgasper

README.md

@@ -32,9 +32,6 @@ The following config parameters are supported, they are defined in `config/defau
 |TC_DEV_ENV| the flag whether to use topcoder development api or production| false|
 | 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 |
-| NODE_MAILER_OPTIONS| the node mailer smtp options, see [here](https://nodemailer.com/smtp/ for more detail)| see `default.js` |
-|EMAIL_SENDER_ADDRESS| the email sender email address||
-|ISSUE_BID_EMAIL_RECEIVER| the email receiver about bid email||
 |TC_URL| the base URL of topcoder to get the challenge URL| defaults to `https://www.topcoder-dev.com`|
 |GITLAB_API_BASE_URL| the URL for gitlab host| defaults to `https://gitlab.com`|
 |PAID_ISSUE_LABEL|the label name for paid, should be one of the label configured in topcoder x ui|'tcx_Paid'|
@@ -60,6 +57,7 @@ For using with SSL, the options should be as
 ```
  {
     connectionString: '<server>',
+    groupId: <groupid>,
     ssl: {
       cert: '<certificate>',
       key:  '<key>'

config/default.js

@@ -18,6 +18,7 @@ module.exports = {
   TOPIC: process.env.TOPIC || 'tc-x-events',
   KAFKA_OPTIONS: {
     connectionString: process.env.KAFKA_URL || 'localhost:9092',
+    groupId: process.env.KAFKA_GROUP_ID || 'topcoder-x-processor',
     ssl: {
       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
@@ -53,18 +54,6 @@ module.exports = {
   // 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,
-  // node mailer option
-  NODE_MAILER_OPTIONS: {
-    host: process.env.SMTP_HOST || process.env.MAILGUN_SMTP_SERVER || 'smtp.gmail.com',
-    port: process.env.SMTP_PORT || process.env.MAILGUN_SMTP_POR || 465,
-    secure: process.env.SMTP_IS_SECURE || true,
-    auth: {
-      user: process.env.SMTP_USERNAME || process.env.MAILGUN_SMTP_LOGIN || '',
-      pass: process.env.SMTP_PASSWORD || process.env.MAILGUN_SMTP_PASSWORD || ''
-    }
-  },
-  EMAIL_SENDER_ADDRESS: process.env.EMAIL_SENDER_ADDRESS || '',
-  ISSUE_BID_EMAIL_RECEIVER: process.env.ISSUE_BID_EMAIL_RECEIVER || '',
   TC_URL: process.env.TC_URL || 'https://www.topcoder-dev.com',
   GITLAB_API_BASE_URL: process.env.GITLAB_API_BASE_URL || 'https://gitlab.com',
   PAID_ISSUE_LABEL: process.env.PAID_ISSUE_LABEL || 'tcx_Paid',

configuration.md

@@ -9,14 +9,12 @@ The following config parameters are supported, they are defined in `config/defau
 |TOPIC  | The Kafka topic where events are published.  This must be the same as the configured value for topcoder-x-processor| |
 |KAFKA_OPTIONS | Kafka connection options| |
 |KAFKA_URL | The Kafka host to connect to| localhost:9092 |
+|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|
 | 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 |
-| NODE_MAILER_OPTIONS| the node mailer smtp options, see [here](https://nodemailer.com/smtp/ for more detail)| see `default.js` |
-|EMAIL_SENDER_ADDRESS| the email sender email address||
-|ISSUE_BID_EMAIL_RECEIVER| the email receiver about bid email||
 |TC_URL| the base URL of topcoder to get the challenge URL| defaults to `https://www.topcoder-dev.com`|
 |GITLAB_API_BASE_URL| the URL for gitlab host| defaults to `https://gitlab.com`|
 |PAID_ISSUE_LABEL|the label name for paid, should be one of the label configured in topcoder x ui|'tcx_Paid'|

index.js

@@ -3,6 +3,8 @@
  */
 'use strict';
 
+const config = require('config');
+const _ = require('lodash');
 const kafka = require('./utils/kafka');
 const logger = require('./utils/logger');
 
@@ -19,5 +21,38 @@ process.on('unhandledRejection', (err) => {
   logger.logFullError(err, 'system');
 });
 
+// dump the configuration to logger
+const ignoreConfigLog = ['cert', 'key', 'AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY', 'AUTH0_CLIENT_ID', 'AUTH0_CLIENT_SECRET'];
+/**
+ * Print configs to logger
+ * @param {Object} params the config params
+ * @param {Number} level the level of param object
+ */
+function dumpConfigs(params, level) {
+  Object.keys(params).forEach((key) => {
+    if (_.includes(ignoreConfigLog, key)) {
+      return;
+    }
+    const item = params[key];
+    let str = '';
+    let n = 0;
+    while (n < level) { // eslint-disable-line no-restricted-syntax
+      n++;
+      str += '  ';
+    }
+    if (item && _.isObject(item)) {
+      str += `${key}=`;
+      logger.debug(str);
+      dumpConfigs(item, level + 1);
+    } else {
+      str += `${key}=${item}`;
+      logger.debug(str);
+    }
+  });
+}
+logger.debug('--- List of Configurations ---');
+dumpConfigs(config, 0);
+logger.debug('--- End of List of Configurations ---');
+
 // run the server
 kafka.run();

services/EmailService.js

@@ -11,10 +11,10 @@
 const config = require('config');
 const _ = require('lodash');
 const logger = require('../utils/logger');
-const gitHubService = require('./GithubService');
-const gitlabService = require('./GitlabService');
 const models = require('../models');
 const dbHelper = require('../utils/db-helper');
+const gitHubService = require('./GithubService');
+const gitlabService = require('./GitlabService');
 
 const timeoutMapper = {};
 

services/EventService.js

@@ -21,7 +21,6 @@ const models = require('../models');
 const dbHelper = require('../utils/db-helper');
 const helper = require('../utils/helper');
 const gitHelper = require('../utils/git-helper');
-const emailService = require('./EmailService');
 const userService = require('./UserService');
 const eventService = require('./EventService');
 
@@ -269,7 +268,6 @@ async function handleIssueComment(event, issue) {
   const parsedComment = parseComment(event.data.comment);
   if (parsedComment.isBid) {
     logger.debug(`New bid is received with amount ${parsedComment.bidAmount}.`);
-    await emailService.sendNewBidEmail(event.data, parsedComment.bidAmount);
   }
   if (parsedComment.isAcceptBid) {
     logger.debug(`Bid by ${parsedComment.assignedUser} is accepted with amount ${parsedComment.bidAmount} `);

services/IssueService.js

@@ -21,7 +21,7 @@ const logger = require('./logger');
 
 class Kafka {
   constructor() {
-    this.consumer = new kafka.SimpleConsumer(config.KAFKA_OPTIONS);
+    this.consumer = new kafka.GroupConsumer(config.KAFKA_OPTIONS);
 
     this.producer = new kafka.Producer(config.KAFKA_OPTIONS);
     this.producer.init().then(() => {
@@ -77,10 +77,12 @@ class Kafka {
   }
 
   run() {
-    this.consumer.init().then(() => {
+    this.consumer.init([{
+      subscriptions: [config.TOPIC],
+      handler: this.messageHandler
+    }]).then(() => {
       logger.info('kafka consumer is ready');
       healthcheck.init([this.check]);
-      this.consumer.subscribe(config.TOPIC, {}, this.messageHandler);
     }).catch((err) => {
       logger.error(`kafka consumer is not connected. ${err.stack}`);
     });