From 2fb73cc3a39aa55bf946a572590b86935a38fc6b Mon Sep 17 00:00:00 2001 From: Tiago Ribeiro Date: Thu, 5 Sep 2024 18:54:36 +0100 Subject: [PATCH] ENCOA-166: Increased the probability of this being fixed even more --- src/pages/api/groups/index.ts | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/src/pages/api/groups/index.ts b/src/pages/api/groups/index.ts index 3493c22e..d93dd686 100644 --- a/src/pages/api/groups/index.ts +++ b/src/pages/api/groups/index.ts @@ -30,30 +30,10 @@ async function get(req: NextApiRequest, res: NextApiResponse) { participant: string; }; - if (req.session?.user?.type === "mastercorporate") { - try { - const masterCorporateGroups = await getGroupsForUser(admin, participant); - const participants = uniq(masterCorporateGroups.flatMap((g) => g.participants)); - const corporatesFromMaster = (await Promise.all(participants.map(getUser))).filter((x) => x.type === "corporate"); - - if (corporatesFromMaster.length === 0) return res.status(200).json(masterCorporateGroups); - - const groups = await Promise.all(corporatesFromMaster.map((c) => getGroupsForUser(c.id, participant))); - return res.status(200).json([...masterCorporateGroups, ...uniqBy(groups.flat(), "id")]); - } catch (e) { - console.error(e); - res.status(500).json({ok: false}); - return; - } - } - - try { - const groups = await getGroupsForUser(admin, participant); - res.status(200).json(groups); - } catch (e) { - console.error(e); - res.status(500).json({ok: false}); - } + const adminGroups = await getGroupsForUser(admin, participant); + const participants = uniq(adminGroups.flatMap((g) => g.participants)); + const groups = await Promise.all(participants.map(async (c) => await getGroupsForUser(c, participant))); + return res.status(200).json([...adminGroups, ...uniqBy(groups.flat(), "id")]); } async function post(req: NextApiRequest, res: NextApiResponse) {