Merge branch 'release/v1.1.2'

Author: Parth Shah

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tc-projects-service",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Projects microservice",
   "main": "index.js",
   "scripts": {

src/constants.js

@@ -44,5 +44,3 @@ export const EVENT = {
     PROJECT_DELETED: 'project.deleted'
   }
 }
-EVENT.INTERNAL = _.mapValues(EVENT.ROUTING_KEY, (a) => { return `internal.${a}` })
-EVENT.EXTERNAL = _.mapValues(EVENT.ROUTING_KEY, (a) => { return `external.${a}` })

src/events/projects/index.js

@@ -5,25 +5,6 @@ import {
 import util from '../../util'
 import topicService from '../../services/topicService'
 
-//
-// // Handle internal events
-// const internalEvents = [
-//   EVENT.INTERNAL.PROJECT_DRAFT_CREATED,
-//   EVENT.INTERNAL.PROJECT_LAUNCHED,
-//   EVENT.INTERNAL.PROJECT_UPDATED,
-//   EVENT.INTERNAL.PROJECT_CANCELLED,
-//   EVENT.INTERNAL.PROJECT_COMPLETED,
-//   EVENT.INTERNAL.PROJECT_DELETED
-// ]
-//
-// // Publish messages to the queue
-// _.map(internalEvents, (evt) => {
-//   app.on(evt, ({payload, props}) => {
-//     logger.debug('handling ' + evt)
-//     let key = evt.substring(evt.indexOf('.') + 1)
-//     return app.services.pubsub.publish(key, payload, props)
-//   })
-// })
 const _addProjectStatus = (req, logger, project) => {
   const topics = [
     {
@@ -55,7 +36,7 @@ const _addProjectStatus = (req, logger, project) => {
  * @param  {[type]} channel channel to ack, nack
  */
 const projectCreatedHandler = (logger, msg, channel) => {
-  let project = JSON.parse(msg.content.toString())
+  let project = JSON.parse(msg.content)
   return util.getSystemUserToken(logger)
     .then(token => {
       const req = {

src/routes/projectMembers/create.js

@@ -65,7 +65,7 @@ module.exports = [
         newMember = _newMember.get({plain: true})
         // publish event
         req.app.services.pubsub.publish(
-          EVENT.INTERNAL.PROJECT_MEMBER_ADDED,
+          EVENT.ROUTING_KEY.PROJECT_MEMBER_ADDED,
           newMember,
           { correlationId: req.id }
         )

src/routes/projectMembers/delete.js

@@ -37,7 +37,7 @@ module.exports = [
           .then(member => {
             // fire event
             req.app.services.pubsub.publish(
-              EVENT.INTERNAL.PROJECT_MEMBER_REMOVED,
+              EVENT.ROUTING_KEY.PROJECT_MEMBER_REMOVED,
               member.get({plain:true}),
               { correlationId: req.id }
             )

src/routes/projectMembers/update.js

@@ -116,7 +116,7 @@ module.exports = [
           projectMember = _.omit(projectMember, ['deletedAt'])
           // emit original and updated project information
           req.app.services.pubsub.publish(
-            EVENT.INTERNAL.PROJECT_MEMBER_UPDATED,
+            EVENT.ROUTING_KEY.PROJECT_MEMBER_UPDATED,
             { original: previousValue, updated: projectMember },
             { correlationId: req.id }
           )

src/routes/projects/delete.js

@@ -33,7 +33,7 @@ module.exports = [
             next(err)
           } else {
             req.app.services.pubsub.publish(
-              EVENT.INTERNAL.PROJECT_DELETED,
+              EVENT.ROUTING_KEY.PROJECT_DELETED,
               { id: projectId },
               { correlationId: req.id }
             )

src/routes/projects/update.js

@@ -165,7 +165,7 @@ module.exports = [
           previousValue =  _.omit(previousValue, ['deletedAt'])
           // publish original and updated project data
           req.app.services.pubsub.publish(
-            EVENT.INTERNAL.PROJECT_UPDATED, 
+            EVENT.ROUTING_KEY.PROJECT_UPDATED, 
             { original: previousValue, updated: project },
             { correlationId: req.id }
           )

src/services/rabbitmq.js

@@ -168,7 +168,7 @@ module.exports = class RabbitMQService extends EventEmitter {
           new Buffer(JSON.stringify(payload)),
           props
         )
-        self.logger.debug('Sent %s: %s', self.exchangeName, payload)
+        self.logger.debug('Published msg to exchange %s with key: %s', self.exchangeName, key)
         return channel.close()
       })
       .catch((err) => {