Merge pull request #34 from topcoder-platform/dev

Decoupling sendgrid template id from Kafka topic

Author: sachin-maheshwari

.circleci/config.yml

@@ -82,7 +82,7 @@ workflows:
           context : org-global
           filters:
             branches:
-              only: ['dev']
+              only: ['dev', 'feature/decouple-sendgridtemplateid']
       - "build-prod":
           context : org-global
           filters:

config/default.js

@@ -46,4 +46,6 @@ module.exports = {
 
   API_CONTEXT_PATH: process.env.API_CONTEXT_PATH || '/v5/email',
 
+  PAYLOAD_SENDGRID_TEMPLATE_KEY: process.env.PAYLOAD_SENDGRID_TEMPLATE_KEY || 'sendgrid_template_id',
+
 };

connect/connectEmailServer.js

@@ -9,6 +9,7 @@ const _ = require('lodash');
 const config = require('config');
 const emailServer = require('../index');
 const service = require('./service');
+const logger = require('../src/common/logger');
 
 // set configuration for the server, see ../config/default.js for available config parameters
 // setConfig should be called before initDatabase and start functions
@@ -21,16 +22,19 @@ emailServer.setConfig({ LOG_LEVEL: 'debug' });
 // the message is JSON event message,
 // the callback is function(error, templateId), where templateId is the used SendGrid template id
 const handler = (topic, message, callback) => {
-  const templateId = config.TEMPLATE_MAP[topic];
-  if (templateId === undefined) {
+  let templateId = config.TEMPLATE_MAP[topic];
+  templateId = _.get(message, config.PAYLOAD_SENDGRID_TEMPLATE_KEY, templateId);
+  if (!templateId) {
     return callback(null, { success: false, error: `Template not found for topic ${topic}` });
   }
 
-  service.sendEmail(templateId, message).then(() => {
-    callback(null, { success: true });
-  }).catch((err) => {
-    callback(null, { success: false, error: err });
-  });
+    service.sendEmail(templateId, message).then(() => {
+      callback(null, { success: true });
+    }).catch((err) => {
+      logger.error("Error occurred in sendgrid api calling:", err);
+      callback(null, { success: false, error: err });
+    });
+
 };
 
 // init all events