@coursebuilder/adapter-drizzle 1.0.1 → 1.0.3

package/dist/lib/mysql/schemas/entitlements/entitlement.js

@@ -0,0 +1,21 @@
+import {
+  getEntitlementRelationsSchema,
+  getEntitlementsSchema
+} from "../../../../chunk-253RMSB3.js";
+import "../../../../chunk-LPJ2P2KJ.js";
+import "../../../../chunk-MP4CUWYC.js";
+import "../../../../chunk-WJWJ6E5Y.js";
+import "../../../../chunk-EHRARBRS.js";
+import "../../../../chunk-BLDW3QUS.js";
+import "../../../../chunk-DKJO4Y3K.js";
+import "../../../../chunk-WPJZAYX7.js";
+import "../../../../chunk-6MRFUIH5.js";
+import "../../../../chunk-MGZMGDQ5.js";
+import "../../../../chunk-KPBVZ44W.js";
+import "../../../../chunk-LZHZDFNZ.js";
+import "../../../../chunk-H736K5TN.js";
+export {
+  getEntitlementRelationsSchema,
+  getEntitlementsSchema
+};
+//# sourceMappingURL=entitlement.js.map

package/dist/lib/mysql/schemas/entitlements/entitlement.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}

package/dist/lib/utils.d.cts

@@ -1,4 +1,4 @@
-import { MySqlDatabase, AnyMySqlTable, MySqlTableFn } from 'drizzle-orm/mysql-core';
+import { MySqlDatabase, MySqlTableFn, AnyMySqlTable } from 'drizzle-orm/mysql-core';
 import { PgDatabase, PgTableFn } from 'drizzle-orm/pg-core';
 import { BaseSQLiteDatabase, SQLiteTableFn, AnySQLiteTable } from 'drizzle-orm/sqlite-core';
 import { DefaultSchema } from './mysql/index.cjs';

package/dist/lib/utils.d.ts

@@ -1,4 +1,4 @@
-import { MySqlDatabase, AnyMySqlTable, MySqlTableFn } from 'drizzle-orm/mysql-core';
+import { MySqlDatabase, MySqlTableFn, AnyMySqlTable } from 'drizzle-orm/mysql-core';
 import { PgDatabase, PgTableFn } from 'drizzle-orm/pg-core';
 import { BaseSQLiteDatabase, SQLiteTableFn, AnySQLiteTable } from 'drizzle-orm/sqlite-core';
 import { DefaultSchema } from './mysql/index.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coursebuilder/adapter-drizzle",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Drizzle adapter for Course Builder.",
   "keywords": [
     "coursebuilder",
@@ -43,7 +43,7 @@
   },
   "devDependencies": {
     "@auth/core": "0.37.2",
-    "@coursebuilder/core": "1.0.1",
+    "@coursebuilder/core": "1.0.3",
     "@libsql/client": "0.5.6",
     "@types/better-sqlite3": "7.6.9",
     "@types/uuid": "9.0.8",

package/src/lib/mysql/index.ts

@@ -208,6 +208,11 @@ import {
 	getTagTagSchema,
 } from './schemas/content/tag-tag.js'
 import { getTagRelationsSchema, getTagSchema } from './schemas/content/tag.js'
+import { getEntitlementTypesSchema } from './schemas/entitlements/entitlement-type.js'
+import {
+	getEntitlementRelationsSchema,
+	getEntitlementsSchema,
+} from './schemas/entitlements/entitlement.js'
 import {
 	getOrganizationMembershipRolesRelationsSchema,
 	getOrganizationMembershipRolesSchema,
@@ -319,6 +324,9 @@ export function getCourseBuilderSchema(mysqlTable: MySqlTableFn) {
 		subscriptionRelations: getSubscriptionRelationsSchema(mysqlTable),
 		profiles: getProfilesSchema(mysqlTable),
 		profilesRelations: getProfilesRelationsSchema(mysqlTable),
+		entitlementTypes: getEntitlementTypesSchema(mysqlTable),
+		entitlements: getEntitlementsSchema(mysqlTable),
+		entitlementsRelations: getEntitlementRelationsSchema(mysqlTable),
 	} as const
 }
 
@@ -710,6 +718,7 @@ export function mySqlDrizzleAdapter(
 						upgradedFromPurchaseId,
 						country,
 						usedCouponId,
+						organizationId,
 					} = options
 
 					const existingMerchantCharge = merchantChargeSchema.nullable().parse(
@@ -798,6 +807,7 @@ export function mySqlDrizzleAdapter(
 								.update(coupon)
 								.set({
 									maxUses: (existingBulkCoupon?.maxUses || 0) + quantity,
+									...(organizationId ? { organizationId } : {}),
 								})
 								.where(eq(coupon.id, bulkCouponId))
 						} else {
@@ -815,6 +825,7 @@ export function mySqlDrizzleAdapter(
 								restrictedToProductId: productId,
 								maxUses: quantity,
 								status: 1,
+								...(organizationId ? { organizationId } : {}),
 								...(merchantCouponToUse
 									? {
 											merchantCouponId: merchantCouponToUse.id,
@@ -865,6 +876,7 @@ export function mySqlDrizzleAdapter(
 						country,
 						upgradedFromId: upgradedFromPurchaseId || null,
 						couponId: usedCouponId || null,
+						...(organizationId ? { organizationId } : {}),
 					})
 
 					const oneWeekInMilliseconds = 1000 * 60 * 60 * 24 * 7
@@ -876,6 +888,7 @@ export function mySqlDrizzleAdapter(
 							? new Date()
 							: new Date(Date.now() + oneWeekInMilliseconds),
 						sourceUserId: userId,
+						...(organizationId ? { organizationId } : {}),
 					})
 
 					// const result = await Promise.all([
@@ -1504,6 +1517,7 @@ export function mySqlDrizzleAdapter(
 						...fieldsNoImage,
 						...(image?.url && { image }),
 					},
+					type: input.type,
 				})
 				.where(eq(products.id, currentProduct.id))
 
@@ -2713,21 +2727,36 @@ export function mySqlDrizzleAdapter(
 			userId: string
 			invitedById: string
 		}) => {
-			const id = crypto.randomUUID()
-			await client.insert(organizationMembershipTable).values({
-				...options,
-				id,
-			})
-
-			return OrganizationMemberSchema.parse(
+			const currentMembership =
 				await client.query.organizationMemberships.findFirst({
-					where: eq(organizationMembershipTable.id, id),
-					with: {
-						organization: true,
-						user: true,
-					},
-				}),
-			)
+					where: and(
+						eq(
+							organizationMembershipTable.organizationId,
+							options.organizationId,
+						),
+						eq(organizationMembershipTable.userId, options.userId),
+					),
+				})
+
+			if (currentMembership) {
+				return OrganizationMemberSchema.parse(currentMembership)
+			} else {
+				const id = crypto.randomUUID()
+				await client.insert(organizationMembershipTable).values({
+					...options,
+					id,
+				})
+
+				return OrganizationMemberSchema.parse(
+					await client.query.organizationMemberships.findFirst({
+						where: eq(organizationMembershipTable.id, id),
+						with: {
+							organization: true,
+							user: true,
+						},
+					}),
+				)
+			}
 		},
 		removeMemberFromOrganization: async (options: {
 			organizationId: string

package/src/lib/mysql/schemas/entitlements/entitlement-type.ts

@@ -0,0 +1,21 @@
+import {
+	MySqlTableFn,
+	text,
+	uniqueIndex,
+	varchar,
+} from 'drizzle-orm/mysql-core'
+
+export function getEntitlementTypesSchema(mysqlTable: MySqlTableFn) {
+	return mysqlTable(
+		'EntitlementType',
+		{
+			id: varchar('id', { length: 191 }).notNull().primaryKey(),
+			name: varchar('name', { length: 255 }).notNull(),
+			description: text('description'),
+			// Add any type-specific config fields here
+		},
+		(table) => ({
+			uniqueName: uniqueIndex('unique_name_idx').on(table.name),
+		}),
+	)
+}

package/src/lib/mysql/schemas/entitlements/entitlement.ts

@@ -0,0 +1,66 @@
+import { relations, sql } from 'drizzle-orm'
+import {
+	index,
+	json,
+	MySqlTableFn,
+	timestamp,
+	varchar,
+} from 'drizzle-orm/mysql-core'
+
+import { getUsersSchema } from '../auth/users.js'
+import { getOrganizationMembershipsSchema } from '../org/organization-memberships.js'
+import { getOrganizationsSchema } from '../org/organizations.js'
+
+export function getEntitlementsSchema(mysqlTable: MySqlTableFn) {
+	return mysqlTable(
+		'Entitlement',
+		{
+			id: varchar('id', { length: 191 }).notNull().primaryKey(),
+			entitlementType: varchar('entitlementType', { length: 255 }).notNull(),
+			userId: varchar('userId', { length: 191 }),
+			organizationId: varchar('organizationId', { length: 191 }),
+			organizationMembershipId: varchar('organizationMembershipId', {
+				length: 191,
+			}),
+			sourceType: varchar('sourceType', { length: 255 }).notNull(), // 'PURCHASE' | 'SUBSCRIPTION' | 'MANUAL' etc
+			sourceId: varchar('sourceId', { length: 191 }).notNull(),
+			metadata: json('metadata').$type<Record<string, any>>().default({}),
+			expiresAt: timestamp('expiresAt', { mode: 'date', fsp: 3 }),
+			createdAt: timestamp('createdAt', { mode: 'date', fsp: 3 })
+				.default(sql`CURRENT_TIMESTAMP(3)`)
+				.notNull(),
+			updatedAt: timestamp('updatedAt', { mode: 'date', fsp: 3 })
+				.default(sql`CURRENT_TIMESTAMP(3)`)
+				.notNull(),
+			deletedAt: timestamp('deletedAt', { mode: 'date', fsp: 3 }),
+		},
+		(table) => ({
+			userIdIdx: index('userId_idx').on(table.userId),
+			orgIdIdx: index('orgId_idx').on(table.organizationId),
+			sourceIdx: index('source_idx').on(table.sourceType, table.sourceId),
+			typeIdx: index('type_idx').on(table.entitlementType),
+		}),
+	)
+}
+
+export function getEntitlementRelationsSchema(mysqlTable: MySqlTableFn) {
+	const entitlements = getEntitlementsSchema(mysqlTable)
+	const users = getUsersSchema(mysqlTable)
+	const orgs = getOrganizationsSchema(mysqlTable)
+	const memberships = getOrganizationMembershipsSchema(mysqlTable)
+
+	return relations(entitlements, ({ one }) => ({
+		user: one(users, {
+			fields: [entitlements.userId],
+			references: [users.id],
+		}),
+		organization: one(orgs, {
+			fields: [entitlements.organizationId],
+			references: [orgs.id],
+		}),
+		membership: one(memberships, {
+			fields: [entitlements.organizationMembershipId],
+			references: [memberships.id],
+		}),
+	}))
+}