Merge branch 'dev'

Author: Parth Shah

circle.yml

@@ -1,7 +1,7 @@
 machine:
 
   node:
-    version: 5.9
+    version: v5.7.0
   environment:
     DB_MASTER_URL: postgres://ubuntu:@127.0.0.1:5432/circle_test
     #RABBITMQ_URL: amqp://localhost:5672
@@ -14,7 +14,7 @@ dependencies:
   pre:
     - pip install awsebcli
   override:
-    - npm install --only=dev
+    - npm install
 
 deployment:
   development:

src/constants.js

@@ -34,6 +34,7 @@ export const EVENT = {
   ROUTING_KEY: {
     PROJECT_MEMBER_ADDED: 'project.member.added',
     PROJECT_MEMBER_REMOVED: 'project.member.removed',
+    PROJECT_MEMBER_UPDATED: 'project.member.updated',
 
     PROJECT_DRAFT_CREATED: 'project.draft-created',
     PROJECT_LAUNCHED: 'project.launched',

src/routes/attachments/create.js

@@ -120,7 +120,7 @@ module.exports = [
       let response = _.cloneDeep(newAttachment)
       response = _.omit(response, ['filePath', 'deletedAt'])
 
-      response.url = resp.data.result.content.preSignedURL
+      response.downloadUrl = resp.data.result.content.preSignedURL
       res.status(201).json(util.wrapResponse(req.id, response))
     })
     .catch(function(err) {

src/routes/attachments/create.spec.js

@@ -134,10 +134,9 @@ describe('Project Attachments', () => {
             getSpy.should.have.been.calledOnce
             stub.restore()
             console.log(JSON.stringify(resJson, null, 2))
-            // resJson.role.should.equal('customer')
-            // resJson.isPrimary.should.be.truthy
-            // resJson.projectId.should.equal(project1.id)
-            // resJson.userId.should.equal(1)
+            resJson.title.should.equal('Spec.pdf')
+            resJson.downloadUrl.should.exist
+            resJson.projectId.should.equal(project1.id)
             done()
           })
     })

src/routes/projectMembers/update.js

@@ -5,7 +5,7 @@ import Joi from 'joi'
 
 import models from '../../models'
 import util from '../../util'
-import { PROJECT_MEMBER_ROLE } from '../../constants'
+import { EVENT, PROJECT_MEMBER_ROLE } from '../../constants'
 import { middleware as tcMiddleware } from 'tc-core-library-js'
 import directProject from '../../services/directProject'
 
@@ -115,6 +115,11 @@ module.exports = [
         .then(() => {
           projectMember = projectMember.get({plain: true})
           projectMember = _.omit(projectMember, ['deletedAt'])
+          // emit original and updated project information
+          req.app.emit(EVENT.INTERNAL.PROJECT_MEMBER_UPDATED, {
+            payload: { original: previousValue, updated: projectMember },
+            props: { correlationId: req.id }
+          })
           req.log.debug('updated project member', projectMember)
           res.json(util.wrapResponse(req.id, projectMember))
         })