fix(proaws): safely parse user in module progress getter

badass-courses · May 13, 2024 · a67618f · a67618f
1 parent a939e2b
commit a67618f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/.changeset/strange-schools-chew.md b/.changeset/strange-schools-chew.md
@@ -0,0 +1,5 @@
+---
+"@coursebuilder/adapter-drizzle": minor
+---
+
+safely parse user in module progress getter
diff --git a/packages/adapter-drizzle/src/lib/mysql/index.ts b/packages/adapter-drizzle/src/lib/mysql/index.ts
@@ -986,9 +986,6 @@ export function mySqlDrizzleAdapter(
 
 			const user = await client.query.users.findFirst({
 				where: or(eq(users.id, userIdOrEmail), eq(users.email, userIdOrEmail)),
-				with: {
-					roles: true,
-				},
 			})
 
 			if (!user) {
@@ -1002,11 +999,22 @@ export function mySqlDrizzleAdapter(
 				}
 			}
 
-			const parsedUser = userSchema.parse(user)
+			const parsedUser = userSchema.safeParse(user)
+
+			if (!parsedUser.success) {
+				console.error('Error parsing user', parsedUser.error)
+				return {
+					completedLessons: [],
+					nextResource: null,
+					percentCompleted: 0,
+					completedLessonsCount: 0,
+					totalLessonsCount: parsedModuleResources.data.length,
+				}
+			}
 
 			const userProgress = await client.query.resourceProgress.findMany({
 				where: and(
-					eq(resourceProgress.userId, parsedUser.id),
+					eq(resourceProgress.userId, parsedUser.data.id),
 					isNotNull(resourceProgress.completedAt),
 					inArray(
 						resourceProgress.contentResourceId,