fix: find users by uuid, allow emply cc, corect cc format

Author: eisbilir

config/default.js

@@ -30,8 +30,7 @@ module.exports = {
 
   TC_API_V3_BASE_URL: process.env.TC_API_V3_BASE_URL || 'http://api.topcoder-dev.com/v3',
   TC_API_V4_BASE_URL: process.env.TC_API_V4_BASE_URL || '',
-  TC_API_V5_BASE_URL: process.env.TC_API_V5_BASE_URL || '',
-  TC_API_V5_USERS_URL: process.env.TC_API_V5_USERS_URL || 'https://api.topcoder-dev.com/v5/users',
+  TC_API_V5_BASE_URL: process.env.TC_API_V5_BASE_URL || 'https://api.topcoder-dev.com/v5',
   API_CONTEXT_PATH: process.env.API_CONTEXT_PATH || '/v5/notifications',
   TC_API_BASE_URL: process.env.TC_API_BASE_URL || '',
 

src/common/tcApiHelper.js

@@ -162,7 +162,7 @@ function* getUsersByEmails(emails) {
  * @param {Array<Object>} ids the objects that has user uuids.
  * @returns {Array<Object>} the matched users
  */
-function* getUsersByUserUUIDs(ids) {
+function* getUsersByUserUUIDs(ids, enrich) {
   if (!ids || ids.length === 0) {
     return [];
   }
@@ -171,7 +171,7 @@ function* getUsersByUserUUIDs(ids) {
   try {
     for (const id of ids) {
       const res = yield request
-      .get(`${config.TC_API_V5_USERS_URL}/${id}`)
+      .get(`${config.TC_API_V5_BASE_URL}/users/${id.userUUID}${enrich ? '?enrich=true' : ''}`)
       .set('Authorization', `Bearer ${token}`);
       const user = res.body;
       logger.verbose(`Searched users: ${JSON.stringify(user, null, 4)}`);
@@ -288,6 +288,7 @@ function* notifyUserViaWeb(message) {
 function* notifyUserViaEmail(message) {
   const notificationType = message.type;
   const topic = constants.BUS_API_EVENT.EMAIL.UNIVERSAL;
+  const cc = _.map(_.filter(message.details.cc, c => !_.isUndefined(c.email)), 'email');
   for (const recipient of message.details.recipients) {
     const userId = recipient.userId;
     let userEmail;
@@ -297,7 +298,7 @@ function* notifyUserViaEmail(message) {
     } else {
       userEmail = recipient.email;
       if (!userEmail) {
-        logger.error(`Email not received for user: ${userId}`);
+        logger.error(`Email not received for user: ${JSON.stringify(recipient, null, 4)}`);
         continue;
       }
     }
@@ -315,7 +316,7 @@ function* notifyUserViaEmail(message) {
     const payload = {
       from: message.details.from,
       recipients,
-      cc: message.details.cc || [],
+      cc,
       data: message.details.data || {},
       sendgrid_template_id: message.details.sendgridTemplateId,
       version: message.details.version,

src/services/UniversalNotificationService.js

@@ -28,7 +28,7 @@ const emailSchema = joi.object().keys({
         userUUID: joi.string().uuid(),
         email: joi.string().email(),
         handle: joi.string(),
-      }).min(1).required()
+      }).min(1)
     ),
     data: joi.object().keys({
       subject: joi.string(),
@@ -74,6 +74,15 @@ function validator(data, schema) {
   return true;
 }
 
+
+/**
+ * Complete missing user fields of given payload details
+ * This function mutates the given details object.
+ * @param {Object} details the object which has recipients array
+ * @param {Boolean} findEmail true if emails are needed
+ * @param {Boolean} findUserId true if userIds are needed
+ * @returns {undefined}
+ */
 function* completeMissingFields(details, findEmail, findUserId) {
   const getFieldsByUserId = [];
   const getFieldsByHandle = [];
@@ -127,20 +136,26 @@ function* completeMissingFields(details, findEmail, findUserId) {
       }
     }
   }
-  const foundUsersByUUID = yield tcApiHelper.getUsersByUserUUIDs(getFieldsByUserUUID);
+  const foundUsersByUUID = yield tcApiHelper.getUsersByUserUUIDs(getFieldsByUserUUID, true);
   if (!_.isEmpty(foundUsersByUUID)) {
     for (const user of getFieldsByUserUUID) {
       const found = _.find(foundUsersByUUID, ['id', user.userUUID]) || {};
       if (!_.isUndefined(found.externalProfiles) && !_.isEmpty(found.externalProfiles)) {
         _.assign(user, { userId: _.toInteger(_.get(found.externalProfiles[0], 'externalId')) });
       }
+      if (!_.isUndefined(found.handle) && _.isUndefined(user.handle)) {
+        _.assign(user, { handle: found.handle });
+      }
     }
+
     if (findEmail) {
       const usersHaveId = _.filter(getFieldsByUserUUID, u => !_.isUndefined(u.userId));
-      const foundUsersById = yield tcApiHelper.getUsersByHandlesAndUserIds([], usersHaveId);
-      if (!_.isEmpty(foundUsersById)) {
+      const usersHaveHandle = _.filter(getFieldsByUserUUID, u => _.isUndefined(u.userId) && !_.isUndefined(u.handle));
+      const foundUser = yield tcApiHelper.getUsersByHandlesAndUserIds(usersHaveHandle, usersHaveId);
+      if (!_.isEmpty(foundUser)) {
         for (const user of getFieldsByUserUUID) {
-          const found = _.find(foundUsersById, ['userId', user.userId]) || {};
+          const found = _.find(foundUser, !_.isUndefined(user.handle)
+            ? ['handle', user.handle] : ['userId', user.userId]) || {};
           if (!_.isUndefined(found.email)) {
             _.assign(user, { email: found.email });
           }
@@ -162,6 +177,7 @@ function* handle(message) {
       switch (data.serviceId) {
         case constants.SETTINGS_EMAIL_SERVICE_ID:
           if (validator(data, emailSchema)) {
+            // find missing emails and userIds
             yield completeMissingFields(data.details, true, true);
             yield tcApiHelper.notifyUserViaEmail(data);
           }
@@ -173,6 +189,7 @@ function* handle(message) {
           break;
         case constants.SETTINGS_WEB_SERVICE_ID:
           if (validator(data, webSchema)) {
+            // find missing userIds
             yield completeMissingFields(data.details, false, true);
             const _notifications = yield tcApiHelper.notifyUserViaWeb(data);
             if (_notifications) {