Allowed direct project and billing account ids in update product calls

added new fields, spentBudget and duration, in phase
reverted back to m2m call while creating topic because now message is updated to use cdderbot as user for m2m calls for the topic creation

Author: Vikas Agarwal

src/events/projectPhases/index.js

@@ -60,7 +60,6 @@ const indexProjectPhase = Promise.coroutine(function* (logger, phase) { // eslin
 const createPhaseTopic = Promise.coroutine(function* (logger, phase) { // eslint-disable-line func-names
   try {
     logger.debug('Creating topic for phase with phase', phase);
-    // const phase = JSON.parse(msg.content.toString());
     const topic = yield messageService.createTopic({
       reference: 'project',
       referenceId: `${phase.projectId}`,

src/models/projectPhase.js

@@ -9,7 +9,9 @@ module.exports = function defineProjectPhase(sequelize, DataTypes) {
     status: { type: DataTypes.STRING, allowNull: true },
     startDate: { type: DataTypes.DATE, allowNull: true },
     endDate: { type: DataTypes.DATE, allowNull: true },
+    duration: { type: DataTypes.INTEGER, allowNull: false },
     budget: { type: DataTypes.DOUBLE, defaultValue: 0.0 },
+    spentBudget: { type: DataTypes.DOUBLE, defaultValue: 0.0 },
     progress: { type: DataTypes.DOUBLE, defaultValue: 0.0 },
     details: { type: DataTypes.JSON, defaultValue: {} },
 

src/routes/phaseProducts/update.js

@@ -16,6 +16,8 @@ const updatePhaseProductValidation = {
       name: Joi.string().optional(),
       type: Joi.string().optional(),
       templateId: Joi.number().optional(),
+      directProjectId: Joi.number().positive().optional(),
+      billingAccountId: Joi.number().positive().optional(),
       estimatedPrice: Joi.number().positive().optional(),
       actualPrice: Joi.number().positive().optional(),
       details: Joi.any().optional(),

src/routes/phases/create.js

@@ -16,7 +16,9 @@ const addProjectPhaseValidations = {
       status: Joi.string().required(),
       startDate: Joi.date().max(Joi.ref('endDate')).optional(),
       endDate: Joi.date().optional(),
+      duration: Joi.number().positive().optional(),
       budget: Joi.number().positive().optional(),
+      spentBudget: Joi.number().positive().optional(),
       progress: Joi.number().positive().optional(),
       details: Joi.any().optional(),
     }).required(),

src/routes/phases/update.js

@@ -17,7 +17,9 @@ const updateProjectPhaseValidation = {
       status: Joi.string().optional(),
       startDate: Joi.date().optional(),
       endDate: Joi.date().optional(),
+      duration: Joi.number().positive().optional(),
       budget: Joi.number().positive().optional(),
+      spentBudget: Joi.number().positive().optional(),
       progress: Joi.number().positive().optional(),
       details: Joi.any().optional(),
     }).required(),

src/services/messageService.js

@@ -64,13 +64,13 @@ async function getClient(logger) {
  */
 function createTopic(topic, logger) {
   logger.debug(`createTopic for topic: ${JSON.stringify(topic)}`);
-  // return getClient(logger).then((msgClient) => {
-  return util.getSystemUserToken(logger).then((adminToken) => {
+  return getClient(logger).then((msgClient) => {
+  // return util.getSystemUserToken(logger).then((adminToken) => {
     logger.debug('calling message service');
-    // return msgClient.post('/topics/create', topic)
-    const httpClient = util.getHttpClient({ id: `topic#create#${topic.referenceId}`, log: logger });
-    httpClient.defaults.headers.common.Authorization = `Bearer ${adminToken}`;
-    return httpClient.post(`${config.get('messageApiUrl')}/topics/create`, topic)
+    return msgClient.post('/topics/create', topic)
+    // const httpClient = util.getHttpClient({ id: `topic#create#${topic.referenceId}`, log: logger });
+    // httpClient.defaults.headers.common.Authorization = `Bearer ${adminToken}`;
+    // return httpClient.post(`${config.get('messageApiUrl')}/topics/create`, topic)
       .then((resp) => {
         logger.debug('Topic created successfully');
         logger.debug(`Topic created successfully [status]: ${resp.status}`);