Skip to content

Commit 459d395

Browse files
parthshahparthshah
committed
Merge branch 'master' into dev
2 parents 6a8d786 + a8f8bcb commit 459d395

File tree

17 files changed

+43
-35
lines changed

17 files changed

+43
-35
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,4 @@ jspm_packages
4343
!.elasticbeanstalk/config.yml
4444
!.elasticbeanstalk/*.cfg.yml
4545
!.elasticbeanstalk/*.global.yml
46+
.DS_Store

‎Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ COPY . /usr/src/app
2424
# Install app dependencies
2525
RUN npm install
2626

27-
2827
EXPOSE 3000
2928

3029
CMD ["npm", "start"]

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "tc-projects-service",
3-
"version": "1.1.1",
3+
"version": "1.1.2",
44
"description": "Projects microservice",
55
"main": "index.js",
66
"engines": {

‎src/constants.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,3 @@ export const EVENT = {
4444
PROJECT_DELETED: 'project.deleted'
4545
}
4646
}
47-
EVENT.INTERNAL = _.mapValues(EVENT.ROUTING_KEY, (a) => { return `internal.${a}` })
48-
EVENT.EXTERNAL = _.mapValues(EVENT.ROUTING_KEY, (a) => { return `external.${a}` })

‎src/events/projects/index.js

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,6 @@ import config from 'config'
77
import querystring from 'querystring'
88
import topicService from '../../services/topicService'
99

10-
//
11-
// // Handle internal events
12-
// const internalEvents = [
13-
// EVENT.INTERNAL.PROJECT_DRAFT_CREATED,
14-
// EVENT.INTERNAL.PROJECT_LAUNCHED,
15-
// EVENT.INTERNAL.PROJECT_UPDATED,
16-
// EVENT.INTERNAL.PROJECT_CANCELLED,
17-
// EVENT.INTERNAL.PROJECT_COMPLETED,
18-
// EVENT.INTERNAL.PROJECT_DELETED
19-
// ]
20-
//
21-
// // Publish messages to the queue
22-
// _.map(internalEvents, (evt) => {
23-
// app.on(evt, ({payload, props}) => {
24-
// logger.debug('handling ' + evt)
25-
// let key = evt.substring(evt.indexOf('.') + 1)
26-
// return app.services.pubsub.publish(key, payload, props)
27-
// })
28-
// })
2910
const _addProjectStatus = (req, logger, project) => {
3011
const topics = [
3112
{

‎src/routes/projectMembers/create.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ module.exports = [
6565
newMember = _newMember.get({plain: true})
6666
// publish event
6767
req.app.services.pubsub.publish(
68-
EVENT.INTERNAL.PROJECT_MEMBER_ADDED,
68+
EVENT.ROUTING_KEY.PROJECT_MEMBER_ADDED,
6969
newMember,
7070
{ correlationId: req.id }
7171
)

‎src/routes/projectMembers/create.spec.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ describe('Project Members create', () => {
115115
resJson.isPrimary.should.be.truthy
116116
resJson.projectId.should.equal(project2.id)
117117
resJson.userId.should.equal(1)
118+
server.services.pubsub.publish.calledWith('project.member.added').should.be.true
118119
done()
119120
})
120121
})
@@ -138,6 +139,7 @@ describe('Project Members create', () => {
138139
resJson.isPrimary.should.be.truthy
139140
resJson.projectId.should.equal(project1.id)
140141
resJson.userId.should.equal(1)
142+
server.services.pubsub.publish.calledWith('project.member.added').should.be.true
141143
done()
142144
})
143145
})
@@ -189,6 +191,7 @@ describe('Project Members create', () => {
189191
})
190192
})
191193
var postSpy = sinon.spy(mockHttpClient, 'post')
194+
// var amqPubSpy = sinon.spy(server.services.pubsub, 'publish')
192195
sandbox.stub(util, 'getHttpClient', () => mockHttpClient )
193196
request(server)
194197
.post('/v4/projects/' + project1.id + '/members/')
@@ -209,6 +212,7 @@ describe('Project Members create', () => {
209212
resJson.projectId.should.equal(project1.id)
210213
resJson.userId.should.equal(3)
211214
postSpy.should.have.been.calledOnce
215+
server.services.pubsub.publish.calledWith('project.member.added').should.be.true
212216
done()
213217
})
214218
})

‎src/routes/projectMembers/delete.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ module.exports = [
3737
.then(member => {
3838
// fire event
3939
req.app.services.pubsub.publish(
40-
EVENT.INTERNAL.PROJECT_MEMBER_REMOVED,
40+
EVENT.ROUTING_KEY.PROJECT_MEMBER_REMOVED,
4141
member.get({plain:true}),
4242
{ correlationId: req.id }
4343
)

‎src/routes/projectMembers/delete.spec.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,13 @@ describe('Project members delete', () => {
9898
if (err) {
9999
return done(err)
100100
}
101+
var removedMember = {
102+
projectId: project1.id,
103+
userId: 40051332,
104+
role: 'copilot',
105+
isPrimary: true
106+
}
107+
server.services.pubsub.publish.calledWith('project.member.removed', sinon.match(removedMember)).should.be.true
101108
done()
102109
// models.ProjectMember
103110
// .count({where: { projectId: project1.id, deletedAt: { $eq: null } }})

‎src/routes/projectMembers/update.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ module.exports = [
116116
projectMember = _.omit(projectMember, ['deletedAt'])
117117
// emit original and updated project information
118118
req.app.services.pubsub.publish(
119-
EVENT.INTERNAL.PROJECT_MEMBER_UPDATED,
119+
EVENT.ROUTING_KEY.PROJECT_MEMBER_UPDATED,
120120
{ original: previousValue, updated: projectMember },
121121
{ correlationId: req.id }
122122
)

‎src/routes/projectMembers/update.spec.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ describe('Project members update', () => {
155155
})
156156
.send({
157157
param: {
158-
"role": "copilot"
158+
"role": "customer"
159159
}
160160
})
161161
.expect('Content-Type', /json/)
@@ -166,10 +166,11 @@ describe('Project members update', () => {
166166
}
167167
const resJson = res.body.result.content
168168
should.exist(resJson)
169-
resJson.role.should.equal('copilot')
169+
resJson.role.should.equal('customer')
170170
resJson.isPrimary.should.be.true
171171
new Date(resJson.updatedAt).valueOf().should.be.equal(new Date(member2.updatedAt).valueOf())
172-
resJson.updatedBy.should.equal(1)
172+
resJson.updatedBy.should.equal(40051332)
173+
server.services.pubsub.publish.calledWith('project.member.removed').should.be.true
173174
done()
174175
})
175176

@@ -195,6 +196,7 @@ describe('Project members update', () => {
195196
resJson.role.should.equal(body.param.role)
196197
resJson.isPrimary.should.be.false
197198
resJson.updatedBy.should.equal(40051332)
199+
server.services.pubsub.publish.calledWith('project.member.removed').should.be.true
198200
done()
199201
})
200202
}
@@ -237,6 +239,7 @@ describe('Project members update', () => {
237239
resJson.isPrimary.should.be.false
238240
resJson.updatedBy.should.equal(40051332)
239241
deleteSpy.should.have.been.calledOnce
242+
server.services.pubsub.publish.calledWith('project.member.removed').should.be.true
240243
done()
241244
})
242245
})

‎src/routes/projects/create.spec.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ describe('Project create', () => {
8888
const result = res.body.result
8989
result.success.should.be.truthy
9090
result.status.should.equal(201)
91+
server.services.pubsub.publish.calledWith('project.draft-created').should.be.true
9192
done()
9293
})
9394
})
@@ -137,6 +138,7 @@ describe('Project create', () => {
137138
resJson.bookmarks.should.have.lengthOf(1)
138139
resJson.bookmarks[0].title.should.be.eql('title1')
139140
resJson.bookmarks[0].address.should.be.eql('address1')
141+
server.services.pubsub.publish.calledWith('project.draft-created').should.be.true
140142
done()
141143
})
142144
})

‎src/routes/projects/delete.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ module.exports = [
3333
next(err)
3434
} else {
3535
req.app.services.pubsub.publish(
36-
EVENT.INTERNAL.PROJECT_DELETED,
36+
EVENT.ROUTING_KEY.PROJECT_DELETED,
3737
{ id: projectId },
3838
{ correlationId: req.id }
3939
)

‎src/routes/projects/delete.spec.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,20 @@ describe('Project delete test', () => {
9393
.expect(403, done)
9494
})
9595

96-
it('should return 204 if attachment was successfully removed', done => {
96+
it('should return 204 if project was successfully removed', done => {
9797
request(server)
9898
.delete('/v4/projects/' + project1.id)
9999
.set({
100100
'Authorization': 'Bearer ' + testUtil.jwts.member
101101
})
102-
.expect(204, done())
102+
.expect(204)
103+
.end(function(err, resp) {
104+
if (err) {
105+
return done(err)
106+
}
107+
server.services.pubsub.publish.calledWith('project.deleted').should.be.true
108+
done()
109+
})
103110
})
104111
})
105112
})

‎src/routes/projects/update.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ module.exports = [
165165
previousValue = _.omit(previousValue, ['deletedAt'])
166166
// publish original and updated project data
167167
req.app.services.pubsub.publish(
168-
EVENT.INTERNAL.PROJECT_UPDATED,
168+
EVENT.ROUTING_KEY.PROJECT_UPDATED,
169169
{ original: previousValue, updated: project },
170170
{ correlationId: req.id }
171171
)

‎src/routes/projects/update.spec.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ describe('Project', () => {
161161
result.success.should.be.true
162162
result.status.should.equal(200)
163163
result.content.status.should.equal('active')
164+
server.services.pubsub.publish.calledWith('project.updated').should.be.true
164165
done()
165166
})
166167
})
@@ -181,6 +182,7 @@ describe('Project', () => {
181182
resJson.name.should.equal('updatedProject name')
182183
resJson.updatedAt.should.not.equal("2016-06-30 00:33:07+00")
183184
resJson.updatedBy.should.equal(40051332)
185+
server.services.pubsub.publish.calledWith('project.updated').should.be.true
184186
done()
185187
})
186188
})
@@ -251,6 +253,7 @@ describe('Project', () => {
251253
resJson.updatedAt.should.not.equal("2016-06-30 00:33:07+00")
252254
resJson.updatedBy.should.equal(40051332)
253255
postSpy.should.have.been.calledOnce
256+
server.services.pubsub.publish.calledWith('project.updated').should.be.true
254257
done()
255258
})
256259
})
@@ -274,6 +277,7 @@ describe('Project', () => {
274277
should.exist(resJson)
275278
resJson.billingAccountId.should.equal(1)
276279
resJson.billingAccountId.should.equal(1)
280+
server.services.pubsub.publish.calledWith('project.updated').should.be.true
277281
done()
278282
})
279283
})
@@ -298,6 +302,7 @@ describe('Project', () => {
298302
resJson.billingAccountId.should.equal(1)
299303
resJson.updatedAt.should.not.equal("2016-06-30 00:33:07+00")
300304
resJson.updatedBy.should.equal(40051333)
305+
server.services.pubsub.publish.calledWith('project.updated').should.be.true
301306
done()
302307
})
303308
})
@@ -342,6 +347,7 @@ describe('Project', () => {
342347
resJson = res.body.result.content
343348
should.exist(resJson)
344349
should.not.exist(resJson.bookmarks);
350+
server.services.pubsub.publish.calledWith('project.updated').should.be.true
345351
done()
346352
})
347353

‎src/tests/serviceMocks.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ module.exports = (app) => {
1313
index: () => {}
1414
}
1515
})
16-
sinon.stub(app.services.pubsub, 'publish', ()=>{ return Promise.resolve(true) })
17-
sinon.stub(app.services.es, 'index', ()=>{ return Promise.resolve(true) })
16+
sinon.stub(app.services.pubsub, 'publish', ()=> Promise.resolve(true) )
17+
sinon.stub(app.services.es, 'index', ()=> Promise.resolve(true) )
1818
}

0 commit comments

Comments
 (0)