Chore: upgrade prisma and update referential actions (#1192)

* upgrade Prisma to v4; use nexus-plugin-prisma fork; rename db relations and indexes according to Prisma default convention; fix Nexus scalar typings * add explicit uuid casts to * remove old prisma patches * add a couple of cascade deletes for foreign key relations * fix tests: no more orphaned actions
rage · May 25, 2023 · 2922719 · 2922719
1 parent b598d17
commit 2922719
Show file tree

Hide file tree

Showing 49 changed files with 4,998 additions and 1,431 deletions.
diff --git a/backend/api/routes/completions.ts b/backend/api/routes/completions.ts
@@ -254,20 +254,22 @@ export class CompletionController extends Controller {
     user: User,
   ): Promise<Completion | null> => {
     return (
-      await this.ctx.prisma.user
-        .findUnique({
-          where: {
-            id: user.id,
-          },
-        })
-        .completions({
-          where: {
-            course_id: course.completions_handled_by_id ?? course.id,
-          },
-          orderBy: { created_at: "asc" },
-          take: 1,
-        })
-    )?.[0]
+      (
+        await this.ctx.prisma.user
+          .findUnique({
+            where: {
+              id: user.id,
+            },
+          })
+          .completions({
+            where: {
+              course_id: course.completions_handled_by_id ?? course.id,
+            },
+            orderBy: { created_at: "asc" },
+            take: 1,
+          })
+      )?.[0] ?? null
+    )
   }
 
   recheckCompletion = async (

diff --git a/backend/api/routes/progress.ts b/backend/api/routes/progress.ts
@@ -311,37 +311,39 @@ export class ProgressController extends Controller {
     }
 
     logger.info("Querying existing progresses and completions")
-    const beforeParentProgresses = await prisma.course
-      .findUnique({
-        where: {
-          id: BAIParentCourse,
-        },
-      })
-      .user_course_progresses({
-        distinct: ["user_id"],
-        orderBy: {
-          created_at: "asc",
-        },
-        include: {
-          user: true,
-        },
-      })
+    const beforeParentProgresses =
+      (await prisma.course
+        .findUnique({
+          where: {
+            id: BAIParentCourse,
+          },
+        })
+        .user_course_progresses({
+          distinct: ["user_id"],
+          orderBy: {
+            created_at: "asc",
+          },
+          include: {
+            user: true,
+          },
+        })) ?? []
 
-    const beforeCompletions = await prisma.course
-      .findUnique({
-        where: {
-          id: BAIParentCourse,
-        },
-      })
-      .completions({
-        distinct: ["user_id"],
-        orderBy: {
-          created_at: "asc",
-        },
-        include: {
-          user: true,
-        },
-      })
+    const beforeCompletions =
+      (await prisma.course
+        .findUnique({
+          where: {
+            id: BAIParentCourse,
+          },
+        })
+        .completions({
+          distinct: ["user_id"],
+          orderBy: {
+            created_at: "asc",
+          },
+          include: {
+            user: true,
+          },
+        })) ?? []
 
     const getUsers = (arr: Array<object & { user: User | null }>) =>
       arr?.map((e) => e.user).filter(notEmpty) ?? []
@@ -418,19 +420,20 @@ export class ProgressController extends Controller {
       advancedBAICourse,
     ]) {
       logger.info(`Handling ${course.slug}`)
-      const userCourseProgresses = await prisma.course
-        .findUnique({
-          where: {
-            id: course.id,
-          },
-        })
-        .user_course_progresses({
-          distinct: ["user_id"],
-          orderBy: { created_at: "asc" },
-          include: {
-            user: true,
-          },
-        })
+      const userCourseProgresses =
+        (await prisma.course
+          .findUnique({
+            where: {
+              id: course.id,
+            },
+          })
+          .user_course_progresses({
+            distinct: ["user_id"],
+            orderBy: { created_at: "asc" },
+            include: {
+              user: true,
+            },
+          })) ?? []
 
       if (userCourseProgresses.length) {
         logger.info(
@@ -479,37 +482,39 @@ export class ProgressController extends Controller {
     }
 
     logger.info("Querying updated progresses and completions")
-    const afterParentProgresses = await prisma.course
-      .findUnique({
-        where: {
-          id: BAIParentCourse,
-        },
-      })
-      .user_course_progresses({
-        distinct: ["user_id"],
-        orderBy: {
-          created_at: "asc",
-        },
-        include: {
-          user: true,
-        },
-      })
+    const afterParentProgresses =
+      (await prisma.course
+        .findUnique({
+          where: {
+            id: BAIParentCourse,
+          },
+        })
+        .user_course_progresses({
+          distinct: ["user_id"],
+          orderBy: {
+            created_at: "asc",
+          },
+          include: {
+            user: true,
+          },
+        })) ?? []
 
-    const afterCompletions = await prisma.course
-      .findUnique({
-        where: {
-          id: BAIParentCourse,
-        },
-      })
-      .completions({
-        distinct: ["user_id"],
-        orderBy: {
-          created_at: "asc",
-        },
-        include: {
-          user: true,
-        },
-      })
+    const afterCompletions =
+      (await prisma.course
+        .findUnique({
+          where: {
+            id: BAIParentCourse,
+          },
+        })
+        .completions({
+          distinct: ["user_id"],
+          orderBy: {
+            created_at: "asc",
+          },
+          include: {
+            user: true,
+          },
+        })) ?? []
 
     const result = {
       progresses: {

diff --git a/backend/api/routes/storedData.ts b/backend/api/routes/storedData.ts
@@ -38,9 +38,9 @@ export class StoredDataController extends Controller {
     try {
       const existingStoredData = await prisma.storedData.findUnique({
         where: {
-          user_id_course_id: {
-            user_id: user.id,
+          course_id_user_id: {
             course_id: course.id,
+            user_id: user.id,
           },
         },
       })
@@ -59,9 +59,9 @@ export class StoredDataController extends Controller {
 
       await prisma.storedData.update({
         where: {
-          user_id_course_id: {
-            user_id: user.id,
+          course_id_user_id: {
             course_id: course.id,
+            user_id: user.id,
           },
         },
         data: {
@@ -98,25 +98,26 @@ export class StoredDataController extends Controller {
       return ownershipResult.error
     }
 
-    const storedData = await prisma.course
-      .findUnique({
-        where: { id: course.id },
-      })
-      .stored_data({
-        include: {
-          user: {
-            include: {
-              completions: {
-                where: {
-                  course_id: course.completions_handled_by_id ?? course.id,
+    const storedData =
+      (await prisma.course
+        .findUnique({
+          where: { id: course.id },
+        })
+        .stored_data({
+          include: {
+            user: {
+              include: {
+                completions: {
+                  where: {
+                    course_id: course.completions_handled_by_id ?? course.id,
+                  },
+                  orderBy: { created_at: "asc" },
+                  take: 1,
                 },
-                orderBy: { created_at: "asc" },
-                take: 1,
               },
             },
           },
-        },
-      })
+        })) ?? []
 
     const mappedStoredData = storedData.map((data) => ({
       user: omit(data.user, "completions"),

diff --git a/backend/bin/fetchUserAppDatum.ts b/backend/bin/fetchUserAppDatum.ts
@@ -1,6 +1,6 @@
 import { DateTime } from "luxon"
 
-import { Course, PrismaClient, UserCourseSetting } from "@prisma/client"
+import { Course, Prisma, PrismaClient, UserCourseSetting } from "@prisma/client"
 
 import { CONFIG_NAME } from "../config"
 import { UserInfo } from "../domain/UserInfo"
@@ -212,7 +212,7 @@ const saveCourseVariant = async (p: any) => {
 }
 
 const saveOther = async (p: any) => {
-  const other: any = old.other ?? {}
+  const other = (old.other as Prisma.JsonObject) ?? {}
   if (p.value == "t") {
     p.value = true
   } else if (p.value == "f") {

diff --git a/backend/bin/importOrganizations.ts b/backend/bin/importOrganizations.ts
@@ -71,11 +71,12 @@ const upsertOrganization = async (org: OrganizationInfo) => {
     information: org.information,
     organization: { connect: { id: organization.id } },
   }
-  const organizationTranslations = await prisma.organization
-    .findUnique({ where: { id: organization.id } })
-    .organization_translations({
-      where: { language: translationDetails.language },
-    })
+  const organizationTranslations =
+    (await prisma.organization
+      .findUnique({ where: { id: organization.id } })
+      .organization_translations({
+        where: { language: translationDetails.language },
+      })) ?? []
   const organizationTranslationId = organizationTranslations.length
     ? organizationTranslations[0].id
     : null

diff --git a/backend/bin/kafkaConsumer/common/EmailTemplater/templates/CourseStats.ts b/backend/bin/kafkaConsumer/common/EmailTemplater/templates/CourseStats.ts
@@ -24,7 +24,7 @@ export class StartedCourseCount extends Template {
         const conditions = [
           Prisma.sql`course_id = ${
             course.inherit_settings_from_id ?? course.id
-          }`,
+          }::uuid`,
         ]
         if (courseInstanceLanguage) {
           conditions.push(Prisma.sql`language = ${courseInstanceLanguage}`)
@@ -74,7 +74,7 @@ export class CompletedCourseCount extends Template {
         const conditions = [
           Prisma.sql`course_id = ${
             course.completions_handled_by_id ?? course.id
-          }`,
+          }::uuid`,
         ]
         if (completionLanguage) {
           conditions.push(
@@ -124,7 +124,7 @@ export class AtLeastOneExerciseCount extends Template {
               COUNT(DISTINCT user_id)
             FROM exercise_completion ec
             JOIN exercise e ON ec.exercise_id = e.id
-            WHERE course_id = ${course.id}
+            WHERE course_id = ${course.id}::uuid
             AND attempted = true;
           `
         )?.[0]?.count
@@ -173,7 +173,7 @@ export class AtLeastOneExerciseButNotCompletedEmails extends Template {
         const conditions = [
           Prisma.sql`course_id = ${
             course.completions_handled_by_id ?? course.id
-          }`,
+          }::uuid`,
           Prisma.sql`user_id IS NOT NULL`,
         ]
         if (completionLanguage) {
@@ -191,7 +191,7 @@ export class AtLeastOneExerciseButNotCompletedEmails extends Template {
               JOIN exercise e ON ec.exercise_id = e.id
               JOIN "user" u ON ec.user_id = u.id
               WHERE 
-                e.course_id = ${course.id} 
+                e.course_id = ${course.id}::uuid
               AND
                 ec.attempted = true
               AND