From f631cd3013ef8d699167cdee78f598c919c7fd5c Mon Sep 17 00:00:00 2001 From: Zamitto <167933696+zamitto@users.noreply.github.com> Date: Tue, 30 Jul 2024 15:55:51 -0300 Subject: [PATCH] feat: make getUserFriends throws exception --- src/main/events/user/get-user-friends.ts | 20 +++++--------------- src/main/events/user/get-user.ts | 4 +++- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/main/events/user/get-user-friends.ts b/src/main/events/user/get-user-friends.ts index a9394d95..28783459 100644 --- a/src/main/events/user/get-user-friends.ts +++ b/src/main/events/user/get-user-friends.ts @@ -8,23 +8,13 @@ export const getUserFriends = async ( take: number, skip: number ): Promise => { - try { - const loggedUser = await userAuthRepository.findOne({ where: { id: 1 } }); + const loggedUser = await userAuthRepository.findOne({ where: { id: 1 } }); - if (loggedUser?.userId == userId) { - return HydraApi.get(`/profile/friends`, { take, skip }).catch((_err) => { - return { totalFriends: 0, friends: [] }; - }); - } - - return HydraApi.get(`/user/${userId}/friends`, { take, skip }).catch( - (_err) => { - return { totalFriends: 0, friends: [] }; - } - ); - } catch (err) { - return { totalFriends: 0, friends: [] }; + if (loggedUser?.userId === userId) { + return HydraApi.get(`/profile/friends`, { take, skip }); } + + return HydraApi.get(`/user/${userId}/friends`, { take, skip }); }; const getUserFriendsEvent = async ( diff --git a/src/main/events/user/get-user.ts b/src/main/events/user/get-user.ts index 96a93042..eb4f0619 100644 --- a/src/main/events/user/get-user.ts +++ b/src/main/events/user/get-user.ts @@ -13,7 +13,9 @@ const getUser = async ( try { const [profile, friends] = await Promise.all([ HydraApi.get(`/user/${userId}`), - getUserFriends(userId, 12, 0), + getUserFriends(userId, 12, 0).catch(() => { + return { totalFriends: 0, friends: [] }; + }), ]); const recentGames = await Promise.all(