add support for memberId for resource API

zhijie · zhijie · commit 66f9a96a746a · 2025-06-23T14:04:29.000+08:00
diff --git a/.DS_Store b/.DS_Store
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
@@ -557,6 +557,7 @@ definitions:
     required:
       - challengeId
       - memberHandle
+      - memberId
       - roleId
     properties:
       challengeId:
@@ -566,6 +567,9 @@ definitions:
       memberHandle:
         type: string
         description: The member handle
+      memberId:
+        type: string
+        description: The member id
       roleId:
         type: string
         format: UUID
diff --git a/mock/mock-challenge-api.js b/mock/mock-challenge-api.js
@@ -55,9 +55,9 @@ const mockChallengeApi = http.createServer((req, res) => {
                 id: 'ae6d0a58-ce7d-4521-8501-b8132b1c0393',
                 roleId: config.SUBMITTER_RESOURCE_ROLE_ID
               }],
-            groups: (challengeId === 'fe6d0a58-ce7d-4521-8501-b8132b1c0394') ? 
-              ['11111111-2222-3333-9999-555555555555', '11111111-2222-3333-9999-555555555557'] : 
-              (challengeId === 'fe6d0a58-ce7d-4521-8501-b8132b1c0391' ? ['11111111-2222-3333-9999-555555555555'] : []),
+            groups: (challengeId === 'fe6d0a58-ce7d-4521-8501-b8132b1c0394')
+              ? ['11111111-2222-3333-9999-555555555555', '11111111-2222-3333-9999-555555555557']
+              : (challengeId === 'fe6d0a58-ce7d-4521-8501-b8132b1c0391' ? ['11111111-2222-3333-9999-555555555555'] : []),
             phases: [{
               phaseId: 'aa5a3f78-79e0-4bf7-93ff-b11e8f5b398b',
               isOpen: true
@@ -110,9 +110,9 @@ const mockChallengeApi = http.createServer((req, res) => {
       if (handle === '123abcx') {
         return send(res, 404, {})
       } else if (Object.keys(userIds).includes(handle.toLowerCase())) {
-        return send(res, 200, { userId: userIds[handle.toLowerCase()], email: '' })
+        return send(res, 200, { userId: userIds[handle.toLowerCase()], email: '', handle })
       }
-      return send(res, 200, { userId: 123456, email: 'test@topcoder.com' })
+      return send(res, 200, { userId: 123456, email: 'test@topcoder.com', handle })
     } else if (req.method === 'GET' && req.url.match(/^\/v5\/groups\/memberGroups.+$/)) {
       const groups = [
         '11111111-2222-3333-9999-555555555555',
diff --git a/src/common/helper.js b/src/common/helper.js
@@ -98,6 +98,16 @@ function getUserHandleOrSub (authUser) {
   return authUser.handle || authUser.sub
 }
 
+/**
+ * Get user id from token
+ *
+ * @param {Object} authUser request auth user
+ * @returns user id
+ */
+function getUserIdFromToken (authUser) {
+  return authUser.userId
+}
+
 /**
  * Check if exists.
  *
@@ -170,20 +180,52 @@ async function getMemberDetailsByHandle (handle) {
       },
       select: {
         userId: true,
+        handle: true,
         email: true
       }
     })
     if (!profile || !profile.userId) {
-      throw new Error('Member profile not found')
+      throw new Error(`Member profile not found for handle: ${handle}`)
     }
-    return { memberId: profile.userId, email: profile.email }
+    return { memberId: profile.userId, email: profile.email, handle }
   } catch (e) {
     // fall back to v3 api...
     logger.warn(`Get Member by Handle from DB Failed, trying v3 Members API. Error: ${JSON.stringify(e)}`)
     return getMemberDetailsByHandleFromV3Members(handle)
   }
 }
 
+/**
+ * Get Data by model id
+ * @param {String} memberId The member id
+ * @returns {Promise<void>}
+ */
+async function getMemberDetailsById (memberId) {
+  if (!memberId) {
+    return null
+  }
+  try {
+    const profile = await prisma.memberProfile.findUnique({
+      where: {
+        userId: memberId
+      },
+      select: {
+        userId: true,
+        handle: true,
+        email: true
+      }
+    })
+    if (!profile || !profile.userId) {
+      throw new Error(`Member profile not found for memberId: ${memberId}`)
+    }
+    return { memberId: profile.userId, email: profile.email }
+  } catch (e) {
+    // fall back to v3 api...
+    logger.warn(`Get Member by Handle from DB Failed, trying v3 Members API. Error: ${JSON.stringify(e)}`)
+    return getMemberDetailsByIdFromMemberApi(memberId)
+  }
+}
+
 async function getMemberDetailsByHandleFromV3Members (handle) {
   let memberId
   let email
@@ -209,7 +251,42 @@ async function getMemberDetailsByHandleFromV3Members (handle) {
     throw new errors.BadRequestError(`User with handle: ${handle} doesn't exist`)
   }
 
-  return { memberId, email }
+  return { memberId, email, handle }
+}
+
+/**
+ * Get member detail by id from member api
+ * @param {String} userId user id
+ * @returns member detail
+ */
+async function getMemberDetailsByIdFromMemberApi (userId) {
+  let memberId
+  let email
+  let handle
+  try {
+    logger.warn(`getMemberByHandle ${handle} from v5`)
+    const res = await getRequest(`${config.MEMBER_API_URL}?userId=${userId}`)
+    if (_.get(res, 'body[0].userId')) {
+      memberId = String(res.body[0].userId)
+    }
+    if (_.get(res, 'body[0].email')) {
+      email = String(res.body[0].email)
+    }
+    if (_.get(res, 'body[0].handle')) {
+      handle = _.get(res, 'body[0].handle')
+    }
+  } catch (error) {
+    // re-throw all error except 404 Not-Founded, BadRequestError should be thrown if 404 occurs
+    if (error.status !== 404) {
+      throw error
+    }
+  }
+
+  if (_.isUndefined(memberId)) {
+    throw new errors.BadRequestError(`User with id: ${userId} doesn't exist`)
+  }
+
+  return { memberId, email, handle }
 }
 
 /**
@@ -222,7 +299,7 @@ async function update (authUser, modelName, dbItem, data) {
   Object.keys(data).forEach((key) => {
     dbItem[key] = data[key]
   })
-  dbItem.updatedBy = getUserHandleOrSub(authUser)
+  dbItem.updatedBy = getUserIdFromToken(authUser)
   dbItem.updatedAt = moment().utc().format()
   const prismaModel = _.camelCase(modelName)
   const ret = await prisma[prismaModel].update({
@@ -454,9 +531,11 @@ module.exports = {
   autoWrapExpress,
   getMemberInfoByIdList,
   getMemberDetailsByHandle,
+  getMemberDetailsById,
   checkIfExists,
   hasAdminRole,
   getUserHandleOrSub,
+  getUserIdFromToken,
   getById,
   update,
   validateDuplicate,
diff --git a/src/services/ResourceRolePhaseDependencyService.js b/src/services/ResourceRolePhaseDependencyService.js
@@ -84,7 +84,7 @@ async function createDependency (authUser, data) {
     let entity = await prisma.resourceRolePhaseDependency.create({
       data: _.assign({
         id: uuid(),
-        createdBy: helper.getUserHandleOrSub(authUser),
+        createdBy: helper.getUserIdFromToken(authUser),
         createdAt: moment().utc().format()
       }, data)
     })
diff --git a/src/services/ResourceRoleService.js b/src/services/ResourceRoleService.js
@@ -79,7 +79,7 @@ async function createResourceRole (authUser, resourceRole) {
       data: _.assign({ id: uuid(),
         nameLower,
         createdAt: moment().utc().format(),
-        createdBy: helper.getUserHandleOrSub(authUser) }, resourceRole)
+        createdBy: helper.getUserIdFromToken(authUser) }, resourceRole)
     })
     const ret = _.pick(entity, payloadFields)
     await helper.postEvent(config.RESOURCE_ROLE_CREATE_TOPIC, ret)
diff --git a/src/services/ResourceService.js b/src/services/ResourceService.js
@@ -242,7 +242,15 @@ async function init (currentUser, challengeId, resource, isCreated) {
 
   const registrationPhase = challenge.phases.find((phase) => phase.name === 'Registration')
   const currentSubmitters = _.filter(allResources, (r) => r.roleId === config.SUBMITTER_RESOURCE_ROLE_ID)
-  const handle = resource.memberHandle
+  let handle = resource.memberHandle
+  const resourceMemberId = resource.memberId
+
+  let memberInfoFromDb = await helper.getMemberDetailsById(resourceMemberId)
+  if (!memberInfoFromDb) {
+    memberInfoFromDb = await helper.getMemberDetailsByHandle(handle)
+  }
+  const { memberId, email } = memberInfoFromDb
+  handle = memberInfoFromDb.handle
   const userResources = allResources.filter((r) => _.toLower(r.memberHandle) === _.toLower(handle))
   // Retrieve the constraint - Allowed Registrants
   if (isCreated && resource.roleId === config.SUBMITTER_RESOURCE_ROLE_ID) {
@@ -257,13 +265,13 @@ async function init (currentUser, challengeId, resource, isCreated) {
       )
     ) {
       throw new errors.ConflictError(
-        `User ${resource.memberHandle} is not allowed to register.`
+        `User ${handle} is not allowed to register.`
       )
     }
     if (!_.get(challenge, 'task.isTask', false) && (_.toLower(challenge.createdBy) === _.toLower(handle) ||
       _.some(userResources, r => r.roleId === config.REVIEWER_RESOURCE_ROLE_ID || r.roleId === config.ITERATIVE_REVIEWER_RESOURCE_ROLE_ID))) {
       throw new errors.BadRequestError(
-        `User ${resource.memberHandle} is not allowed to register.`
+        `User ${handle} is not allowed to register.`
       )
     }
   }
@@ -278,14 +286,12 @@ async function init (currentUser, challengeId, resource, isCreated) {
   const currentUserResources = allResources.filter((r) => _.toString(r.memberId) === _.toString(currentUser.userId))
   const isResourceExist = !_.isUndefined(_.find(userResources, r => r.roleId === resource.roleId))
   if (isCreated && isResourceExist) {
-    throw new errors.ConflictError(`User ${resource.memberHandle} already has resource with roleId: ${resource.roleId} in challenge: ${challengeId}`)
+    throw new errors.ConflictError(`User ${handle} already has resource with roleId: ${resource.roleId} in challenge: ${challengeId}`)
   }
 
   if (!isCreated && !isResourceExist) {
     throw new errors.NotFoundError(`User ${handle} doesn't have resource with roleId: ${resource.roleId} in challenge ${challengeId}`)
   }
-
-  const { memberId, email } = await helper.getMemberDetailsByHandle(handle)
   // check if the resource is reviewer role and has already made a submission in the challenge
   if (isCreated && (resource.roleId === config.REVIEWER_RESOURCE_ROLE_ID || resource.roleId === config.ITERATIVE_REVIEWER_RESOURCE_ROLE_ID)) {
     const submissionsRes = await helper.getRequest(`${config.SUBMISSIONS_API_URL}`, { challengeId: challengeId, perPage: 100, memberId: memberId })
@@ -376,8 +382,9 @@ async function createResource (currentUser, resource) {
     const prismaData = _.assign({
       id: uuid(),
       memberId: _.toString(memberId),
-      createdBy: helper.getUserHandleOrSub(currentUser),
-      createdAt: moment().utc().format()
+      createdBy: _.toString(memberId),
+      createdAt: moment().utc().format(),
+      memberHandle: handle
     }, resource)
     const createdResource = await prisma.resource.create({
       data: prismaData
@@ -436,11 +443,20 @@ async function createResource (currentUser, resource) {
 
 createResource.schema = {
   currentUser: Joi.any(),
-  resource: Joi.object().keys({
-    challengeId: Joi.id(),
-    memberHandle: Joi.string().required(),
-    roleId: Joi.id()
-  }).required()
+  resource: Joi.alternatives().try(
+    Joi.object().keys({
+      challengeId: Joi.id(),
+      memberId: Joi.string(),
+      memberHandle: Joi.string().required(),
+      roleId: Joi.id()
+    }),
+    Joi.object().keys({
+      challengeId: Joi.id(),
+      memberId: Joi.string().required(),
+      memberHandle: Joi.string(),
+      roleId: Joi.id()
+    })
+  )
 }
 
 /**
@@ -483,11 +499,20 @@ async function deleteResource (currentUser, resource) {
 
 deleteResource.schema = {
   currentUser: Joi.any(),
-  resource: Joi.object().keys({
-    challengeId: Joi.id(),
-    memberHandle: Joi.string().required(),
-    roleId: Joi.id()
-  }).required()
+  resource: Joi.alternatives().try(
+    Joi.object().keys({
+      challengeId: Joi.id(),
+      memberId: Joi.string(),
+      memberHandle: Joi.string().required(),
+      roleId: Joi.id()
+    }),
+    Joi.object().keys({
+      challengeId: Joi.id(),
+      memberId: Joi.string().required(),
+      memberHandle: Joi.string(),
+      roleId: Joi.id()
+    })
+  )
 }
 
 /**
diff --git a/test/unit/deleteResource.test.js b/test/unit/deleteResource.test.js
@@ -53,8 +53,8 @@ module.exports = describe('Delete resource', () => {
       await service.deleteResource(user.m2m, entity)
       throw new Error('should not throw error here')
     } catch (err) {
-      should.equal(err.name, 'NotFoundError')
-      assertError(err, `User 123abcx doesn't have resource with roleId: ${observerRoleId} in challenge ${challengeId}`)
+      should.equal(err.name, 'BadRequestError')
+      assertError(err, `User with handle: 123abcx doesn't exist`)
     }
   })
 
@@ -145,7 +145,7 @@ module.exports = describe('Delete resource', () => {
     should.equal(ret.memberHandle.toLowerCase(), 'ghostar')
     should.equal(ret.roleId, submitterRoleId)
     should.exist(ret.created)
-    should.equal(ret.createdBy, user.m2m.sub)
+    should.equal(ret.createdBy, '151743')
   })
 
   it('delete resource by user', async () => {
@@ -163,7 +163,7 @@ module.exports = describe('Delete resource', () => {
     should.equal(ret.memberHandle.toLowerCase(), 'denis')
     should.equal(ret.roleId, submitterRoleId)
     should.exist(ret.created)
-    should.equal(ret.createdBy.toLowerCase(), 'denis')
+    should.equal(ret.createdBy.toLowerCase(), '251280')
   })
 
   it('delete resource by admin', async () => {
@@ -181,7 +181,7 @@ module.exports = describe('Delete resource', () => {
     should.equal(ret.memberHandle.toLowerCase(), 'hohosky')
     should.equal(ret.roleId, copilotRoleId)
     should.exist(ret.created)
-    should.equal(ret.createdBy.toLowerCase(), 'tonyj')
+    should.equal(ret.createdBy.toLowerCase(), '16096823')
   })
 
   it(`delete self obtainable resource by user itself`, async () => {
@@ -199,6 +199,6 @@ module.exports = describe('Delete resource', () => {
     should.equal(ret.memberHandle.toLowerCase(), 'lars2520')
     should.equal(ret.roleId, submitterRoleId)
     should.exist(ret.created)
-    should.equal(ret.createdBy.toLowerCase(), 'lars2520')
+    should.equal(ret.createdBy.toLowerCase(), '287131')
   })
 })
