Skip to content

Commit 24f2e3f

Browse files
committed
Fixes issue 29, according comments of issue.
1 parent 7f4714a commit 24f2e3f

File tree

2 files changed

+3
-22
lines changed

2 files changed

+3
-22
lines changed

src/services/ProcessorServiceProjectMemberInvite.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,9 @@ create.schema = {
5757
const updateInvitesPromise = message => async (doc) => {
5858
// now merge the updated changes and re-index the document
5959
const invites = _.isArray(doc._source.invites) ? doc._source.invites : []
60-
const removedInvites = _.remove(invites, invite => (!!message.email && invite.email === message.email) ||
61-
(!!message.userId && invite.userId === message.userId))
62-
if (invites.length && !removedInvites.length) {
63-
throw new Error(`Invite with email "${message.email}" and userId "${message.userId}" is not found and not removed.`)
60+
const removedInvites = _.remove(invites, invite => message.id === invite.id)
61+
if (!removedInvites.length) {
62+
throw new Error(`Invite with id "${message.id}" is not found and not removed.`)
6463
}
6564
return _.assign(doc._source, { invites })
6665
}

test/e2e/processor.project.index.test.js

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -887,15 +887,6 @@ describe('TC Project Member Invite Topic Tests', () => {
887887
it('update project member invite message - not found', async () => {
888888
const message = _.cloneDeep(projectMemberInviteUpdatedMessage)
889889
message.payload.id = notFoundId
890-
await ProcessorService.update(message)
891-
const data = await testHelper.getProjectESData(projectId)
892-
expect(_.find(data.invites, { id: notFoundId })).to.be.an('undefined')
893-
})
894-
895-
it('update project member invite message - invalid parameters, not existing member', async () => {
896-
const message = _.cloneDeep(projectMemberInviteUpdatedMessage)
897-
message.payload.userId = '11111111'
898-
message.payload.email = 'wrong@mail.com'
899890
try {
900891
await ProcessorService.create(projectMemberInviteCreatedMessage)
901892
await ProcessorService.update(message)
@@ -923,15 +914,6 @@ describe('TC Project Member Invite Topic Tests', () => {
923914
it('delete project member invite message - not found', async () => {
924915
const message = _.cloneDeep(projectMemberInviteDeletedMessage)
925916
message.payload.id = notFoundId
926-
await ProcessorService.deleteMessage(message)
927-
const data = await testHelper.getProjectESData(projectId)
928-
expect(_.find(data.invites, { id: notFoundId })).to.be.an('undefined')
929-
})
930-
931-
it('delete project member invite message - invalid parameters, not existing member', async () => {
932-
const message = _.cloneDeep(projectMemberInviteDeletedMessage)
933-
message.payload.userId = '11111111'
934-
message.payload.email = 'wrong@mail.com'
935917
try {
936918
await ProcessorService.create(projectMemberInviteCreatedMessage)
937919
await ProcessorService.deleteMessage(message)

0 commit comments

Comments
 (0)