Merge pull request #70 from topcoder-platform/dev

tc-email-service release

Author: sachin-maheshwari

package.json

@@ -55,7 +55,7 @@
     "pg": "^4.5.5",
     "pg-native": "^1.10.0",
     "sequelize": "^3.23.0",
-    "tc-core-library-js": "appirio-tech/tc-core-library-js.git#v2.1",
+    "tc-core-library-js": "appirio-tech/tc-core-library-js.git#v2.2",
     "traverse": "^0.6.6",
     "urlencode": "^1.1.0"
   },

src/constants.js

@@ -54,23 +54,24 @@ export const EVENT = {
 };
 
 export const BUS_API_EVENT = {
-  PROJECT_CREATED: 'connect.project.created',
-  PROJECT_SUBMITTED_FOR_REVIEW: 'connect.project.submittedForReview',
-  PROJECT_APPROVED: 'connect.project.approved',
-  PROJECT_PAUSED: 'connect.project.paused',
-  PROJECT_COMPLETED: 'connect.project.completed',
-  PROJECT_CANCELED: 'connect.project.canceled',
+  PROJECT_CREATED: 'notifications.connect.project.created',
+  PROJECT_SUBMITTED_FOR_REVIEW: 'notifications.connect.project.submittedForReview',
+  PROJECT_APPROVED: 'notifications.connect.project.approved',
+  PROJECT_PAUSED: 'notifications.connect.project.paused',
+  PROJECT_COMPLETED: 'notifications.connect.project.completed',
+  PROJECT_CANCELED: 'notifications.connect.project.canceled',
+  PROJECT_ACTIVE: 'notifications.connect.project.active',
 
-  MEMBER_JOINED: 'connect.project.member.joined',
-  MEMBER_LEFT: 'connect.project.member.left',
-  MEMBER_REMOVED: 'connect.project.member.removed',
-  MEMBER_ASSIGNED_AS_OWNER: 'connect.project.member.assignedAsOwner',
-  MEMBER_JOINED_COPILOT: 'connect.project.member.copilotJoined',
-  MEMBER_JOINED_MANAGER: 'connect.project.member.managerJoined',
+  MEMBER_JOINED: 'notifications.connect.project.member.joined',
+  MEMBER_LEFT: 'notifications.connect.project.member.left',
+  MEMBER_REMOVED: 'notifications.connect.project.member.removed',
+  MEMBER_ASSIGNED_AS_OWNER: 'notifications.connect.project.member.assignedAsOwner',
+  MEMBER_JOINED_COPILOT: 'notifications.connect.project.member.copilotJoined',
+  MEMBER_JOINED_MANAGER: 'notifications.connect.project.member.managerJoined',
 
-  PROJECT_LINK_CREATED: 'connect.project.linkCreated',
-  PROJECT_FILE_UPLOADED: 'connect.project.fileUploaded',
-  PROJECT_SPECIFICATION_MODIFIED: 'connect.project.specificationModified',
+  PROJECT_LINK_CREATED: 'notifications.connect.project.linkCreated',
+  PROJECT_FILE_UPLOADED: 'notifications.connect.project.fileUploaded',
+  PROJECT_SPECIFICATION_MODIFIED: 'notifications.connect.project.specificationModified',
 };
 
 export const REGEX = {

src/events/busApi.js

@@ -14,6 +14,7 @@ const mapEventTypes = {
   [PROJECT_STATUS.COMPLETED]: BUS_API_EVENT.PROJECT_COMPLETED,
   [PROJECT_STATUS.CANCELLED]: BUS_API_EVENT.PROJECT_CANCELED,
   [PROJECT_STATUS.PAUSED]: BUS_API_EVENT.PROJECT_PAUSED,
+  [PROJECT_STATUS.ACTIVE]: BUS_API_EVENT.PROJECT_ACTIVE,
 };
 
 module.exports = (app, logger) => {
@@ -27,6 +28,7 @@ module.exports = (app, logger) => {
     createEvent(BUS_API_EVENT.PROJECT_CREATED, {
       projectId: project.id,
       projectName: project.name,
+      userId: req.authUser.userId,
       initiatorUserId: req.authUser.userId,
     }, logger);
   });
@@ -42,6 +44,7 @@ module.exports = (app, logger) => {
       createEvent(mapEventTypes[updated.status], {
         projectId: updated.id,
         projectName: updated.name,
+        userId: req.authUser.userId,
         initiatorUserId: req.authUser.userId,
       }, logger);
     } else if (
@@ -52,13 +55,15 @@ module.exports = (app, logger) => {
       createEvent(BUS_API_EVENT.PROJECT_SPECIFICATION_MODIFIED, {
         projectId: updated.id,
         projectName: updated.name,
+        userId: req.authUser.userId,
         initiatorUserId: req.authUser.userId,
       }, logger);
     } else if (!_.isEqual(original.bookmarks, updated.bookmarks)) {
       logger.debug('project bookmarks is updated');
       createEvent(BUS_API_EVENT.PROJECT_LINK_CREATED, {
         projectId: updated.id,
         projectName: updated.name,
+        userId: req.authUser.userId,
         initiatorUserId: req.authUser.userId,
       }, logger);
     }
@@ -166,6 +171,7 @@ module.exports = (app, logger) => {
         projectId,
         projectName: project.name,
         fileName: attachment.filePath.replace(/^.*[\\\/]/, ''),    // eslint-disable-line
+        userId: req.authUser.userId,
         initiatorUserId: req.authUser.userId,
       }, logger);
     }).catch(err => null);    // eslint-disable-line no-unused-vars