Skip to content

chore: use v5/members instead of v3/members #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ module.exports = {

TOPCODER_USERS_API: process.env.TOPCODER_USERS_API || 'https://api.topcoder-dev.com/v3/users',
// the api to find topcoder members
TOPCODER_MEMBERS_API: process.env.TOPCODER_MEMBERS_API || 'https://api.topcoder-dev.com/v3/members',
TOPCODER_MEMBERS_API: process.env.TOPCODER_MEMBERS_API || 'https://api.topcoder-dev.com/v5/members',
// rate limit of requests to user api
MAX_PARALLEL_REQUEST_TOPCODER_USERS_API: process.env.MAX_PARALLEL_REQUEST_TOPCODER_USERS_API || 100,

Expand Down
32 changes: 13 additions & 19 deletions src/common/helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -1304,21 +1304,18 @@ async function getMemberDetailsByHandles(handles) {
}
const token = await getM2MToken();
const res = await request
.get(`${config.TOPCODER_MEMBERS_API}/_search`)
.get(`${config.TOPCODER_MEMBERS_API}/`)
.query({
query: _.map(
handles,
(handle) => `handleLower:${handle.toLowerCase()}`
).join(' OR '),
fields: 'userId,handle,firstName,lastName,email',
'handlesLower[]': handles.map(handle => handle.toLowerCase()),
fields: 'userId,handle,handleLower,firstName,lastName,email',
})
.set('Authorization', `Bearer ${token}`)
.set('Accept', 'application/json');
localLogger.debug({
context: 'getMemberDetailsByHandles',
message: `response body: ${JSON.stringify(res.body)}`,
});
return _.get(res.body, 'result.content');
return res.body;
}

/**
Expand All @@ -1327,17 +1324,14 @@ async function getMemberDetailsByHandles(handles) {
* @param {String} handle the user handle
* @returns {Object} the member details
*/
async function getV3MemberDetailsByHandle(handle) {
const token = await getM2MToken();
const res = await request
.get(`${config.TOPCODER_MEMBERS_API}/${handle}`)
.set('Authorization', `Bearer ${token}`)
.set('Accept', 'application/json');
localLogger.debug({
context: 'getV3MemberDetailsByHandle',
message: `response body: ${JSON.stringify(res.body)}`,
});
return _.get(res.body, 'result.content');
async function getMemberDetailsByHandle(handle) {
const [memberDetails] = await getMemberDetailsByHandles([handle])

if (!memberDetails) {
throw new errors.NotFoundError(`Member details are not found by handle "${handle}".`)
}

return memberDetails
}

/**
Expand Down Expand Up @@ -1756,7 +1750,7 @@ module.exports = {
getAuditM2Muser,
checkIsMemberOfProject,
getMemberDetailsByHandles,
getV3MemberDetailsByHandle,
getMemberDetailsByHandle,
getMemberDetailsByEmails,
createProjectMember,
listProjectMembers,
Expand Down
2 changes: 1 addition & 1 deletion src/services/PaymentService.js
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ async function activateChallenge (id, token) {
async function closeChallenge (id, userHandle, token) {
localLogger.info({ context: 'closeChallenge', message: `Closing challenge ${id}` })
try {
const { userId } = await helper.getV3MemberDetailsByHandle(userHandle)
const { userId } = await helper.getMemberDetailsByHandle(userHandle)
const body = {
status: constants.ChallengeStatus.COMPLETED,
winners: [{
Expand Down