From c8019b189a71fafc783b7a4df0d292531a20543c Mon Sep 17 00:00:00 2001 From: yoution Date: Fri, 13 Aug 2021 09:21:35 +0800 Subject: [PATCH] fix: issue topcoder-platform/taas-app#475 --- src/services/TeamService.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/services/TeamService.js b/src/services/TeamService.js index 55bae9bd..c2d43f3d 100644 --- a/src/services/TeamService.js +++ b/src/services/TeamService.js @@ -794,7 +794,7 @@ async function getRoleBySkills (skills) { raw: true } let roles = await Role.findAll(queryCriteria) - roles = _.filter(roles, role => _.find(role.rates, r => r.global)) + roles = _.filter(roles, role => _.find(role.rates, r => r.global && r.rate20Global && r.rate30Global)) if (roles.length > 0) { let result = _.each(roles, role => { // role matched skills list @@ -813,7 +813,10 @@ async function getRoleBySkills (skills) { } } // if no matching role found then return Custom role or empty object - return await Role.findOne({ where: { name: { [Op.iLike]: 'Custom' } }, raw: true }) || {} + const customRole = await Role.findOne({ where: { name: { [Op.iLike]: 'Custom' } }, raw: true }) || {} + customRole.rates[0].rate20Global = customRole.rates[0].global * 0.75 + customRole.rates[0].rate30Global = customRole.rates[0].global * 0.5 + return customRole } getRoleBySkills.schema = Joi.object()