@coursebuilder/adapter-drizzle 0.3.0 → 0.5.0

package/src/lib/mysql/index.ts

@@ -3,6 +3,7 @@ import { addSeconds, isAfter } from 'date-fns'
 import {
 	and,
 	asc,
+	count,
 	desc,
 	eq,
 	gte,
@@ -52,6 +53,8 @@ import {
 import {
 	ContentResourceResourceSchema,
 	ContentResourceSchema,
+	type ContentResource,
+	type ContentResourceResource,
 } from '@coursebuilder/core/schemas/content-resource-schema'
 import { merchantAccountSchema } from '@coursebuilder/core/schemas/merchant-account-schema'
 import { merchantCustomerSchema } from '@coursebuilder/core/schemas/merchant-customer-schema'
@@ -64,6 +67,14 @@ import {
 	getAccountsRelationsSchema,
 	getAccountsSchema,
 } from './schemas/auth/accounts.js'
+import {
+	getDeviceAccessTokenRelationsSchema,
+	getDeviceAccessTokenSchema,
+} from './schemas/auth/device-access-token.js'
+import {
+	getDeviceVerificationRelationsSchema,
+	getDeviceVerificationSchema,
+} from './schemas/auth/device-verification.js'
 import {
 	getPermissionsRelationsSchema,
 	getPermissionsSchema,
@@ -84,6 +95,10 @@ import {
 	getUserPermissionsRelationsSchema,
 	getUserPermissionsSchema,
 } from './schemas/auth/user-permissions.js'
+import {
+	getUserPrefsRelationsSchema,
+	getUserPrefsSchema,
+} from './schemas/auth/user-prefs.js'
 import {
 	getUserRolesRelationsSchema,
 	getUserRolesSchema,
@@ -124,6 +139,10 @@ import {
 	getUpgradableProductsRelationsSchema,
 	getUpgradableProductsSchema,
 } from './schemas/commerce/upgradable-products.js'
+import {
+	getCommentRelationsSchema,
+	getCommentsSchema,
+} from './schemas/communication/comment.js'
 import { getCommunicationChannelSchema } from './schemas/communication/communication-channel.js'
 import { getCommunicationPreferenceTypesSchema } from './schemas/communication/communication-preference-types.js'
 import {
@@ -150,6 +169,7 @@ import {
 	getContributionTypesRelationsSchema,
 	getContributionTypesSchema,
 } from './schemas/content/contribution-types.js'
+import { getLessonProgressSchema } from './schemas/content/lesson-progress.js'
 import { getResourceProgressSchema } from './schemas/content/resource-progress.js'
 
 export function getCourseBuilderSchema(mysqlTable: MySqlTableFn) {
@@ -173,6 +193,7 @@ export function getCourseBuilderSchema(mysqlTable: MySqlTableFn) {
 		verificationTokens: getVerificationTokensSchema(mysqlTable),
 		coupon: getCouponSchema(mysqlTable),
 		couponRelations: getCouponRelationsSchema(mysqlTable),
+		lessonProgress: getLessonProgressSchema(mysqlTable),
 		merchantAccount: getMerchantAccountSchema(mysqlTable),
 		merchantCharge: getMerchantChargeSchema(mysqlTable),
 		merchantChargeRelations: getMerchantChargeRelationsSchema(mysqlTable),
@@ -212,6 +233,15 @@ export function getCourseBuilderSchema(mysqlTable: MySqlTableFn) {
 		contentResourceProductRelations:
 			getContentResourceProductRelationsSchema(mysqlTable),
 		productRelations: getProductRelationsSchema(mysqlTable),
+		comments: getCommentsSchema(mysqlTable),
+		commentsRelations: getCommentRelationsSchema(mysqlTable),
+		deviceVerifications: getDeviceVerificationSchema(mysqlTable),
+		deviceVerificationRelations:
+			getDeviceVerificationRelationsSchema(mysqlTable),
+		deviceAccessToken: getDeviceAccessTokenSchema(mysqlTable),
+		deviceAccessTokenRelations: getDeviceAccessTokenRelationsSchema(mysqlTable),
+		userPrefs: getUserPrefsSchema(mysqlTable),
+		userPrefsRelations: getUserPrefsRelationsSchema(mysqlTable),
 	} as const
 }
 
@@ -246,6 +276,7 @@ export function mySqlDrizzleAdapter(
 		products,
 		upgradableProducts,
 		resourceProgress,
+		comments,
 	} = createTables(tableFn)
 
 	const adapter: CourseBuilderAdapter = {
@@ -461,7 +492,7 @@ export function mySqlDrizzleAdapter(
 			let lessonProgress = await client.query.resourceProgress.findFirst({
 				where: and(
 					eq(resourceProgress.userId, options.userId),
-					eq(resourceProgress.contentResourceId, options.lessonId),
+					eq(resourceProgress.resourceId, options.lessonId),
 				),
 			})
 
@@ -475,12 +506,12 @@ export function mySqlDrizzleAdapter(
 							completedAt: now,
 							updatedAt: now,
 						})
-						.where(eq(resourceProgress.contentResourceId, options.lessonId))
+						.where(eq(resourceProgress.resourceId, options.lessonId))
 				}
 			} else {
 				await client.insert(resourceProgress).values({
 					userId: options.userId,
-					contentResourceId: options.lessonId,
+					resourceId: options.lessonId,
 					completedAt: now,
 					updatedAt: now,
 				})
@@ -488,7 +519,7 @@ export function mySqlDrizzleAdapter(
 			lessonProgress = await client.query.resourceProgress.findFirst({
 				where: and(
 					eq(resourceProgress.userId, options.userId),
-					eq(resourceProgress.contentResourceId, options.lessonId),
+					eq(resourceProgress.resourceId, options.lessonId),
 				),
 			})
 			const parsedLessonProgress =
@@ -530,11 +561,21 @@ export function mySqlDrizzleAdapter(
 
 			if (!couponForIdOrCode) return null
 
-			return couponSchema
+			const parsedCoupon = couponSchema
 				.extend({
 					merchantCoupon: merchantCouponSchema,
 				})
-				.parse(couponForIdOrCode)
+				.safeParse(couponForIdOrCode)
+
+			if (!parsedCoupon.success) {
+				console.error(
+					'Error parsing coupon',
+					JSON.stringify(parsedCoupon.error),
+				)
+				return null
+			}
+
+			return parsedCoupon.data
 		},
 		async createMerchantChargeAndPurchase(options): Promise<Purchase> {
 			const purchaseId = await client.transaction(async (trx) => {
@@ -620,7 +661,7 @@ export function mySqlDrizzleAdapter(
 								),
 							)
 							.then((res) => {
-								return res[0]?.coupons ?? null
+								return res[0]?.Coupon ?? null
 							}),
 					)
 
@@ -816,15 +857,17 @@ export function mySqlDrizzleAdapter(
 			}
 		},
 		async getCoupon(couponIdOrCode: string): Promise<Coupon | null> {
-			return couponSchema.nullable().parse(
-				await client
-					.select()
-					.from(coupon)
-					.where(
-						or(eq(coupon.id, couponIdOrCode), eq(coupon.code, couponIdOrCode)),
-					)
-					.then((res) => res[0] ?? null),
-			)
+			const loadedCoupon =
+				(await client.query.coupon.findFirst({
+					where: or(
+						eq(coupon.id, couponIdOrCode),
+						eq(coupon.code, couponIdOrCode),
+					),
+				})) || null
+
+			logger.debug('loadedCoupon', { loadedCoupon })
+
+			return couponSchema.nullable().parse(loadedCoupon)
 		},
 		async getCouponWithBulkPurchases(couponId: string): Promise<
 			| (Coupon & {
@@ -940,6 +983,9 @@ export function mySqlDrizzleAdapter(
 			userIdOrEmail: string,
 			moduleIdOrSlug: string,
 		): Promise<ModuleProgress> {
+			const ALLOWED_MODULE_RESOURCE_TYPES = ['lesson', 'exercise', 'solution']
+			const COUNTABLE_MODULE_RESOURCE_TYPES = ['lesson', 'exercise']
+
 			const module = await client.query.contentResource.findFirst({
 				where: or(
 					eq(contentResource.id, moduleIdOrSlug),
@@ -950,6 +996,26 @@ export function mySqlDrizzleAdapter(
 				),
 				with: {
 					resources: {
+						with: {
+							resource: {
+								with: {
+									resources: {
+										with: {
+											resource: {
+												with: {
+													resources: {
+														with: {
+															resource: true,
+														},
+													},
+												},
+											},
+										},
+										orderBy: asc(contentResourceResource.position),
+									},
+								},
+							},
+						},
 						orderBy: asc(contentResourceResource.position),
 					},
 				},
@@ -957,24 +1023,37 @@ export function mySqlDrizzleAdapter(
 
 			const parsedModule = ContentResourceSchema.parse(module)
 
-			const moduleResources =
-				await client.query.contentResourceResource.findMany({
-					where: inArray(
-						contentResourceResource.resourceOfId,
-						parsedModule.resources?.map((r) => r.resourceId) ?? [],
-					),
-					orderBy: asc(contentResourceResource.position),
-				})
+			function flattenResources(
+				resources: ContentResourceResource[],
+			): ContentResource[] {
+				const result: ContentResource[] = []
+
+				function recurse(resources: ContentResourceResource[]) {
+					for (const nestedResource of resources) {
+						const resource = nestedResource.resource
+						result.push(resource)
+						if (resource.resources) {
+							recurse(resource.resources)
+						}
+					}
+				}
 
-			const parsedModuleResources = z
-				.array(ContentResourceResourceSchema)
-				.safeParse(moduleResources)
+				recurse(resources)
+				return result
+			}
 
-			if (!parsedModuleResources.success) {
-				console.error(
-					'Error parsing module resources',
-					parsedModuleResources.error,
-				)
+			const allResources =
+				parsedModule?.resources && flattenResources(parsedModule.resources)
+			const filteredResources = allResources?.filter((resource) => {
+				return ALLOWED_MODULE_RESOURCE_TYPES.includes(resource.type)
+			})
+
+			const parsedResources = z
+				.array(ContentResourceSchema)
+				.safeParse(filteredResources)
+
+			if (!parsedResources.success) {
+				console.error('Error parsing module resources', parsedResources.error)
 				return {
 					completedLessons: [],
 					nextResource: null,
@@ -984,13 +1063,35 @@ export function mySqlDrizzleAdapter(
 				}
 			}
 
-			const user = await client.query.users.findFirst({
-				where: or(eq(users.id, userIdOrEmail), eq(users.email, userIdOrEmail)),
-				with: {
-					roles: true,
-				},
+			const progressResources = parsedResources.data.filter((r) => {
+				return COUNTABLE_MODULE_RESOURCE_TYPES.includes(r.type)
 			})
 
+			const totalLessonsCount = progressResources.length
+
+			const user = await client.query.users
+				.findFirst({
+					where: or(
+						eq(users.id, userIdOrEmail),
+						eq(users.email, userIdOrEmail),
+					),
+					with: {
+						roles: {
+							with: {
+								role: true,
+							},
+						},
+					},
+				})
+				.then(async (res) => {
+					if (res) {
+						return {
+							...res,
+							roles: res.roles.map((r) => r.role),
+						}
+					}
+				})
+
 			if (!user) {
 				console.error('User not found', userIdOrEmail)
 				return {
@@ -998,27 +1099,40 @@ export function mySqlDrizzleAdapter(
 					nextResource: null,
 					percentCompleted: 0,
 					completedLessonsCount: 0,
-					totalLessonsCount: parsedModuleResources.data.length,
+					totalLessonsCount,
 				}
 			}
 
-			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,
+				}
+			}
 
 			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,
-						parsedModuleResources.data.map((r) => r.resourceId),
+						resourceProgress.resourceId,
+						progressResources.map((r) => r.id),
 					),
 				),
 				orderBy: asc(resourceProgress.completedAt),
 			})
 
-			const nextResourceId = moduleResources.find(
-				(r) => !userProgress.find((p) => p.contentResourceId === r.resourceId),
-			)?.resourceId
+			const nextResourceId = parsedResources.data
+				.filter((r) => {
+					return COUNTABLE_MODULE_RESOURCE_TYPES.includes(r.type)
+				})
+				.find((r) => !userProgress.find((p) => p.resourceId === r.id))?.id
 
 			const nextResource = await client.query.contentResource.findFirst({
 				where: eq(contentResource.id, nextResourceId as string),
@@ -1039,11 +1153,11 @@ export function mySqlDrizzleAdapter(
 					nextResource: null,
 					percentCompleted: 0,
 					completedLessonsCount: 0,
-					totalLessonsCount: parsedModuleResources.data.length,
+					totalLessonsCount,
 				}
 			}
 			const percentCompleted = Math.round(
-				(parsedProgress.data.length / parsedModuleResources.data.length) * 100,
+				(parsedProgress.data.length / parsedResources.data.length) * 100,
 			)
 
 			return {
@@ -1051,7 +1165,7 @@ export function mySqlDrizzleAdapter(
 				nextResource: parsedNextResource,
 				percentCompleted,
 				completedLessonsCount: parsedProgress.data.length,
-				totalLessonsCount: parsedModuleResources.data.length,
+				totalLessonsCount,
 			}
 		},
 		getLessonProgresses(): Promise<ResourceProgress[]> {
@@ -1151,6 +1265,16 @@ export function mySqlDrizzleAdapter(
 				}),
 			)
 		},
+		async getPurchaseCountForProduct(productId: string): Promise<number> {
+			return await client.query.purchases
+				.findMany({
+					where: and(
+						eq(purchaseTable.productId, productId),
+						inArray(purchaseTable.status, ['Valid', 'Restricted']),
+					),
+				})
+				.then((res) => res.length)
+		},
 		async getPurchase(purchaseId: string): Promise<Purchase | null> {
 			const purchase = await client.query.purchases.findFirst({
 				where: eq(purchaseTable.id, purchaseId),
@@ -1468,7 +1592,7 @@ export function mySqlDrizzleAdapter(
 			let lessonProgress = await client.query.resourceProgress.findFirst({
 				where: and(
 					eq(resourceProgress.userId, options.userId),
-					eq(resourceProgress.contentResourceId, options.lessonId),
+					eq(resourceProgress.resourceId, options.lessonId),
 				),
 			})
 
@@ -1481,11 +1605,11 @@ export function mySqlDrizzleAdapter(
 						completedAt: lessonProgress.completedAt ? null : now,
 						updatedAt: now,
 					})
-					.where(eq(resourceProgress.contentResourceId, options.lessonId))
+					.where(eq(resourceProgress.resourceId, options.lessonId))
 			} else {
 				await client.insert(resourceProgress).values({
 					userId: options.userId,
-					contentResourceId: options.lessonId,
+					resourceId: options.lessonId,
 					completedAt: now,
 					updatedAt: now,
 				})
@@ -1494,7 +1618,7 @@ export function mySqlDrizzleAdapter(
 			lessonProgress = await client.query.resourceProgress.findFirst({
 				where: and(
 					eq(resourceProgress.userId, options.userId),
-					eq(resourceProgress.contentResourceId, options.lessonId),
+					eq(resourceProgress.resourceId, options.lessonId),
 				),
 			})
 
@@ -1712,7 +1836,15 @@ export function mySqlDrizzleAdapter(
 								with: {
 									resources: {
 										with: {
-											resource: true,
+											resource: {
+												with: {
+													resources: {
+														with: {
+															resource: true,
+														},
+													},
+												},
+											},
 										},
 										orderBy: asc(contentResourceResource.position),
 									},
@@ -1835,7 +1967,7 @@ export function mySqlDrizzleAdapter(
 				return null
 			}
 
-			return dbAccount.user
+			return dbAccount.User
 		},
 		async deleteSession(sessionToken) {
 			const session =

package/src/lib/mysql/schemas/auth/accounts.ts

@@ -13,7 +13,7 @@ import { getUsersSchema } from './users.js'
 
 export function getAccountsSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'account',
+		'Account',
 		{
 			userId: varchar('userId', { length: 255 }).notNull(),
 			type: varchar('type', { length: 255 })

package/src/lib/mysql/schemas/auth/device-access-token.ts

@@ -0,0 +1,40 @@
+import { relations, sql } from 'drizzle-orm'
+import {
+	index,
+	MySqlTableFn,
+	primaryKey,
+	timestamp,
+	varchar,
+} from 'drizzle-orm/mysql-core'
+
+import { getUsersSchema } from './users.js'
+
+export function getDeviceAccessTokenSchema(mysqlTable: MySqlTableFn) {
+	return mysqlTable(
+		'DeviceAccessToken',
+		{
+			token: varchar('token', { length: 191 }).notNull(),
+			userId: varchar('userId', { length: 191 }).notNull(),
+			createdAt: timestamp('createdAt', {
+				mode: 'date',
+				fsp: 3,
+			}).default(sql`CURRENT_TIMESTAMP(3)`),
+		},
+		(crr) => ({
+			pk: primaryKey({ columns: [crr.token] }),
+			userIdIdx: index('userId_idx').on(crr.userId),
+		}),
+	)
+}
+
+export function getDeviceAccessTokenRelationsSchema(mysqlTable: MySqlTableFn) {
+	const deviceAccessToken = getDeviceAccessTokenSchema(mysqlTable)
+	const user = getUsersSchema(mysqlTable)
+	return relations(deviceAccessToken, ({ one }) => ({
+		verifiedBy: one(user, {
+			fields: [deviceAccessToken.userId],
+			references: [user.id],
+			relationName: 'user',
+		}),
+	}))
+}

package/src/lib/mysql/schemas/auth/device-verification.ts

@@ -0,0 +1,48 @@
+import { relations, sql } from 'drizzle-orm'
+import {
+	MySqlTableFn,
+	primaryKey,
+	text,
+	timestamp,
+	varchar,
+} from 'drizzle-orm/mysql-core'
+
+import { getUsersSchema } from './users.js'
+
+export function getDeviceVerificationSchema(mysqlTable: MySqlTableFn) {
+	return mysqlTable(
+		'DeviceVerification',
+		{
+			verifiedByUserId: varchar('verifiedByUserId', { length: 255 }),
+			deviceCode: varchar('deviceCode', { length: 191 }).notNull(),
+			userCode: text('userCode').notNull(),
+			expires: timestamp('expires', {
+				mode: 'date',
+				fsp: 3,
+			}).notNull(),
+			createdAt: timestamp('createdAt', {
+				mode: 'date',
+				fsp: 3,
+			}).default(sql`CURRENT_TIMESTAMP(3)`),
+			verifiedAt: timestamp('verifiedAt', {
+				mode: 'date',
+				fsp: 3,
+			}),
+		},
+		(crr) => ({
+			pk: primaryKey({ columns: [crr.deviceCode] }),
+		}),
+	)
+}
+
+export function getDeviceVerificationRelationsSchema(mysqlTable: MySqlTableFn) {
+	const deviceVerification = getDeviceVerificationSchema(mysqlTable)
+	const user = getUsersSchema(mysqlTable)
+	return relations(deviceVerification, ({ one }) => ({
+		verifiedBy: one(user, {
+			fields: [deviceVerification.verifiedByUserId],
+			references: [user.id],
+			relationName: 'user',
+		}),
+	}))
+}

package/src/lib/mysql/schemas/auth/permissions.ts

@@ -12,7 +12,7 @@ import { getRolePermissionsSchema } from './role-permissions.js'
 
 export function getPermissionsSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'permission',
+		'Permission',
 		{
 			id: varchar('id', { length: 255 }).notNull().primaryKey(),
 			name: varchar('name', { length: 255 }).notNull().unique(),

package/src/lib/mysql/schemas/auth/role-permissions.ts

@@ -13,7 +13,7 @@ import { getRolesSchema } from './roles.js'
 
 export function getRolePermissionsSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'rolePermission',
+		'RolePermission',
 		{
 			roleId: varchar('roleId', { length: 255 }).notNull(),
 			permissionId: varchar('permissionId', { length: 255 }).notNull(),

package/src/lib/mysql/schemas/auth/roles.ts

@@ -12,7 +12,7 @@ import { getUserRolesSchema } from './user-roles.js'
 
 export function getRolesSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'role',
+		'Role',
 		{
 			id: varchar('id', { length: 255 }).notNull().primaryKey(),
 			name: varchar('name', { length: 255 }).notNull().unique(),

package/src/lib/mysql/schemas/auth/sessions.ts

@@ -5,7 +5,7 @@ import { getUsersSchema } from './users.js'
 
 export function getSessionsSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'session',
+		'Session',
 		{
 			sessionToken: varchar('sessionToken', { length: 255 })
 				.notNull()

package/src/lib/mysql/schemas/auth/user-permissions.ts

@@ -13,7 +13,7 @@ import { getUsersSchema } from './users.js'
 
 export function getUserPermissionsSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'userPermission',
+		'UserPermission',
 		{
 			userId: varchar('userId', { length: 255 }).notNull(),
 			permissionId: varchar('permissionId', { length: 255 }).notNull(),

package/src/lib/mysql/schemas/auth/user-prefs.ts

@@ -0,0 +1,52 @@
+import { relations, sql } from 'drizzle-orm'
+import {
+	index,
+	json,
+	MySqlTableFn,
+	primaryKey,
+	text,
+	timestamp,
+	varchar,
+} from 'drizzle-orm/mysql-core'
+
+import { getUsersSchema } from '../auth/users.js'
+
+export function getUserPrefsSchema(mysqlTable: MySqlTableFn) {
+	return mysqlTable(
+		'UserPrefs',
+		{
+			id: varchar('id', { length: 191 }).notNull(),
+			type: varchar('type', { length: 191 }).default('Global').notNull(),
+			userId: varchar('userId', { length: 255 }).notNull(),
+			fields: json('fields').$type<Record<string, any>>().default({}),
+			createdAt: timestamp('createdAt', {
+				mode: 'date',
+				fsp: 3,
+			}).default(sql`CURRENT_TIMESTAMP(3)`),
+			updatedAt: timestamp('updatedAt', {
+				mode: 'date',
+				fsp: 3,
+			}).default(sql`CURRENT_TIMESTAMP(3)`),
+			deletedAt: timestamp('deletedAt', {
+				mode: 'date',
+				fsp: 3,
+			}),
+		},
+		(crr) => ({
+			pk: primaryKey({ columns: [crr.id] }),
+			crrUserIdIdKey: index('crr_userIdId_idx').on(crr.userId),
+		}),
+	)
+}
+
+export function getUserPrefsRelationsSchema(mysqlTable: MySqlTableFn) {
+	const userPrefs = getUserPrefsSchema(mysqlTable)
+	const user = getUsersSchema(mysqlTable)
+	return relations(userPrefs, ({ one }) => ({
+		user: one(user, {
+			fields: [userPrefs.userId],
+			references: [user.id],
+			relationName: 'user',
+		}),
+	}))
+}

package/src/lib/mysql/schemas/auth/user-roles.ts

@@ -13,7 +13,7 @@ import { getUsersSchema } from './users.js'
 
 export function getUserRolesSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'userRole',
+		'UserRole',
 		{
 			userId: varchar('userId', { length: 255 }).notNull(),
 			roleId: varchar('roleId', { length: 255 }).notNull(),