@coursebuilder/adapter-drizzle 0.4.0 → 0.5.1

package/src/lib/mysql/schemas/content/lesson-progress.ts

@@ -0,0 +1,39 @@
+import { sql } from 'drizzle-orm'
+import {
+	datetime,
+	index,
+	json,
+	MySqlTableFn,
+	primaryKey,
+	varchar,
+} from 'drizzle-orm/mysql-core'
+
+export function getLessonProgressSchema(mysqlTable: MySqlTableFn) {
+	return mysqlTable(
+		'LessonProgress',
+		{
+			id: varchar('id', { length: 191 }).notNull().primaryKey(),
+			userId: varchar('userId', { length: 191 }).notNull(),
+			lessonId: varchar('lessonId', { length: 191 }),
+			lessonSlug: varchar('lessonSlug', { length: 191 }),
+			lessonVersion: varchar('lessonVersion', { length: 191 }),
+			sectionId: varchar('sectionId', { length: 191 }),
+			moduleId: varchar('moduleId', { length: 191 }),
+			completedAt: datetime('completedAt', { mode: 'date', fsp: 3 }),
+			updatedAt: datetime('updatedAt', { mode: 'date', fsp: 3 }),
+			createdAt: datetime('createdAt', { mode: 'date', fsp: 3 })
+				.default(sql`CURRENT_TIMESTAMP(3)`)
+				.notNull(),
+		},
+		(crp) => {
+			return {
+				userIdLessonIdIdx: index('crp_userId_contentResourceId_idx').on(
+					crp.userId,
+					crp.lessonId,
+				),
+				userIdIdx: index('userId_idx').on(crp.userId),
+				lessonIdIdx: index('lessonId_idx').on(crp.lessonId),
+			}
+		},
+	)
+}

package/src/lib/mysql/schemas/content/resource-progress.ts

@@ -10,10 +10,10 @@ import {
 
 export function getResourceProgressSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'resourceProgresses',
+		'ResourceProgress',
 		{
-			userId: varchar('userId', { length: 191 }).notNull(),
-			contentResourceId: varchar('contentResourceId', { length: 191 }),
+			userId: varchar('userId', { length: 255 }).notNull(),
+			resourceId: varchar('resourceId', { length: 255 }),
 			fields: json('fields').$type<Record<string, any>>().default({}),
 			completedAt: datetime('completedAt', { mode: 'date', fsp: 3 }),
 			updatedAt: datetime('updatedAt', { mode: 'date', fsp: 3 }),
@@ -25,12 +25,10 @@ export function getResourceProgressSchema(mysqlTable: MySqlTableFn) {
 			return {
 				userIdLessonIdIdx: index('crp_userId_contentResourceId_idx').on(
 					crp.userId,
-					crp.contentResourceId,
-				),
-				pk: primaryKey({ columns: [crp.userId, crp.contentResourceId] }),
-				contentResourceIdIdx: index('contentResourceId_idx').on(
-					crp.contentResourceId,
+					crp.resourceId,
 				),
+				pk: primaryKey({ columns: [crp.userId, crp.resourceId] }),
+				contentResourceIdIdx: index('contentResourceId_idx').on(crp.resourceId),
 				userIdIdx: index('resourceId_idx').on(crp.userId),
 			}
 		},