@coursebuilder/adapter-drizzle 0.3.0 → 0.5.0

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

@@ -1,6 +1,7 @@
 import { relations, sql } from 'drizzle-orm'
 import {
 	index,
+	json,
 	mysqlEnum,
 	MySqlTableFn,
 	timestamp,
@@ -8,21 +9,24 @@ import {
 } from 'drizzle-orm/mysql-core'
 
 import { getPurchaseSchema } from '../commerce/purchase.js'
+import { getCommentsSchema } from '../communication/comment.js'
 import { getCommunicationPreferencesSchema } from '../communication/communication-preferences.js'
 import { getContentContributionsSchema } from '../content/content-contributions.js'
 import { getContentResourceSchema } from '../content/content-resource.js'
 import { getAccountsSchema } from './accounts.js'
 import { getUserPermissionsSchema } from './user-permissions.js'
+import { getUserPrefsSchema } from './user-prefs.js'
 import { getUserRolesSchema } from './user-roles.js'
 
 export function getUsersSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'user',
+		'User',
 		{
 			id: varchar('id', { length: 255 }).notNull().primaryKey(),
 			name: varchar('name', { length: 255 }),
-			role: mysqlEnum('role', ['user', 'admin']).default('user'),
+			role: varchar('role', { length: 191 }).notNull().default('user'),
 			email: varchar('email', { length: 255 }).notNull().unique(),
+			fields: json('fields').$type<Record<string, any>>().default({}),
 			emailVerified: timestamp('emailVerified', {
 				mode: 'date',
 				fsp: 3,
@@ -50,6 +54,8 @@ export function getUsersRelationsSchema(mysqlTable: MySqlTableFn) {
 	const contentContributions = getContentContributionsSchema(mysqlTable)
 	const contentResource = getContentResourceSchema(mysqlTable)
 	const purchases = getPurchaseSchema(mysqlTable)
+	const comments = getCommentsSchema(mysqlTable)
+	const userPrefs = getUserPrefsSchema(mysqlTable)
 	return relations(users, ({ many }) => ({
 		accounts: many(accounts, {
 			relationName: 'user',
@@ -72,5 +78,11 @@ export function getUsersRelationsSchema(mysqlTable: MySqlTableFn) {
 		createdContent: many(contentResource, {
 			relationName: 'user',
 		}),
+		comments: many(comments, {
+			relationName: 'user',
+		}),
+		prefs: many(userPrefs, {
+			relationName: 'user',
+		}),
 	}))
 }

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

@@ -7,7 +7,7 @@ import {
 
 export function getVerificationTokensSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'verificationToken',
+		'VerificationToken',
 		{
 			identifier: varchar('identifier', { length: 255 }).notNull(),
 			token: varchar('token', { length: 255 }).notNull(),

package/src/lib/mysql/schemas/commerce/coupon.ts

@@ -2,6 +2,7 @@ import { relations, sql } from 'drizzle-orm'
 import {
 	boolean,
 	decimal,
+	index,
 	int,
 	json,
 	MySqlTableFn,
@@ -11,16 +12,13 @@ import {
 	varchar,
 } from 'drizzle-orm/mysql-core'
 
-import { getContentResourceProductSchema } from '../content/content-resource-product.js'
 import { getMerchantCouponSchema } from './merchant-coupon.js'
-import { getMerchantProductSchema } from './merchant-product.js'
-import { getPriceSchema } from './price.js'
 import { getProductSchema } from './product.js'
 import { getPurchaseSchema } from './purchase.js'
 
 export function getCouponSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'coupons',
+		'Coupon',
 		{
 			id: varchar('id', { length: 191 }).notNull(),
 			code: varchar('code', { length: 191 }),
@@ -43,6 +41,10 @@ export function getCouponSchema(mysqlTable: MySqlTableFn) {
 		},
 		(table) => {
 			return {
+				couponIdCodeIndex: index('Coupon_id_code_index').on(
+					table.id,
+					table.code,
+				),
 				couponId: primaryKey({ columns: [table.id], name: 'Coupon_id' }),
 				couponBulkPurchaseIdKey: unique('Coupon_bulkPurchaseId_key').on(
 					table.bulkPurchaseId,

package/src/lib/mysql/schemas/commerce/merchant-account.ts

@@ -9,7 +9,7 @@ import {
 
 export function getMerchantAccountSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'merchantAccounts',
+		'MerchantAccount',
 		{
 			id: varchar('id', { length: 191 }).notNull(),
 			status: int('status').default(0).notNull(),

package/src/lib/mysql/schemas/commerce/merchant-charge.ts

@@ -14,7 +14,7 @@ import { getMerchantProductSchema } from './merchant-product.js'
 
 export function getMerchantChargeSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'merchantCharges',
+		'MerchantCharge',
 		{
 			id: varchar('id', { length: 191 }).notNull(),
 			status: int('status').default(0).notNull(),

package/src/lib/mysql/schemas/commerce/merchant-coupon.ts

@@ -9,7 +9,7 @@ import {
 
 export function getMerchantCouponSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'merchantCoupons',
+		'MerchantCoupon',
 		{
 			id: varchar('id', { length: 191 }).notNull(),
 			identifier: varchar('identifier', { length: 191 }),

package/src/lib/mysql/schemas/commerce/merchant-customer.ts

@@ -1,5 +1,6 @@
 import { sql } from 'drizzle-orm'
 import {
+	index,
 	int,
 	MySqlTableFn,
 	primaryKey,
@@ -10,7 +11,7 @@ import {
 
 export function getMerchantCustomerSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'merchantCustomers',
+		'MerchantCustomer',
 		{
 			id: varchar('id', { length: 191 }).notNull(),
 			userId: varchar('userId', { length: 191 }).notNull(),
@@ -32,6 +33,7 @@ export function getMerchantCustomerSchema(mysqlTable: MySqlTableFn) {
 				merchantCustomerIdentifierKey: unique(
 					'MerchantCustomer_identifier_key',
 				).on(table.identifier),
+				userIdIdx: index('idx_MerchantCustomer_on_userId').on(table.userId),
 			}
 		},
 	)

package/src/lib/mysql/schemas/commerce/merchant-price.ts

@@ -10,7 +10,7 @@ import {
 
 export function getMerchantPriceSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'merchantPrices',
+		'MerchantPrice',
 		{
 			id: varchar('id', { length: 191 }).notNull(),
 			merchantAccountId: varchar('merchantAccountId', {

package/src/lib/mysql/schemas/commerce/merchant-product.ts

@@ -10,7 +10,7 @@ import {
 
 export function getMerchantProductSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'merchantProducts',
+		'MerchantProduct',
 		{
 			id: varchar('id', { length: 191 }).notNull(),
 			merchantAccountId: varchar('merchantAccountId', {

package/src/lib/mysql/schemas/commerce/merchant-session.ts

@@ -2,7 +2,7 @@ import { MySqlTableFn, primaryKey, varchar } from 'drizzle-orm/mysql-core'
 
 export function getMerchantSessionSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'merchantSessions',
+		'MerchantSession',
 		{
 			id: varchar('id', { length: 191 }).notNull(),
 			identifier: varchar('identifier', { length: 191 }).notNull(),

package/src/lib/mysql/schemas/commerce/price.ts

@@ -14,7 +14,7 @@ import { getProductSchema } from './product.js'
 
 export function getPriceSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'prices',
+		'Price',
 		{
 			id: varchar('id', { length: 191 }).notNull(),
 			productId: varchar('productId', { length: 191 }),

package/src/lib/mysql/schemas/commerce/product.ts

@@ -14,7 +14,7 @@ import { getPriceSchema } from './price.js'
 
 export function getProductSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'products',
+		'Product',
 		{
 			id: varchar('id', { length: 191 }).notNull(),
 			name: varchar('name', { length: 191 }).notNull(),

package/src/lib/mysql/schemas/commerce/purchase-user-transfer.ts

@@ -12,7 +12,7 @@ import { getPurchaseSchema } from './purchase.js'
 
 export function getPurchaseUserTransferSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'purchaseUserTransfers',
+		'PurchaseUserTransfer',
 		{
 			id: varchar('id', { length: 191 }).notNull(),
 			transferState: mysqlEnum('transferState', [

package/src/lib/mysql/schemas/commerce/purchase.ts

@@ -1,6 +1,7 @@
 import { relations, sql } from 'drizzle-orm'
 import {
 	decimal,
+	index,
 	json,
 	MySqlTableFn,
 	primaryKey,
@@ -12,15 +13,12 @@ import {
 import { getUsersSchema } from '../auth/users.js'
 import { getCouponSchema } from './coupon.js'
 import { getMerchantChargeSchema } from './merchant-charge.js'
-import { getMerchantCouponSchema } from './merchant-coupon.js'
-import { getMerchantCustomerSchema } from './merchant-customer.js'
-import { getMerchantProductSchema } from './merchant-product.js'
 import { getMerchantSessionSchema } from './merchant-session.js'
 import { getProductSchema } from './product.js'
 
 export function getPurchaseSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'purchases',
+		'Purchase',
 		{
 			id: varchar('id', { length: 191 }).notNull(),
 			userId: varchar('userId', { length: 191 }),
@@ -48,6 +46,9 @@ export function getPurchaseSchema(mysqlTable: MySqlTableFn) {
 		(table) => {
 			return {
 				purchaseId: primaryKey({ columns: [table.id], name: 'Purchase_id' }),
+				merchantChargeIdIdx: index('idx_Purchase_on_merchantChargeId').on(
+					table.merchantChargeId,
+				),
 				purchaseUpgradedFromIdKey: unique('Purchase_upgradedFromId_key').on(
 					table.upgradedFromId,
 				),

package/src/lib/mysql/schemas/commerce/upgradable-products.ts

@@ -13,7 +13,7 @@ import { getProductSchema } from './product.js'
 
 export function getUpgradableProductsSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'upgradableProducts',
+		'UpgradableProducts',
 		{
 			upgradableToId: varchar('upgradableToId', { length: 255 }).notNull(),
 			upgradableFromId: varchar('upgradableFrom', { length: 255 }).notNull(),

package/src/lib/mysql/schemas/communication/comment.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 getCommentsSchema(mysqlTable: MySqlTableFn) {
+	return mysqlTable(
+		'Comment',
+		{
+			id: varchar('id', { length: 191 }).notNull(),
+			userId: varchar('userId', { length: 255 }).notNull(),
+			context: json('context').$type<Record<string, any>>().default({}),
+			text: text('text').notNull(),
+			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 getCommentRelationsSchema(mysqlTable: MySqlTableFn) {
+	const comment = getCommentsSchema(mysqlTable)
+	const user = getUsersSchema(mysqlTable)
+	return relations(comment, ({ one }) => ({
+		user: one(user, {
+			fields: [comment.userId],
+			references: [user.id],
+			relationName: 'user',
+		}),
+	}))
+}

package/src/lib/mysql/schemas/communication/communication-channel.ts

@@ -9,7 +9,7 @@ import {
 
 export function getCommunicationChannelSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'communicationChannel',
+		'CommunicationChannel',
 		{
 			id: varchar('id', { length: 255 }).notNull().primaryKey(),
 			name: varchar('name', { length: 255 }).notNull(),

package/src/lib/mysql/schemas/communication/communication-preference-types.ts

@@ -9,7 +9,7 @@ import {
 export function getCommunicationPreferenceTypesSchema(
 	mysqlTable: MySqlTableFn,
 ) {
-	return mysqlTable('communicationPreferenceType', {
+	return mysqlTable('CommunicationPreferenceType', {
 		id: varchar('id', { length: 255 }).notNull().primaryKey(),
 		name: varchar('name', { length: 255 }).notNull(),
 		description: text('description'),

package/src/lib/mysql/schemas/communication/communication-preferences.ts

@@ -14,7 +14,7 @@ import { getCommunicationPreferenceTypesSchema } from './communication-preferenc
 
 export function getCommunicationPreferencesSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'communicationPreference',
+		'CommunicationPreference',
 		{
 			id: varchar('id', { length: 255 }).notNull().primaryKey(),
 			userId: varchar('userId', { length: 255 }).notNull(),

package/src/lib/mysql/schemas/content/content-contributions.ts

@@ -13,7 +13,7 @@ import { getContributionTypesSchema } from './contribution-types.js'
 
 export function getContentContributionsSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'contentContribution',
+		'ContentContribution',
 		{
 			id: varchar('id', { length: 255 }).notNull().primaryKey(),
 			userId: varchar('userId', { length: 255 }).notNull(),

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

@@ -14,7 +14,7 @@ import { getContentResourceSchema } from './content-resource.js'
 
 export function getContentResourceProductSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'contentResourceProduct',
+		'ContentResourceProduct',
 		{
 			productId: varchar('productId', { length: 255 }).notNull(),
 			resourceId: varchar('resourceId', { length: 255 }).notNull(),

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

@@ -13,7 +13,7 @@ import { getContentResourceSchema } from './content-resource.js'
 
 export function getContentResourceResourceSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'contentResourceResource',
+		'ContentResourceResource',
 		{
 			resourceOfId: varchar('resourceOfId', { length: 255 }).notNull(),
 			resourceId: varchar('resourceId', { length: 255 }).notNull(),

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

@@ -14,7 +14,7 @@ import { getContentResourceResourceSchema } from './content-resource-resource.js
 
 export function getContentResourceSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'contentResource',
+		'ContentResource',
 		{
 			id: varchar('id', { length: 255 }).notNull().primaryKey(),
 			type: varchar('type', { length: 255 }).notNull(),
@@ -46,16 +46,20 @@ export function getContentResourceRelationsSchema(mysqlTable: MySqlTableFn) {
 	const users = getUsersSchema(mysqlTable)
 	const contentResourceResource = getContentResourceResourceSchema(mysqlTable)
 	const contentResourceProduct = getContentResourceProductSchema(mysqlTable)
+	const contentContributions = getContentContributionsSchema(mysqlTable)
 	return relations(contentResource, ({ one, many }) => ({
 		createdBy: one(users, {
 			fields: [contentResource.createdById],
 			references: [users.id],
-			relationName: 'user',
+			relationName: 'creator',
 		}),
 		resources: many(contentResourceResource, { relationName: 'resourceOf' }),
 		resourceOf: many(contentResourceResource, { relationName: 'resource' }),
 		resourceProducts: many(contentResourceProduct, {
 			relationName: 'resource',
 		}),
+		contributions: many(contentContributions, {
+			relationName: 'contributions',
+		}),
 	}))
 }

package/src/lib/mysql/schemas/content/contribution-types.ts

@@ -12,7 +12,7 @@ import { getContentContributionsSchema } from './content-contributions.js'
 
 export function getContributionTypesSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
-		'contributionType',
+		'ContributionType',
 		{
 			id: varchar('id', { length: 255 }).notNull().primaryKey(),
 			slug: varchar('slug', { length: 255 }).notNull().unique(),

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),
 			}
 		},