upgrade to prisma 6 (#2486)

Doenet · Dec 9, 2024 · faea621 · faea621
1 parent 506ca03
commit faea621
Show file tree

Hide file tree

Showing 9 changed files with 395 additions and 334 deletions.
diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@aws-sdk/client-ses": "^3.629.0",
-    "@prisma/client": "^5.18.0",
+    "@prisma/client": "^6.0.1",
     "@quixo3/prisma-session-store": "^3.1.13",
     "cookie-parser": "^1.4.6",
     "dotenv": "^16.4.5",
@@ -46,7 +46,7 @@
     "globals": "^15.9.0",
     "nodemon": "^3.1.4",
     "prettier": "^3.3.3",
-    "prisma": "^5.18.0",
+    "prisma": "^6.0.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.5.4",
     "typescript-eslint": "^8.1.0",

diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma
@@ -1,6 +1,5 @@
 generator client {
-  provider        = "prisma-client-js"
-  previewFeatures = ["fullTextIndex"]
+  provider = "prisma-client-js"
 }
 
 datasource db {

diff --git a/server/src/index.ts b/server/src/index.ts
@@ -105,6 +105,7 @@ import {
   assignmentStudentDataConvertUUID,
   allAssignmentScoresConvertUUID,
   studentDataConvertUUID,
+  isEqualUUID,
 } from "./utils/uuid";
 import { LicenseCode, UserInfo } from "./types";
 
@@ -1058,7 +1059,7 @@ app.get(
 );
 
 app.get("/api/searchSharedContent", async (req: Request, res: Response) => {
-  const loggedInUserId = req.user?.userId ?? Buffer.alloc(16);
+  const loggedInUserId = req.user?.userId ?? new Uint8Array(16);
   const query = req.query.q as string;
   res.send({
     users: (await searchUsersWithSharedContent(query, loggedInUserId)).map(
@@ -1105,7 +1106,7 @@ app.post(
 app.get(
   "/api/loadPromotedContent",
   async (req: Request, res: Response, next: NextFunction) => {
-    const loggedInUserId = req.user?.userId ?? Buffer.alloc(16);
+    const loggedInUserId = req.user?.userId ?? new Uint8Array(16);
 
     try {
       const content = await loadPromotedContent(loggedInUserId);
@@ -1304,7 +1305,7 @@ app.post(
 app.get(
   "/api/getActivityEditorData/:activityId",
   async (req: Request, res: Response, next: NextFunction) => {
-    const loggedInUserId = req.user?.userId ?? Buffer.alloc(16);
+    const loggedInUserId = req.user?.userId ?? new Uint8Array(16);
     const activityId = toUUID(req.params.activityId);
     try {
       const editorData = await getActivityEditorData(
@@ -1331,7 +1332,7 @@ app.get(
 app.get(
   "/api/getSharedEditorData/:activityId",
   async (req: Request, res: Response, next: NextFunction) => {
-    const loggedInUserId = req.user?.userId ?? Buffer.alloc(16);
+    const loggedInUserId = req.user?.userId ?? new Uint8Array(16);
     const activityId = toUUID(req.params.activityId);
     try {
       const editorData = await getSharedEditorData(activityId, loggedInUserId);
@@ -1352,7 +1353,7 @@ app.get(
 app.get(
   "/api/getDocumentSource/:docId",
   async (req: Request, res: Response, next: NextFunction) => {
-    const loggedInUserId = req.user?.userId ?? Buffer.alloc(16);
+    const loggedInUserId = req.user?.userId ?? new Uint8Array(16);
     const docId = toUUID(req.params.docId);
     try {
       const sourceData = await getDocumentSource(docId, loggedInUserId);
@@ -1383,7 +1384,7 @@ app.get("/api/getAllLicenses", async (_req: Request, res: Response) => {
 app.get(
   "/api/getActivityViewerData/:activityId",
   async (req: Request, res: Response, next: NextFunction) => {
-    const loggedInUserId = req.user?.userId ?? Buffer.alloc(16);
+    const loggedInUserId = req.user?.userId ?? new Uint8Array(16);
     const activityId = toUUID(req.params.activityId);
 
     try {
@@ -1409,7 +1410,7 @@ app.get(
 app.get(
   "/api/getContributorHistory/:activityId",
   async (req: Request, res: Response, next: NextFunction) => {
-    const loggedInUserId = req.user?.userId ?? Buffer.alloc(16);
+    const loggedInUserId = req.user?.userId ?? new Uint8Array(16);
     const activityId = toUUID(req.params.activityId);
 
     try {
@@ -1435,7 +1436,7 @@ app.get(
 app.get(
   "/api/getRemixes/:activityId",
   async (req: Request, res: Response, next: NextFunction) => {
-    const loggedInUserId = req.user?.userId ?? Buffer.alloc(16);
+    const loggedInUserId = req.user?.userId ?? new Uint8Array(16);
     const activityId = toUUID(req.params.activityId);
 
     try {
@@ -2166,7 +2167,7 @@ app.get(
     const ownerId = toUUID(req.params.ownerId);
     const loggedInUserId = req.user?.userId;
 
-    if (!loggedInUserId || !ownerId.equals(loggedInUserId)) {
+    if (!loggedInUserId || !isEqualUUID(ownerId, loggedInUserId)) {
       return res.send({ notMe: true });
     }
 
@@ -2203,7 +2204,7 @@ app.get(
     const folderId = toUUID(req.params.folderId);
     const loggedInUserId = req.user?.userId;
 
-    if (!loggedInUserId || !ownerId.equals(loggedInUserId)) {
+    if (!loggedInUserId || !isEqualUUID(ownerId, loggedInUserId)) {
       return res.send({ notMe: true });
     }
 
@@ -2243,7 +2244,7 @@ app.get(
     const ownerId = toUUID(req.params.ownerId);
     const query = req.query.q as string;
 
-    if (!loggedInUserId || !ownerId.equals(loggedInUserId)) {
+    if (!loggedInUserId || !isEqualUUID(ownerId, loggedInUserId)) {
       return res.send({ notMe: true });
     }
 
@@ -2289,7 +2290,7 @@ app.get(
     const folderId = toUUID(req.params.folderId);
     const query = req.query.q as string;
 
-    if (!loggedInUserId || !ownerId.equals(loggedInUserId)) {
+    if (!loggedInUserId || !isEqualUUID(ownerId, loggedInUserId)) {
       return res.send({ notMe: true });
     }
 
@@ -2323,7 +2324,7 @@ app.get(
   "/api/getSharedFolderContent/:ownerId",
   async (req: Request, res: Response, next: NextFunction) => {
     const ownerId = toUUID(req.params.ownerId);
-    const loggedInUserId = req.user?.userId ?? Buffer.alloc(16);
+    const loggedInUserId = req.user?.userId ?? new Uint8Array(16);
     try {
       const contentData = await getSharedFolderContent({
         ownerId,
@@ -2352,7 +2353,7 @@ app.get(
   async (req: Request, res: Response, next: NextFunction) => {
     const ownerId = toUUID(req.params.ownerId);
     const folderId = toUUID(req.params.folderId);
-    const loggedInUserId = req.user?.userId ?? Buffer.alloc(16);
+    const loggedInUserId = req.user?.userId ?? new Uint8Array(16);
     try {
       const contentData = await getSharedFolderContent({
         ownerId,
@@ -2444,7 +2445,7 @@ app.get(
   async (req: Request, res: Response, next: NextFunction) => {
     try {
       const activityId = toUUID(req.body.activityId);
-      const loggedInUserId = req.user?.userId ?? Buffer.alloc(16);
+      const loggedInUserId = req.user?.userId ?? new Uint8Array(16);
       const classifications = await getClassifications(
         activityId,
         loggedInUserId,