From c5bd3b27029e1ee0ba48efbb9d6965e39b048330 Mon Sep 17 00:00:00 2001 From: "Kalle (Sendou)" <38327916+Sendouc@users.noreply.github.com> Date: Sun, 24 Jan 2021 20:43:23 +0200 Subject: [PATCH] fix type error --- pages/api/play/teams/index.ts | 9 +++++++-- pages/play/index.tsx | 1 - prisma/queries/getAllLadderRegisteredTeams.ts | 10 ++-------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/pages/api/play/teams/index.ts b/pages/api/play/teams/index.ts index 9f6815705..efd37da45 100644 --- a/pages/api/play/teams/index.ts +++ b/pages/api/play/teams/index.ts @@ -22,9 +22,14 @@ const teamsHandler = async (req: NextApiRequest, res: NextApiResponse) => { async function getHandler(req: NextApiRequest, res: NextApiResponse) { const user = await getMySession(req); - const teams = await getAllLadderRegisteredTeams(user?.id); + const teams = await getAllLadderRegisteredTeams(); - res.status(200).json(teams); + res.status(200).json( + teams.map((team) => ({ + ...team, + inviteCode: team.ownerId === user?.id ? team.inviteCode : undefined, + })) + ); } async function postHandler(req: NextApiRequest, res: NextApiResponse) { diff --git a/pages/play/index.tsx b/pages/play/index.tsx index c5a285db8..54021966f 100644 --- a/pages/play/index.tsx +++ b/pages/play/index.tsx @@ -13,7 +13,6 @@ const PlayPage = () => { const { gray } = useMyTheme(); const { data } = useLadderTeams(); - console.log({ data }); return ( diff --git a/prisma/queries/getAllLadderRegisteredTeams.ts b/prisma/queries/getAllLadderRegisteredTeams.ts index 761428029..5c8644041 100644 --- a/prisma/queries/getAllLadderRegisteredTeams.ts +++ b/prisma/queries/getAllLadderRegisteredTeams.ts @@ -5,8 +5,8 @@ export type GetAllLadderRegisteredTeamsData = Prisma.PromiseReturnType< typeof getAllLadderRegisteredTeams >; -export const getAllLadderRegisteredTeams = async (userId?: number) => { - const teams = await prisma.ladderRegisteredTeam.findMany({ +export const getAllLadderRegisteredTeams = async () => + prisma.ladderRegisteredTeam.findMany({ include: { roster: { select: { @@ -26,9 +26,3 @@ export const getAllLadderRegisteredTeams = async (userId?: number) => { }, }, }); - - return teams.map((team) => ({ - ...team, - inviteCode: team.ownerId === userId ? team.inviteCode : undefined, - })); -};