Merge branch 'develop' into feature/link-attachments

Author: maxceem

package-lock.json

@@ -47,7 +47,7 @@ function createSchema () {
       createdAt: Joi.date(),
       createdBy: Joi.number().integer().positive(),
       updatedAt: Joi.date(),
-      updatedBy: Joi.number().integer().positive(),
+      updatedBy: Joi.number().integer().positive()
     })).optional().allow(null),
     external: Joi.object().keys({
       id: Joi.string(),

src/services/ProcessorServiceProject.js

@@ -22,6 +22,7 @@ function createSchema () {
       .email()
       .optional()
       .allow(null),
+    hashEmail: Joi.string().optional().allow(null),
     status: Joi.any()
       .valid(_.values(INVITE_STATUS))
       .required()
@@ -52,33 +53,48 @@ create.schema = {
   message: createSchema()
 }
 
+// handle ES Update or Delete on invites
+const updateInvitesPromise = message => async (doc) => {
+  // now merge the updated changes and re-index the document
+  const invites = _.isArray(doc._source.invites) ? doc._source.invites : []
+  _.remove(invites, invite => (!!message.email && invite.email === message.email) ||
+  (!!message.userId && invite.userId === message.userId))
+  return _.assign(doc._source, { invites })
+}
+
 /**
  * Update message in Elasticsearch.
  * @param {Object} message the challenge updated message
  * @return {Promise} promise result
  */
 async function update (message) {
-  // handle ES Update
-  async function updateDocPromise (doc) {
-    // now merge the updated changes and reindex the document
-    const invites = _.isArray(doc._source.invites) ? doc._source.invites : []
-    _.remove(invites, invite => (!!message.email && invite.email === message.email) ||
-    (!!message.userId && invite.userId === message.userId))
-    return _.assign(doc._source, { invites })
-  }
-
-  await helper.updateProjectESPromise(message.projectId, updateDocPromise)
+  await helper.updateProjectESPromise(message.projectId, updateInvitesPromise(message))
   logger.debug(`Member invite updated successfully in elasticsearch index, (memberInviteId: ${message.id})`)
 }
 
 update.schema = {
   message: createSchema()
 }
 
+/**
+ * Delete message in Elasticsearch.
+ * @param {Object} message the deleted message
+ * @return {Promise} promise result
+ */
+async function deleteMessage (message) {
+  await helper.updateProjectESPromise(message.projectId, updateInvitesPromise(message))
+  logger.debug(`Member invite deleted successfully in elasticsearch index, (memberInviteId: ${message.id})`)
+}
+
+deleteMessage.schema = {
+  message: createSchema()
+}
+
 // Exports
 module.exports = {
   create,
-  update
+  update,
+  deleteMessage
 }
 
 logger.buildService(module.exports)

src/services/ProcessorServiceProjectMemberInvite.js

@@ -100,6 +100,9 @@ const projectMemberInviteCreatedMessage = require(
 const projectMemberInviteUpdatedMessage = require(
   '../data/project.member.invite/project.action.update.json'
 )
+const projectMemberInviteDeletedMessage = require(
+  '../data/project.member.invite/project.action.delete.json'
+)
 const orgConfigCreatedMessage = require('../data/project.orgConfig/project.action.create.json')
 const orgConfigUpdatedMessage = require('../data/project.orgConfig/project.action.update.json')
 const orgConfigDeletedMessage = require('../data/project.orgConfig/project.action.delete.json')
@@ -202,6 +205,7 @@ module.exports = {
   orgConfigDeletedMessage,
   projectMemberInviteUpdatedMessage,
   projectMemberInviteCreatedMessage,
+  projectMemberInviteDeletedMessage,
   projectMemberUpdatedMessage,
   projectMemberCreatedMessage,
   projectMemberDeletedMessage,

test/common/testData.js

@@ -1 +1 @@
-{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T04:58:12.671Z","mime-type":"application/json","payload":{"resource":"project.member.invite","createdAt":"2019-06-21T04:58:12.594Z","updatedAt":"2019-06-21T04:58:12.594Z","id":1,"projectId":1,"role":"customer","status":"pending","createdBy":40051334,"updatedBy":40051334,"userId":40051331,"email":null,"deletedAt":null,"deletedBy":null}}
+{"topic":"project.action.create","originator":"project-api","timestamp":"2019-06-21T04:58:12.671Z","mime-type":"application/json","payload":{"resource":"project.member.invite","createdAt":"2019-06-21T04:58:12.594Z","updatedAt":"2019-06-21T04:58:12.594Z","id":1,"projectId":1,"role":"customer","status":"pending","createdBy":40051334,"updatedBy":40051334,"userId":40051331,"email":"test@topcoder.com","hashEmail":"dummy_value","deletedAt":null,"deletedBy":null}}

test/data/project.member.invite/project.action.create.json

@@ -0,0 +1 @@
+{"topic":"project.action.update","originator":"project-api","timestamp":"2019-06-21T04:59:38.562Z","mime-type":"application/json","payload":{"resource":"project.member.invite","status":"canceled","userId":40051331,"email":"test@topcoder.com","hashEmail":"dummy_value","id":1,"projectId":1}}

test/data/project.member.invite/project.action.delete.json

@@ -1 +1 @@
-{"topic":"project.action.update","originator":"project-api","timestamp":"2019-06-21T04:59:38.562Z","mime-type":"application/json","payload":{"resource":"project.member.invite","status":"pending","userId":40051331,"email":"test@topcoder.com","id":1,"projectId":1}}
+{"topic":"project.action.update","originator":"project-api","timestamp":"2019-06-21T04:59:38.562Z","mime-type":"application/json","payload":{"resource":"project.member.invite","status":"pending","userId":40051331,"email":"test@topcoder.com","hashEmail":"dummy_value","id":1,"projectId":1}}

test/data/project.member.invite/project.action.update.json

@@ -23,6 +23,7 @@ const {
   projectMemberInviteId,
   projectMemberInviteUpdatedMessage,
   projectMemberInviteCreatedMessage,
+  projectMemberInviteDeletedMessage,
   projectMemberUpdatedMessage,
   projectMemberCreatedMessage,
   projectMemberDeletedMessage,
@@ -891,6 +892,24 @@ describe('TC Project Member Invite Topic Tests', () => {
     expect(_.find(data.invites, { id: notFoundId })).to.be.an('undefined')
   })
 
+  it('delete project member invite message', async () => {
+    await ProcessorService.create(projectMemberInviteCreatedMessage)
+    let data = await testHelper.getProjectESData(projectId)
+    testHelper.expectObj(_.find(data.invites, { id: projectMemberInviteId }), projectMemberInviteCreatedMessage.payload,
+      _.keys(_.omit(projectMemberInviteCreatedMessage.payload, ['resource'])))
+    await ProcessorService.deleteMessage(projectMemberInviteDeletedMessage)
+    data = await testHelper.getProjectESData(projectId)
+    expect(_.find(data.invites, { id: projectMemberInviteId })).to.be.an('undefined')
+  })
+
+  it('delete project member invite message - not found', async () => {
+    const message = _.cloneDeep(projectMemberInviteDeletedMessage)
+    message.payload.id = notFoundId
+    await ProcessorService.deleteMessage(message)
+    const data = await testHelper.getProjectESData(projectId)
+    expect(_.find(data.invites, { id: notFoundId })).to.be.an('undefined')
+  })
+
   it('test logger', async () => {
     /**
      * test long array