small fixes

This commit is contained in:
Laurin
2022-06-05 21:08:22 +02:00
parent 1d2794c75c
commit d0a1d4a2f1
3 changed files with 29 additions and 19 deletions
+1 -1
View File
@@ -27,7 +27,7 @@ export const getAllAdmins = async (req: Request, res: Response) => {
}
// TODO: Add exception handling
const users = await prisma.admin.findMany({ select: { pid: true, name: true, permission_level: true } });
const users = await prisma.admin.findMany({ select: { pid: true, name: true, permission_level: true, groups: { select: { pid: true } } } });
res.status(200).json({
type: "success",
+11 -2
View File
@@ -25,10 +25,19 @@ const updateGroupBody = z
const basicGroup = {
pid: true,
name: true,
level: true,
organisation: { select: { pid: true, name: true } },
} as const;
const detailedGroup = {
pid: true,
name: true,
level: true,
user_limit: true,
organisation: { select: { pid: true, name: true } },
participants: { select: { pid: true, firstName: true, lastName: true } },
admins: { select: { pid: true, name: true } },
}
export const _getAllGroups = async (res: Response, organisationId: string | undefined) => {
const groups = await prisma.group.findMany({
where: { organisation: { pid: organisationId } },
@@ -164,7 +173,7 @@ export const updateGroup = async (req: Request<{ pid: string }>, res: Response)
user_limit: body.user_limit,
level: body.level,
},
select: basicGroup,
select: detailedGroup,
});
res.status(200).json({
+2 -1
View File
@@ -85,9 +85,10 @@ export const updateTeam = async (req: Request, res: Response) => {
discipline: { connect: { pid: body.disciplineId } },
leaderEmail: body.leaderEmail,
},
select: basicTeam,
});
res.status(204).json({ type: "success", payload: { team } });
res.status(200).json({ type: "success", payload: { team } });
} catch (e) {
if (e instanceof Prisma.PrismaClientKnownRequestError && e.code === "P2025") {
throw new NotFoundError("team", pid);