include email in the response of helper method

Author: eisbilir

src/common/helper.js

@@ -176,26 +176,30 @@ async function getMemberById (id) {
  * @param {String} handle The member handle
  * @returns {Promise<void>}
  */
-async function getMemberIdByHandle (handle) {
+async function getMemberDetailsByHandle (handle) {
   try {
     // logger.warn(`getMemberIdByHandle ${handle}`)
     const profile = await MemberProfile.query('handleLower').eq(_.toLower(handle)).exec().then(r => r[0])
-    return profile.userId
+    return { memberId: profile.userId, email: profile.email }
   } catch (e) {
     // fall back to v3 api...
-    logger.warn(`Get MemberID by Handle from Dynamo Failed, trying v3 Members API. Error: ${JSON.stringify(e)}`)
-    return getMemberIdByHandleFromV3Members(handle)
+    logger.warn(`Get Member by Handle from Dynamo Failed, trying v3 Members API. Error: ${JSON.stringify(e)}`)
+    return getMemberDetailsByHandleFromV3Members(handle)
   }
 }
 
-async function getMemberIdByHandleFromV3Members (handle) {
+async function getMemberDetailsByHandleFromV3Members (handle) {
   let memberId
+  let email
   try {
-    logger.warn(`getMemberIdByHandle ${handle} from v5`)
+    logger.warn(`getMemberByHandle ${handle} from v5`)
     const res = await getRequest(`${config.MEMBER_API_URL}/${handle}`)
     if (_.get(res, 'body.userId')) {
       memberId = String(res.body.userId)
     }
+    if (_.get(res, 'body.email')) {
+      email = String(res.body.email)
+    }
     // handle return from v3 API, handle and memberHandle are the same under case-insensitive condition
     handle = _.get(res, 'body.handle')
   } catch (error) {
@@ -209,7 +213,7 @@ async function getMemberIdByHandleFromV3Members (handle) {
     throw new errors.BadRequestError(`User with handle: ${handle} doesn't exist`)
   }
 
-  return memberId
+  return { memberId, email }
 }
 
 /**
@@ -481,7 +485,7 @@ module.exports = {
   wrapExpress,
   autoWrapExpress,
   getMemberInfoById,
-  getMemberIdByHandle,
+  getMemberDetailsByHandle,
   checkIfExists,
   hasAdminRole,
   getById,

src/models/MemberProfile.js

@@ -23,6 +23,9 @@ const schema = new Schema({
       name: 'handleLower-index',
       project: true
     }
+  },
+  email: {
+    type: String
   }
 },
 {

src/services/ResourceService.js

@@ -245,7 +245,7 @@ async function init (currentUser, challengeId, resource, isCreated) {
 
   // get member information using v3 API
   const handle = resource.memberHandle
-  const memberId = await helper.getMemberIdByHandle(resource.memberHandle)
+  const { memberId, email } = await helper.getMemberDetailsByHandle(resource.memberHandle)
 
   // check if the resource is reviewer role and has already made a submission in the challenge
   if (resource.roleId === config.REVIEWER_RESOURCE_ROLE_ID || resource.roleId === config.ITERATIVE_REVIEWER_RESOURCE_ROLE_ID) {
@@ -284,11 +284,11 @@ async function init (currentUser, challengeId, resource, isCreated) {
   }
   // skip phase dependency checks for tasks
   if (_.get(challenge, 'task.isTask', false)) {
-    return { resources, memberId, handle }
+    return { resources, memberId, handle, email, challenge }
   }
   // bypass phase dependency checks if the caller is an m2m/admin
   if (currentUser.isMachine || helper.hasAdminRole(currentUser)) {
-    return { resources, memberId, handle }
+    return { resources, memberId, handle, email, challenge }
   }
   // check phases dependencies
   const dependencies = await ResourceRolePhaseDependencyService.getDependencies({ resourceRoleId: resource.roleId })
@@ -316,7 +316,7 @@ async function init (currentUser, challengeId, resource, isCreated) {
   })
 
   // return resources and the member id
-  return { resources, memberId, handle }
+  return { resources, memberId, handle, email, challenge }
 }
 
 /**