Merge branch 'main' into feat/use-sse-instead-of-ws

Author: aster-void

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",
       },
     },

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"]

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 {

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");
 });

server/src/database/requests.ts

@@ -116,7 +116,6 @@ export async function getPendingRequestsToUser(
         include: {
           course: {
             include: {
-              enrollments: true,
               slots: true,
             },
           },

server/src/database/users.ts

@@ -31,7 +31,6 @@ export async function getUser(guid: GUID): Promise<UserWithCoursesAndSubjects> {
         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,
             },
           },