diff --git a/bun.lock b/bun.lock index ca198071..0187fe56 100644 --- a/bun.lock +++ b/bun.lock @@ -24,7 +24,7 @@ "version": "1.0.0", "dependencies": { "@hono/zod-validator": "^0.4.3", - "@prisma/client": "^5.20.0", + "@prisma/client": "5.22.0", "common": "workspace:common", "cookie-parser": "^1.4.6", "cors": "^2.8.5", @@ -41,7 +41,7 @@ "@types/cookie-parser": "^1.4.7", "@types/cors": "^2.8.17", "globals": "^15.8.0", - "prisma": "^5.11.0", + "prisma": "5.22.0", "typescript": "^5.4.5", }, }, diff --git a/server/package.json b/server/package.json index 3e4c2865..2f03087d 100644 --- a/server/package.json +++ b/server/package.json @@ -17,7 +17,7 @@ "license": "ISC", "dependencies": { "@hono/zod-validator": "^0.4.3", - "@prisma/client": "^5.20.0", + "@prisma/client": "5.22.0", "common": "workspace:common", "cookie-parser": "^1.4.6", "cors": "^2.8.5", @@ -34,7 +34,7 @@ "@types/cookie-parser": "^1.4.7", "@types/cors": "^2.8.17", "globals": "^15.8.0", - "prisma": "^5.11.0", + "prisma": "5.22.0", "typescript": "^5.4.5" }, "trustedPackages": ["prisma"] diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma index ee2c650f..b1bb051a 100644 --- a/server/prisma/schema.prisma +++ b/server/prisma/schema.prisma @@ -2,7 +2,7 @@ generator client { provider = "prisma-client-js" binaryTargets = ["native", "debian-openssl-3.0.x"] - previewFeatures = ["typedSql"] + previewFeatures = ["typedSql","relationJoins"] } datasource db { diff --git a/server/src/database/client.ts b/server/src/database/client.ts index a447b6f9..7c176ee9 100644 --- a/server/src/database/client.ts +++ b/server/src/database/client.ts @@ -32,5 +32,6 @@ export const prisma = new PrismaClient( prisma.$on("query", (e) => { console.log(format(e.query, { language: "postgresql" })); console.log(`Params: ${e.params}`); + console.log(`Duration: ${e.duration}`); console.log("\n"); }); diff --git a/server/src/database/requests.ts b/server/src/database/requests.ts index c73a3cd0..5efd922a 100644 --- a/server/src/database/requests.ts +++ b/server/src/database/requests.ts @@ -116,7 +116,6 @@ export async function getPendingRequestsToUser( include: { course: { include: { - enrollments: true, slots: true, }, }, diff --git a/server/src/database/users.ts b/server/src/database/users.ts index cdeb58ce..6428a5b3 100644 --- a/server/src/database/users.ts +++ b/server/src/database/users.ts @@ -31,7 +31,6 @@ export async function getUser(guid: GUID): Promise { include: { course: { include: { - enrollments: true, slots: true, }, }, @@ -84,7 +83,6 @@ export async function getUserByID( include: { course: { include: { - enrollments: true, slots: true, }, }, @@ -147,7 +145,6 @@ export async function getAllUsers(): Promise< include: { course: { include: { - enrollments: true, slots: true, }, }, diff --git a/server/src/firebase/auth/lib.ts b/server/src/firebase/auth/lib.ts index fdf4b12b..a7055341 100644 --- a/server/src/firebase/auth/lib.ts +++ b/server/src/firebase/auth/lib.ts @@ -11,7 +11,7 @@ type DecodedIdToken = admin.DecodedIdToken; // THROWS: if idToken is not present in request cookie, or when the token is not valid. export async function getGUID(c: Context): Promise { const idToken = c.req.header("Authorization"); - if (typeof idToken !== "string") error("token not found in query", 401); + if (typeof idToken !== "string") error("token not found in header", 401); return await getGUIDFromToken(idToken); } diff --git a/server/src/index.ts b/server/src/index.ts index 3592a82e..0ca738ec 100644 --- a/server/src/index.ts +++ b/server/src/index.ts @@ -31,6 +31,7 @@ if (corsOptions.origin.length > 1) { const app = new Hono() .onError((err, c) => { if (err instanceof HTTPException) { + console.error(err); c.status(err.status); return c.json({ error: err }); }