From 2e8cc47b8b84627f379e9537208115d56cd232b0 Mon Sep 17 00:00:00 2001 From: gondzo Date: Thu, 15 Feb 2018 01:30:35 +0100 Subject: [PATCH 1/5] Update busApi.js --- src/events/busApi.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/events/busApi.js b/src/events/busApi.js index 907cfe42..84699623 100644 --- a/src/events/busApi.js +++ b/src/events/busApi.js @@ -27,6 +27,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 +43,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,6 +54,7 @@ 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)) { @@ -59,6 +62,7 @@ module.exports = (app, logger) => { createEvent(BUS_API_EVENT.PROJECT_LINK_CREATED, { projectId: updated.id, projectName: updated.name, + userId: req.authUser.userId, initiatorUserId: req.authUser.userId, }, logger); } @@ -166,6 +170,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 From 4527de1a5afe7ed2dbacd401f80b7b1102f0b569 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 21 Feb 2018 23:08:14 -0600 Subject: [PATCH 2/5] Update tc-core-library-js version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 25d80bc3..b6234466 100644 --- a/package.json +++ b/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" }, From d5807424c89ddeac999b0de855e984d9ea62e513 Mon Sep 17 00:00:00 2001 From: Sachin Maheshwari Date: Fri, 23 Feb 2018 13:05:52 +0530 Subject: [PATCH 3/5] adding notifications prefix in topic name to decouple it from event bus (tc-bus-api). --- src/constants.js | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/constants.js b/src/constants.js index 50f11de6..a73f1723 100644 --- a/src/constants.js +++ b/src/constants.js @@ -54,23 +54,23 @@ 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', - 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 = { From 73193d11c16a88149706416af86f7fe78d96830e Mon Sep 17 00:00:00 2001 From: Samir Gondzetovic Date: Tue, 6 Mar 2018 21:32:53 +0000 Subject: [PATCH 4/5] fix url regex url --- src/constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/constants.js b/src/constants.js index a73f1723..dba0e48a 100644 --- a/src/constants.js +++ b/src/constants.js @@ -74,5 +74,5 @@ export const BUS_API_EVENT = { }; export const REGEX = { - URL: /^(http(s?):\/\/)?(www\.)?[a-zA-Z0-9\.\-\_]+(\.[a-zA-Z]{2,15})+(\:[0-9]{2,5})?(\/[a-zA-Z0-9\_\-\s\.\/\?\%\#\&\=]*)?$/, // eslint-disable-line + URL: /^(http(s?):\/\/)?(www\.)?[a-zA-Z0-9\.\-\_]+(\.[a-zA-Z]{2,15})+(\:[0-9]{2,5})?(\/[a-zA-Z0-9\_\-\s\.\/\?\%\#\&\=;]*)?$/, // eslint-disable-line }; From 5b5a1ebabef18fcbf7f7b077c79b57806c28d6c4 Mon Sep 17 00:00:00 2001 From: Colin Hunt Date: Wed, 14 Mar 2018 08:29:49 -0700 Subject: [PATCH 5/5] Issue 1740: No notification triggered for active status --- src/constants.js | 1 + src/events/busApi.js | 1 + 2 files changed, 2 insertions(+) diff --git a/src/constants.js b/src/constants.js index dba0e48a..e642eb66 100644 --- a/src/constants.js +++ b/src/constants.js @@ -60,6 +60,7 @@ export const BUS_API_EVENT = { 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: 'notifications.connect.project.member.joined', MEMBER_LEFT: 'notifications.connect.project.member.left', diff --git a/src/events/busApi.js b/src/events/busApi.js index 84699623..ac5f7b45 100644 --- a/src/events/busApi.js +++ b/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) => {