Merge branch 'hotfix/1.4.2' into dev

Author: Parth Shah

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tc-projects-service",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "Projects microservice",
   "main": "index.js",
   "engines": {

src/events/projectAttachments/index.js

@@ -5,6 +5,7 @@
 
 import config from 'config';
 import _ from 'lodash';
+import Promise from 'bluebird';
 import util from '../../util';
 
 const ES_PROJECT_INDEX = config.get('elasticsearchConfig.indexName');
@@ -19,37 +20,22 @@ const eClient = util.getElasticSearchClient();
  * @param  {Object} channel channel to ack, nack
  * @returns {undefined}
  */
-const projectAttachmentAddedHandler = (logger, msg, channel) => {
-  const data = JSON.parse(msg.content.toString());
-
-  eClient.get({
-    index: ES_PROJECT_INDEX,
-    type: ES_PROJECT_TYPE,
-    id: data.projectId,
-  }).then((doc) => {
+const projectAttachmentAddedHandler = Promise.coroutine(function* (logger, msg, channel) { // eslint-disable-line func-names
+  try {
+    const data = JSON.parse(msg.content.toString());
+    const doc = yield eClient.get({ index: ES_PROJECT_INDEX, type: ES_PROJECT_TYPE, id: data.projectId });
     const attachments = _.isArray(doc._source.attachments) ? doc._source.attachments : [];    // eslint-disable-line no-underscore-dangle
     attachments.push(data);
     const merged = _.merge(doc._source, { attachments });       // eslint-disable-line no-underscore-dangle
-    eClient.update({
-      index: ES_PROJECT_INDEX,
-      type: ES_PROJECT_TYPE,
-      id: data.projectId,
-      body: {
-        doc: merged,
-      },
-    }).then(() => {
-      logger.debug('project attachment added to project document successfully');
-      channel.ack(msg);
-    }).catch((error) => {
-      logger.error('failed to add project attachment to project document', error);
-      channel.nack(msg, false, !msg.fields.redelivered);
-    });
-  }).catch((error) => {
-    logger.error('Error fetching project document from elasticsearch', error);
+    yield eClient.update({ index: ES_PROJECT_INDEX, type: ES_PROJECT_TYPE, id: data.projectId, body: { doc: merged } });
+    logger.debug('project attachment added to project document successfully');
+    channel.ack(msg);
+  } catch (error) {
+    logger.error('Error handling project.attachment.added event', error);
     // if the message has been redelivered dont attempt to reprocess it
     channel.nack(msg, false, !msg.fields.redelivered);
-  });
-};
+  }
+});
 
 /**
  * Handler for project attachment updated event
@@ -58,41 +44,33 @@ const projectAttachmentAddedHandler = (logger, msg, channel) => {
  * @param  {Object} channel channel to ack, nack
  * @returns {undefined}
  */
-const projectAttachmentUpdatedHandler = (logger, msg, channel) => {
-  const data = JSON.parse(msg.content.toString());
-
-  eClient.get({
-    index: ES_PROJECT_INDEX,
-    type: ES_PROJECT_TYPE,
-    id: data.original.projectId,
-  }).then((doc) => {
+const projectAttachmentUpdatedHandler = Promise.coroutine(function* (logger, msg, channel) { // eslint-disable-line func-names
+  try {
+    const data = JSON.parse(msg.content.toString());
+    const doc = yield eClient.get({ index: ES_PROJECT_INDEX, type: ES_PROJECT_TYPE, id: data.original.projectId });
     const attachments = _.map(doc._source.attachments, (single) => {   // eslint-disable-line no-underscore-dangle
       if (single.id === data.original.id) {
         return _.merge(single, data.updated);
       }
       return single;
     });
     const merged = _.merge(doc._source, { attachments });       // eslint-disable-line no-underscore-dangle
-    eClient.update({
+    yield eClient.update({
       index: ES_PROJECT_INDEX,
       type: ES_PROJECT_TYPE,
       id: data.original.projectId,
       body: {
         doc: merged,
       },
-    }).then(() => {
-      logger.debug('elasticsearch index updated, project attachment updated successfully');
-      channel.ack(msg);
-    }).catch((error) => {
-      logger.error('failed to update project attachment for project document', error);
-      channel.nack(msg, false, !msg.fields.redelivered);
     });
-  }).catch((error) => {
-    logger.error('Error fetching project document from elasticsearch', error);
+    logger.debug('elasticsearch index updated, project attachment updated successfully');
+    channel.ack(msg);
+  } catch (error) {
+    logger.error('Error handling project.attachment.updated event', error);
     // if the message has been redelivered dont attempt to reprocess it
     channel.nack(msg, false, !msg.fields.redelivered);
-  });
-};
+  }
+});
 
 /**
  * Handler for project attachment deleted event
@@ -101,35 +79,28 @@ const projectAttachmentUpdatedHandler = (logger, msg, channel) => {
  * @param  {Object} channel channel to ack, nack
  * @returns {undefined}
  */
-const projectAttachmentRemovedHandler = (logger, msg, channel) => {
-  const data = JSON.parse(msg.content.toString());
-  eClient.get({
-    index: ES_PROJECT_INDEX,
-    type: ES_PROJECT_TYPE,
-    id: data.projectId,
-  }).then((doc) => {
+const projectAttachmentRemovedHandler = Promise.coroutine(function* (logger, msg, channel) { // eslint-disable-line func-names
+  try {
+    const data = JSON.parse(msg.content.toString());
+    const doc = yield eClient.get({ index: ES_PROJECT_INDEX, type: ES_PROJECT_TYPE, id: data.projectId });
     const attachments = _.filter(doc._source.attachments, single => single.id !== data.id);     // eslint-disable-line no-underscore-dangle
     const merged = _.merge(doc._source, { attachments });       // eslint-disable-line no-underscore-dangle
-    eClient.update({
+    yield eClient.update({
       index: ES_PROJECT_INDEX,
       type: ES_PROJECT_TYPE,
       id: data.projectId,
       body: {
         doc: merged,
       },
-    }).then(() => {
-      logger.debug('project attachment removed from project document successfully');
-      channel.ack(msg);
-    }).catch((error) => {
-      logger.error('failed to remove project attachment from project document', error);
-      channel.nack(msg, false, !msg.fields.redelivered);
     });
-  }).catch((error) => {
+    logger.debug('project attachment removed from project document successfully');
+    channel.ack(msg);
+  } catch (error) {
     logger.error('Error fetching project document from elasticsearch', error);
     // if the message has been redelivered dont attempt to reprocess it
     channel.nack(msg, false, !msg.fields.redelivered);
-  });
-};
+  }
+});
 
 
 module.exports = {