diff --git a/server/routes/user/GetUser.js b/server/routes/user/GetUser.js index 5301be9..cacc8ba 100644 --- a/server/routes/user/GetUser.js +++ b/server/routes/user/GetUser.js @@ -6,13 +6,16 @@ const getUserLevel = require('../../utils/getUserLevel'); async function GetUser(req, res) { const { username } = req.params; - const cachedUser = await User.findOne({ username }).select([ - 'username', - 'email', - 'points', - ]); + const cachedUser = await User.findOne({ username }); - if (cachedUser) return res.send({ user: cachedUser }); + if (cachedUser) return res.send({ + user: { + username: cachedUser.username, + email: cachedUser.email, + points: cachedUser.points, + level: getUserLevel(cachedUser.points), + } + }); const { success, user } = await createRequest('get', `/users/${username}`); @@ -25,7 +28,7 @@ async function GetUser(req, res) { email: newUser.email, points: newUser.points, level: getUserLevel(newUser.points), - }, + } }); } diff --git a/server/utils/getUserLevel.js b/server/utils/getUserLevel.js index d6be97b..dbbb9b2 100644 --- a/server/utils/getUserLevel.js +++ b/server/utils/getUserLevel.js @@ -1,22 +1,20 @@ function getUserLevel(points) { - switch (points) { - case points > 10000: - return 7; - case points > 3000: - return 6; - case points > 1000: - return 5; - case points > 125: - return 4; - case points > 50: - return 3; - case points > 15: - return 2; - case points > 0: - return 1; - default: - return 0; - } + if (points > 10000) + return 7; + else if (points > 3000) + return 6; + else if (points > 1000) + return 5; + else if (points > 125) + return 4; + else if (points > 50) + return 3; + else if (points > 15) + return 2; + else if (points > 0) + return 1; + else + return 0; } module.exports = getUserLevel;