Merge pull request #6 from maxceem/develop

Various fixes

Author: vikasrohit

src/constants.js

@@ -16,6 +16,8 @@ const RESOURCES = {
   PROJECT: 'project',
   PROJECT_TEMPLATE: 'project.template',
   PROJECT_TYPE: 'project.type',
+  PROJECT_MEMBER: 'project.member',
+  PROJECT_MEMBER_INVITE: 'project.member.invite',
   ORG_CONFIG: 'project.orgConfig',
   FORM_VERSION: 'project.form.version',
   FORM_REVISION: 'project.form.revision',
@@ -25,14 +27,12 @@ const RESOURCES = {
   PLAN_CONFIG_REVISION: 'project.planConfig.revision',
   PRODUCT_TEMPLATE: 'product.template',
   PRODUCT_CATEGORY: 'product.category',
-  ATTACHMENT: 'attachment',
-  PHASE: 'phase',
-  PROJECT_MEMBER: 'project.member',
-  PHASE_PRODUCT: 'phase.product',
+  PHASE: 'project.phase',
+  PHASE_PRODUCT: 'project.phase.product',
   TIMELINE: 'timeline',
   MILESTONE: 'milestone',
   MILESTONE_TEMPLATE: 'milestone.template',
-  PROJECT_MEMBER_INVITE: 'project.member.invite'
+  ATTACHMENT: 'attachment'
 }
 
 const TIMELINE_REFERENCES = {
@@ -56,7 +56,11 @@ const PROJECT_MEMBER_ROLE = {
   OBSERVER: 'observer',
   CUSTOMER: 'customer',
   COPILOT: 'copilot',
-  ACCOUNT_MANAGER: 'account_manager'
+  ACCOUNT_MANAGER: 'account_manager',
+  PROGRAM_MANAGER: 'program_manager',
+  ACCOUNT_EXECUTIVE: 'account_executive',
+  SOLUTION_ARCHITECT: 'solution_architect',
+  PROJECT_MANAGER: 'project_manager'
 }
 
 const MILESTONE_TEMPLATE_REFERENCES = {

src/services/ProcessorServiceMilestoneTemplate.js

@@ -68,17 +68,17 @@ function createSchema () {
 async function create (message) {
   // handle ES Update
   async function updateDocPromise (doc) {
-    const milestoneTemplate = _.isArray(doc._source.milestoneTemplate) ? doc._source.milestoneTemplate : []
+    const milestoneTemplates = _.isArray(doc._source.milestoneTemplates) ? doc._source.milestoneTemplates : []
 
-    const existingMilestoneTemplateIndex = _.findIndex(milestoneTemplate, p => p.id === message.id)// if milestone template does not exists already
+    const existingMilestoneTemplateIndex = _.findIndex(milestoneTemplates, p => p.id === message.id)// if milestone template does not exists already
     if (existingMilestoneTemplateIndex === -1) {
-      milestoneTemplate.push(message)
+      milestoneTemplates.push(message)
     } else { // if milestone template already exists, ideally we should never land here, but code handles the buggy indexing
       // replaces the old inconsistent index where previously milestone template was not removed from the index but deleted
       // from the database
-      milestoneTemplate.splice(existingMilestoneTemplateIndex, 1, message)
+      milestoneTemplates.splice(existingMilestoneTemplateIndex, 1, message)
     }
-    return _.assign(doc._source, { milestoneTemplate })
+    return _.assign(doc._source, { milestoneTemplates })
   }
 
   await helper.updateMetadadaESPromise(updateDocPromise)
@@ -97,14 +97,14 @@ create.schema = {
 async function update (message) {
   // handle ES Update
   async function updateDocPromise (doc) {
-    const milestoneTemplate = _.map(doc._source.milestoneTemplate, (single) => {
+    const milestoneTemplates = _.map(doc._source.milestoneTemplates, (single) => {
       if (single.id === message.id) {
         return _.assign(single, message)
       }
       return single
     })
 
-    return _.assign(doc._source, { milestoneTemplate })
+    return _.assign(doc._source, { milestoneTemplates })
   }
 
   await helper.updateMetadadaESPromise(updateDocPromise)
@@ -123,8 +123,8 @@ update.schema = {
 async function deleteMessage (message) {
   // handle ES Update
   async function updateDocPromise (doc) {
-    const milestoneTemplate = _.filter(doc._source.milestoneTemplate, single => single.id !== message.id)
-    return _.assign(doc._source, { milestoneTemplate })
+    const milestoneTemplates = _.filter(doc._source.milestoneTemplates, single => single.id !== message.id)
+    return _.assign(doc._source, { milestoneTemplates })
   }
 
   await helper.updateMetadadaESPromise(updateDocPromise)

src/services/ProcessorServiceProductCategory.js

@@ -81,7 +81,6 @@ async function create (message) {
 
 create.schema = {
   message: createSchema()
-    .xor('form', 'template')
 }
 
 /**

src/services/ProcessorServiceProjectMember.js

@@ -27,8 +27,9 @@ function createIdSchema () {
 function updateSchema () {
   return createIdSchema().keys({
     isPrimary: Joi.boolean(),
-    role: Joi.any().valid(PROJECT_MEMBER_ROLE.CUSTOMER, PROJECT_MEMBER_ROLE.MANAGER,
-      PROJECT_MEMBER_ROLE.ACCOUNT_MANAGER, PROJECT_MEMBER_ROLE.COPILOT, PROJECT_MEMBER_ROLE.OBSERVER).required()
+    // unlike in Project Service endpoints, in this processor we should let create members with any roles
+    // because Project Service may create members with any roles implicitly, when accepting invitations
+    role: Joi.string().valid(_.values(PROJECT_MEMBER_ROLE)).required()
   })
 }
 
@@ -38,8 +39,7 @@ function updateSchema () {
  */
 function createSchema () {
   return createIdSchema().keys({
-    role: Joi.any()
-      .valid(PROJECT_MEMBER_ROLE.MANAGER, PROJECT_MEMBER_ROLE.ACCOUNT_MANAGER, PROJECT_MEMBER_ROLE.COPILOT)
+    role: Joi.string().valid(_.values(PROJECT_MEMBER_ROLE))
   })
 }
 

test/e2e/processor.metadata.index.test.js

@@ -66,23 +66,23 @@ describe('TC Milestone Template Topic Tests', () => {
   it('create milestone template message', async () => {
     await ProcessorService.create(milestoneTemplateCreatedMessage)
     const data = await testHelper.getMetadataESData(metadataId)
-    testHelper.expectObj(_.find(data.milestoneTemplate, { id: milestoneTemplateId }),
+    testHelper.expectObj(_.find(data.milestoneTemplates, { id: milestoneTemplateId }),
       milestoneTemplateCreatedMessage.payload,
       _.keys(_.omit(milestoneTemplateCreatedMessage.payload, ['resource'])))
   })
 
   it('create milestone template message - already exists', async () => {
     await ProcessorService.create(milestoneTemplateCreatedMessage)
     const data = await testHelper.getMetadataESData(metadataId)
-    testHelper.expectObj(_.find(data.milestoneTemplate, { id: milestoneTemplateId }),
+    testHelper.expectObj(_.find(data.milestoneTemplates, { id: milestoneTemplateId }),
       milestoneTemplateCreatedMessage.payload,
       _.keys(_.omit(milestoneTemplateCreatedMessage.payload, ['resource'])))
   })
 
   it('update milestone template message', async () => {
     await ProcessorService.update(milestoneTemplateUpdatedMessage)
     const data = await testHelper.getMetadataESData(metadataId)
-    testHelper.expectObj(_.find(data.milestoneTemplate, { id: milestoneTemplateId }),
+    testHelper.expectObj(_.find(data.milestoneTemplates, { id: milestoneTemplateId }),
       milestoneTemplateUpdatedMessage.payload,
       _.keys(_.omit(milestoneTemplateUpdatedMessage.payload, ['resource'])))
   })
@@ -92,13 +92,13 @@ describe('TC Milestone Template Topic Tests', () => {
     message.payload.id = notFoundId
     await ProcessorService.update(message)
     const data = await testHelper.getMetadataESData(metadataId)
-    expect(_.find(data.milestoneTemplate, { id: notFoundId })).to.be.an('undefined')
+    expect(_.find(data.milestoneTemplates, { id: notFoundId })).to.be.an('undefined')
   })
 
   it('delete milestone template message', async () => {
     await ProcessorService.deleteMessage(milestoneTemplateDeletedMessage)
     const data = await testHelper.getMetadataESData(metadataId)
-    expect(_.find(data.milestoneTemplate, { id: milestoneTemplateId })).to.be.an('undefined')
+    expect(_.find(data.milestoneTemplates, { id: milestoneTemplateId })).to.be.an('undefined')
   })
 })