fix user mention handling

Author: gondzo

connect/connectNotificationServer.js

@@ -66,22 +66,35 @@ const getNotificationsForMentionedUser = (eventConfig, content) => {
   }
 
   let notifications = [];
-  const regexUserId = /@([0-9]+)/g;
-  let matches = regexUserId.exec(content);
+  const regexUserId = /@([a-zA-Z0-9-_.{}\[\]]+)/g;
+  let handles=[];
+  let matches = regexUserId.exec(content); 
+  console.log("matches"+matches)
   while (matches) {
+    let handle = matches[1].toString();
     notifications.push({
-      userId: matches[1].toString(),
+      userHandle: handle,
       newType: 'notifications.connect.project.post.mention',
       contents: {
         toUserHandle: true,
       },
     });
     matches = regexUserId.exec(content);
+    handles.push(handle);
   }
-
-  // only one per userId
-  notifications = _.uniqBy(notifications, 'userId');
-  return Promise.resolve(notifications);
+  // only one per userHandle
+  notifications = _.uniqBy(notifications, 'userHandle');
+
+  return new Promise((resolve)=>{
+    service.getUsersByHandle(handles).then((users)=>{
+      console.log(users);
+      _.map(notifications,(notification)=>{
+        console.log("userhandle: "+notification.userHandle);
+        notification.userId = _.find(users,{handle:notification.userHandle}).userId;
+      });
+      resolve(notifications);
+    })
+  });
 };
 
 /**
@@ -284,7 +297,7 @@ const handler = (topic, message, callback) => {
       //       - check that event has everything required or throw error
       getNotificationsForTopicStarter(eventConfig, message.topicId),
       getNotificationsForUserId(eventConfig, message.userId),
-      message.contents && message.contents.postContent ? getNotificationsForMentionedUser(eventConfig, message.contents.postContent) : Promise.resolve([]),
+      message.postContent ? getNotificationsForMentionedUser(eventConfig, message.postContent) : Promise.resolve([]),
       getProjectMembersNotifications(eventConfig, project),
       getTopCoderMembersNotifications(eventConfig),
     ]).then((notificationsPerSource) => (

connect/service.js

@@ -89,6 +89,36 @@ const getUsersById = (ids) => {
     });
 };
 
+/**
+ * Get users details by ids
+ *
+ * @param  {Array} ids list of user ids
+ *
+ * @return {Promise}   resolves to the list of user details
+ */
+const getUsersByHandle = (handles) => {
+  const query = _.map(handles, (handle) => 'handle:' + handle).join(' OR ');
+  return request
+    .get(`${config.TC_API_V3_BASE_URL}/members/_search?fields=userId,handle,firstName,lastName&query=${query}`)
+    .set('accept', 'application/json')
+    .set('authorization', `Bearer ${config.TC_ADMIN_TOKEN}`)
+    .then((res) => {
+      if (!_.get(res, 'body.result.success')) {
+        throw new Error(`Failed to get users by handle: ${handles}`);
+      }
+
+      const users = _.get(res, 'body.result.content');
+
+      return users;
+    }).catch((err) => {
+      const errorDetails = _.get(err, 'response.body.result.content.message');
+      throw new Error(
+        `Failed to get users by handles: ${handles}.` +
+        (errorDetails ? ' Server response: ' + errorDetails : '')
+      );
+    });
+};
+
 /**
  * Get topic details
  *
@@ -119,5 +149,6 @@ module.exports = {
   getProject,
   getRoleMembers,
   getUsersById,
+  getUsersByHandle,
   getTopic,
 };