fixes for project member events

Author: Parth Shah

src/constants.js

@@ -1,4 +1,5 @@
 
+import _ from 'lodash'
 export const PROJECT_TYPE = {
   APP_DEV          : 'app_dev',
   GENERIC          : 'generic',
@@ -30,26 +31,16 @@ export const USER_ROLE = {
 
 
 export const EVENT = {
-  INTERNAL: {
-    PROJECT_MEMBER_ADDED: 'internal.project.member.added',
-    PROJECT_MEMBER_REMOVED: 'internal.project.member.removed',
-
-    PROJECT_DRAFT_CREATED: 'internal.project.draft-created',
-    PROJECT_LAUNCHED: 'internal.project.launched',
-    PROJECT_UPDATED: 'internal.project.updated',
-    PROJECT_CANCELLED: 'internal.project.cancelled',
-    PROJECT_COMPLETED: 'internal.project.completed'
-  },
-
-  EXTERNAL: {
-    PROJECT_MEMBER_ADDED: 'external.project.member.added',
-    PROJECT_MEMBER_REMOVED: 'external.project.member.removed',
-
-    PROJECT_DRAFT_CREATED: 'external.project.draft-created',
-    PROJECT_LAUNCHED: 'external.project.launched',
-    PROJECT_UPDATED: 'external.project.updated',
-    PROJECT_CANCELLED: 'external.project.cancelled',
-    PROJECT_COMPLETED: 'external.project.completed'
-  },
-
+  ROUTING_KEY: {
+    PROJECT_MEMBER_ADDED: 'project.member.added',
+    PROJECT_MEMBER_REMOVED: 'project.member.removed',
+
+    PROJECT_DRAFT_CREATED: 'project.draft-created',
+    PROJECT_LAUNCHED: 'project.launched',
+    PROJECT_UPDATED: 'project.updated',
+    PROJECT_CANCELLED: 'project.cancelled',
+    PROJECT_COMPLETED: 'project.completed'
+  }
 }
+EVENT.INTERNAL = _.mapValues(EVENT.ROUTING_KEY, (a) => { return `internal.${a}` })
+EVENT.EXTERNAL = _.mapValues(EVENT.ROUTING_KEY, (a) => { return `external.${a}` })

src/events/projectMembers/index.js

@@ -17,7 +17,7 @@ module.exports = (app, logger) => {
   // Publish messages to the queue
   _.map(internalEvents, (evt) => {
     app.on(evt, (member) => {
-      logger.debug('handling ' + evt)
+      logger.debug('handling ', evt)
       let key = evt.substring(evt.indexOf('.') + 1)
       return app.services.pubsub.publish(key, member)
     })

src/events/projects/create.event.js

@@ -64,13 +64,14 @@ const addProjectStatus = (req, logger, project) => {
         with specification, verify it against our checklist and upload it.</p>`
     }
   ]
-  let postPromises = []
-  _.forEach(topics, t => {
-    postPromises.push(topicService.createTopic(req, project.id, t.title, t.body))
-  })
-
-  return Promise.all(postPromises)
-    .then(val => console.log(val))
+  // NOTE: running these in sequence cos we want topic[0] to be created first
+  // firing these events in parallel doesn't ensure that topic[0] is created first
+  return topicService.createTopic(req, project.id, topics[0].title, topics[0].body)
+    .then(() => topicService.createTopic(req, project.id, topics[1].title, topics[1].body))
+    .then(() => {
+      logger.debug('post-project creation messages posted')
+      return true
+    })
 }
 
 

src/routes/projectMembers/delete.js

@@ -35,9 +35,8 @@ module.exports = [
             return member.save()
           })
           .then(member => {
-            console.log('deleted row', JSON.stringify(member, null, 2))
             // fire event
-            req.app.emit(EVENT.INTERNAL.PROJECT_MEMBER_REMOVED, member)
+            req.app.emit(EVENT.INTERNAL.PROJECT_MEMBER_REMOVED, member.get({plain:true}))
             res.status(204).json({})
           })
           .catch(err => next(err))

src/services/rabbitmq.js

@@ -2,17 +2,11 @@
 /* globals Promise */
 import _ from 'lodash'
 import events from 'events'
+import { EVENT } from '../constants'
+
 const EventEmitter = events.EventEmitter
 
-const ROUTING_KEYS = [
-  'project.draft-created',
-  'project.launched',
-  'project.updated',
-  'project.cancelled',
-  'project.completed',
-  'project.member.registered',
-  'project.member.unregistered',
-]
+const ROUTING_KEYS = _.values(EVENT.ROUTING_KEY)
 
 module.exports = class RabbitMQService extends EventEmitter{