Using constants for events name in connectNotificationServer

Updated regular expression to detect user mention

Author: Vikas Agarwal

connect/connectNotificationServer.js

@@ -9,6 +9,7 @@ const config = require('./config');
 const notificationServer = require('../index');
 const _ = require('lodash');
 const service = require('./service');
+const { BUS_API_EVENT } = require('../src/constants')
 const EVENTS = require('./events-config').EVENTS;
 const TOPCODER_ROLE_RULES = require('./events-config').TOPCODER_ROLE_RULES;
 const PROJECT_ROLE_RULES = require('./events-config').PROJECT_ROLE_RULES;
@@ -67,14 +68,14 @@ const getNotificationsForMentionedUser = (eventConfig, content) => {
 
   let notifications = [];
   // eslint-disable-next-line
-  const regexUserHandle = /title=\"@([a-zA-Z0-9-_.{}\[\]]+)\"/g;
+  const regexUserHandle = /title=\"@([a-zA-Z0-9-_.{}\[\]]+)\"|\[(.*)\]\(.*\"\@(.*)\"\)/g;
   const handles = [];
   let matches = regexUserHandle.exec(content);
   while (matches) {
     const handle = matches[1].toString();
     notifications.push({
       userHandle: handle,
-      newType: 'notifications.connect.project.post.mention',
+      newType: BUS_API_EVENT.EMAIL.MENTIONED_IN_POST,
       contents: {
         toUserHandle: true,
       },
@@ -279,7 +280,7 @@ const handler = (topic, message, callback) => {
 
   // filter out `notifications.connect.project.topic.created` events send by bot
   // because they create too much clutter and duplicate info
-  if (topic === 'notifications.connect.project.topic.created' && message.userId.toString() === config.TCWEBSERVICE_ID) {
+  if (topic === BUS_API_EVENT.CONNECT.TOPIC_CREATED && message.userId.toString() === config.TCWEBSERVICE_ID) {
     return callback(null, []);
   }
 

src/app.js

@@ -11,7 +11,7 @@ const jwt = require('jsonwebtoken');
 const _ = require('lodash');
 const cors = require('cors');
 const bodyParser = require('body-parser');
-const { BUS_API_EVENT } = require('./constants')
+const { BUS_API_EVENT } = require('./constants');
 const helper = require('./common/helper');
 const helperService = require('./services/helper');
 const logger = require('./common/logger');