@coursebuilder/adapter-drizzle 0.5.2 → 1.0.1

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

@@ -1,5 +1,6 @@
 import { sql } from 'drizzle-orm'
 import {
+	index,
 	int,
 	MySqlTableFn,
 	primaryKey,
@@ -12,6 +13,7 @@ export function getMerchantAccountSchema(mysqlTable: MySqlTableFn) {
 		'MerchantAccount',
 		{
 			id: varchar('id', { length: 191 }).notNull(),
+			organizationId: varchar('organizationId', { length: 191 }),
 			status: int('status').default(0).notNull(),
 			createdAt: timestamp('createdAt', { mode: 'date', fsp: 3 })
 				.default(sql`CURRENT_TIMESTAMP(3)`)
@@ -25,6 +27,7 @@ export function getMerchantAccountSchema(mysqlTable: MySqlTableFn) {
 					columns: [table.id],
 					name: 'MerchantAccount_id',
 				}),
+				organizationIdIdx: index('organizationId_idx').on(table.organizationId),
 			}
 		},
 	)

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

@@ -1,5 +1,6 @@
 import { relations, sql } from 'drizzle-orm'
 import {
+	index,
 	int,
 	MySqlTableFn,
 	primaryKey,
@@ -11,12 +12,14 @@ import {
 import { getMerchantAccountSchema } from './merchant-account.js'
 import { getMerchantCustomerSchema } from './merchant-customer.js'
 import { getMerchantProductSchema } from './merchant-product.js'
+import { getMerchantSubscriptionSchema } from './merchant-subscription.js'
 
 export function getMerchantChargeSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
 		'MerchantCharge',
 		{
 			id: varchar('id', { length: 191 }).notNull(),
+			organizationId: varchar('organizationId', { length: 191 }),
 			status: int('status').default(0).notNull(),
 			identifier: varchar('identifier', { length: 191 }).notNull(),
 			userId: varchar('userId', { length: 191 }).notNull(),
@@ -26,6 +29,9 @@ export function getMerchantChargeSchema(mysqlTable: MySqlTableFn) {
 			merchantProductId: varchar('merchantProductId', {
 				length: 191,
 			}).notNull(),
+			merchantSubscriptionId: varchar('merchantSubscriptionId', {
+				length: 191,
+			}),
 			createdAt: timestamp('createdAt', { mode: 'date', fsp: 3 })
 				.default(sql`CURRENT_TIMESTAMP(3)`)
 				.notNull(),
@@ -42,6 +48,10 @@ export function getMerchantChargeSchema(mysqlTable: MySqlTableFn) {
 				merchantChargeIdentifierKey: unique('MerchantCharge_identifier_key').on(
 					table.identifier,
 				),
+				merchantSubscriptionIdIdx: index('merchantSubscriptionId_idx').on(
+					table.merchantSubscriptionId,
+				),
+				organizationIdIdx: index('organizationId_idx').on(table.organizationId),
 			}
 		},
 	)
@@ -52,6 +62,7 @@ export function getMerchantChargeRelationsSchema(mysqlTable: MySqlTableFn) {
 	const merchantAccount = getMerchantAccountSchema(mysqlTable)
 	const merchantProduct = getMerchantProductSchema(mysqlTable)
 	const merchantCustomer = getMerchantCustomerSchema(mysqlTable)
+	const merchantSubscription = getMerchantSubscriptionSchema(mysqlTable)
 	return relations(merchantCharge, ({ one }) => ({
 		merchantAccount: one(merchantAccount, {
 			fields: [merchantCharge.merchantAccountId],
@@ -68,5 +79,10 @@ export function getMerchantChargeRelationsSchema(mysqlTable: MySqlTableFn) {
 			references: [merchantCustomer.id],
 			relationName: 'merchantCustomer',
 		}),
+		merchantSubscription: one(merchantSubscription, {
+			fields: [merchantCharge.merchantSubscriptionId],
+			references: [merchantSubscription.id],
+			relationName: 'merchantSubscription',
+		}),
 	}))
 }

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

@@ -1,5 +1,6 @@
 import {
 	decimal,
+	index,
 	int,
 	MySqlTableFn,
 	primaryKey,
@@ -13,6 +14,7 @@ export function getMerchantCouponSchema(mysqlTable: MySqlTableFn) {
 		{
 			id: varchar('id', { length: 191 }).notNull(),
 			identifier: varchar('identifier', { length: 191 }),
+			organizationId: varchar('organizationId', { length: 191 }),
 			status: int('status').default(0).notNull(),
 			merchantAccountId: varchar('merchantAccountId', {
 				length: 191,
@@ -32,6 +34,7 @@ export function getMerchantCouponSchema(mysqlTable: MySqlTableFn) {
 				merchantCouponIdentifierKey: unique('MerchantCoupon_identifier_key').on(
 					table.identifier,
 				),
+				organizationIdIdx: index('organizationId_idx').on(table.organizationId),
 			}
 		},
 	)

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

@@ -14,6 +14,7 @@ export function getMerchantCustomerSchema(mysqlTable: MySqlTableFn) {
 		'MerchantCustomer',
 		{
 			id: varchar('id', { length: 191 }).notNull(),
+			organizationId: varchar('organizationId', { length: 191 }),
 			userId: varchar('userId', { length: 191 }).notNull(),
 			merchantAccountId: varchar('merchantAccountId', {
 				length: 191,
@@ -34,6 +35,7 @@ export function getMerchantCustomerSchema(mysqlTable: MySqlTableFn) {
 					'MerchantCustomer_identifier_key',
 				).on(table.identifier),
 				userIdIdx: index('idx_MerchantCustomer_on_userId').on(table.userId),
+				organizationIdIdx: index('organizationId_idx').on(table.organizationId),
 			}
 		},
 	)

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

@@ -1,5 +1,6 @@
 import { sql } from 'drizzle-orm'
 import {
+	index,
 	int,
 	MySqlTableFn,
 	primaryKey,
@@ -13,6 +14,7 @@ export function getMerchantPriceSchema(mysqlTable: MySqlTableFn) {
 		'MerchantPrice',
 		{
 			id: varchar('id', { length: 191 }).notNull(),
+			organizationId: varchar('organizationId', { length: 191 }),
 			merchantAccountId: varchar('merchantAccountId', {
 				length: 191,
 			}).notNull(),
@@ -35,6 +37,7 @@ export function getMerchantPriceSchema(mysqlTable: MySqlTableFn) {
 				merchantPriceIdentifierKey: unique('MerchantPrice_identifier_key').on(
 					table.identifier,
 				),
+				organizationIdIdx: index('organizationId_idx').on(table.organizationId),
 			}
 		},
 	)

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

@@ -1,5 +1,6 @@
 import { sql } from 'drizzle-orm'
 import {
+	index,
 	int,
 	MySqlTableFn,
 	primaryKey,
@@ -13,6 +14,7 @@ export function getMerchantProductSchema(mysqlTable: MySqlTableFn) {
 		'MerchantProduct',
 		{
 			id: varchar('id', { length: 191 }).notNull(),
+			organizationId: varchar('organizationId', { length: 191 }),
 			merchantAccountId: varchar('merchantAccountId', {
 				length: 191,
 			}).notNull(),
@@ -32,6 +34,7 @@ export function getMerchantProductSchema(mysqlTable: MySqlTableFn) {
 				merchantProductIdentifierKey: unique(
 					'MerchantProduct_identifier_key',
 				).on(table.identifier),
+				organizationIdIdx: index('organizationId_idx').on(table.organizationId),
 			}
 		},
 	)

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

@@ -1,10 +1,16 @@
-import { MySqlTableFn, primaryKey, varchar } from 'drizzle-orm/mysql-core'
+import {
+	index,
+	MySqlTableFn,
+	primaryKey,
+	varchar,
+} from 'drizzle-orm/mysql-core'
 
 export function getMerchantSessionSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
 		'MerchantSession',
 		{
 			id: varchar('id', { length: 191 }).notNull(),
+			organizationId: varchar('organizationId', { length: 191 }),
 			identifier: varchar('identifier', { length: 191 }).notNull(),
 			merchantAccountId: varchar('merchantAccountId', {
 				length: 191,
@@ -16,6 +22,7 @@ export function getMerchantSessionSchema(mysqlTable: MySqlTableFn) {
 					columns: [table.id],
 					name: 'MerchantSession_id',
 				}),
+				organizationIdIdx: index('organizationId_idx').on(table.organizationId),
 			}
 		},
 	)

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

@@ -0,0 +1,64 @@
+import { relations, sql } from 'drizzle-orm'
+import {
+	index,
+	int,
+	MySqlTableFn,
+	primaryKey,
+	timestamp,
+	varchar,
+} from 'drizzle-orm/mysql-core'
+
+import { getMerchantChargeSchema } from './merchant-charge.js'
+import { getSubscriptionSchema } from './subscription.js'
+
+export function getMerchantSubscriptionSchema(mysqlTable: MySqlTableFn) {
+	return mysqlTable(
+		'MerchantSubscription',
+		{
+			id: varchar('id', { length: 191 }).notNull(),
+			organizationId: varchar('organizationId', { length: 191 }),
+			merchantAccountId: varchar('merchantAccountId', {
+				length: 191,
+			}).notNull(),
+			status: int('status').default(0).notNull(),
+			createdAt: timestamp('createdAt', { mode: 'date', fsp: 3 })
+				.default(sql`CURRENT_TIMESTAMP(3)`)
+				.notNull(),
+			label: varchar('label', { length: 191 }),
+			identifier: varchar('identifier', { length: 191 }),
+			merchantCustomerId: varchar('merchantCustomerId', {
+				length: 191,
+			}).notNull(),
+			merchantProductId: varchar('merchantProductId', {
+				length: 191,
+			}).notNull(),
+		},
+		(table) => {
+			return {
+				merchantSubscriptionId: primaryKey({
+					columns: [table.id],
+					name: 'MerchantSubscription_id',
+				}),
+				organizationIdIdx: index('organizationId_idx').on(table.organizationId),
+			}
+		},
+	)
+}
+
+export function getMerchantSubscriptionRelationsSchema(
+	mysqlTable: MySqlTableFn,
+) {
+	const merchantSubscription = getMerchantSubscriptionSchema(mysqlTable)
+	const merchantCharge = getMerchantChargeSchema(mysqlTable)
+	const subscription = getSubscriptionSchema(mysqlTable)
+	return relations(merchantSubscription, ({ many, one }) => ({
+		merchantCharges: many(merchantCharge, {
+			relationName: 'merchantSubscription',
+		}),
+		subscription: one(subscription, {
+			fields: [merchantSubscription.id],
+			references: [subscription.merchantSubscriptionId],
+			relationName: 'subscription',
+		}),
+	}))
+}

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

@@ -1,6 +1,7 @@
 import { relations, sql } from 'drizzle-orm'
 import {
 	decimal,
+	index,
 	int,
 	json,
 	MySqlTableFn,
@@ -18,6 +19,7 @@ export function getPriceSchema(mysqlTable: MySqlTableFn) {
 		{
 			id: varchar('id', { length: 191 }).notNull(),
 			productId: varchar('productId', { length: 191 }),
+			organizationId: varchar('organizationId', { length: 191 }),
 			nickname: varchar('nickname', { length: 191 }),
 			status: int('status').default(0).notNull(),
 			unitAmount: decimal('unitAmount', { precision: 10, scale: 2 }).notNull(),
@@ -29,6 +31,7 @@ export function getPriceSchema(mysqlTable: MySqlTableFn) {
 		(table) => {
 			return {
 				priceId: primaryKey({ columns: [table.id], name: 'Price_id' }),
+				organizationIdIdx: index('organizationId_idx').on(table.organizationId),
 			}
 		},
 	)

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

@@ -1,5 +1,6 @@
 import { relations, sql } from 'drizzle-orm'
 import {
+	index,
 	int,
 	json,
 	MySqlTableFn,
@@ -17,6 +18,7 @@ export function getProductSchema(mysqlTable: MySqlTableFn) {
 		'Product',
 		{
 			id: varchar('id', { length: 191 }).notNull(),
+			organizationId: varchar('organizationId', { length: 191 }),
 			name: varchar('name', { length: 191 }).notNull(),
 			key: varchar('key', { length: 191 }),
 			type: varchar('type', { length: 191 }),
@@ -30,6 +32,7 @@ export function getProductSchema(mysqlTable: MySqlTableFn) {
 		(table) => {
 			return {
 				productId: primaryKey({ columns: [table.id], name: 'Product_id' }),
+				organizationIdIdx: index('organizationId_idx').on(table.organizationId),
 			}
 		},
 	)

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

@@ -1,5 +1,6 @@
 import { relations, sql } from 'drizzle-orm'
 import {
+	index,
 	mysqlEnum,
 	MySqlTableFn,
 	primaryKey,
@@ -27,6 +28,7 @@ export function getPurchaseUserTransferSchema(mysqlTable: MySqlTableFn) {
 				.default('AVAILABLE')
 				.notNull(),
 			purchaseId: varchar('purchaseId', { length: 191 }).notNull(),
+			organizationId: varchar('organizationId', { length: 191 }),
 			sourceUserId: varchar('sourceUserId', { length: 191 }).notNull(),
 			targetUserId: varchar('targetUserId', { length: 191 }),
 			createdAt: timestamp('createdAt', { mode: 'date', fsp: 3 })
@@ -43,6 +45,7 @@ export function getPurchaseUserTransferSchema(mysqlTable: MySqlTableFn) {
 					columns: [table.id],
 					name: 'PurchaseUserTransfer_id',
 				}),
+				organizationIdIdx: index('organizationId_idx').on(table.organizationId),
 			}
 		},
 	)

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

@@ -11,6 +11,8 @@ import {
 } from 'drizzle-orm/mysql-core'
 
 import { getUsersSchema } from '../auth/users.js'
+import { getOrganizationMembershipsSchema } from '../org/organization-memberships.js'
+import { getOrganizationsSchema } from '../org/organizations.js'
 import { getCouponSchema } from './coupon.js'
 import { getMerchantChargeSchema } from './merchant-charge.js'
 import { getMerchantSessionSchema } from './merchant-session.js'
@@ -22,6 +24,10 @@ export function getPurchaseSchema(mysqlTable: MySqlTableFn) {
 		{
 			id: varchar('id', { length: 191 }).notNull(),
 			userId: varchar('userId', { length: 191 }),
+			purchasedByorganizationMembershipId: varchar('organizationMembershipId', {
+				length: 191,
+			}),
+			organizationId: varchar('organizationId', { length: 191 }),
 			createdAt: timestamp('createdAt', { mode: 'date', fsp: 3 })
 				.default(sql`CURRENT_TIMESTAMP(3)`)
 				.notNull(),
@@ -52,6 +58,10 @@ export function getPurchaseSchema(mysqlTable: MySqlTableFn) {
 				purchaseUpgradedFromIdKey: unique('Purchase_upgradedFromId_key').on(
 					table.upgradedFromId,
 				),
+				organizationIdIdx: index('organizationId_idx').on(table.organizationId),
+				organizationMembershipIdIdx: index('organizationMembershipId_idx').on(
+					table.purchasedByorganizationMembershipId,
+				),
 			}
 		},
 	)
@@ -64,6 +74,8 @@ export function getPurchaseRelationsSchema(mysqlTable: MySqlTableFn) {
 	const merchantCharges = getMerchantChargeSchema(mysqlTable)
 	const merchantSessions = getMerchantSessionSchema(mysqlTable)
 	const coupons = getCouponSchema(mysqlTable)
+	const organizations = getOrganizationsSchema(mysqlTable)
+	const organizationMemberships = getOrganizationMembershipsSchema(mysqlTable)
 
 	return relations(purchases, ({ many, one }) => ({
 		redeemedBulkCoupon: one(coupons, {
@@ -76,6 +88,16 @@ export function getPurchaseRelationsSchema(mysqlTable: MySqlTableFn) {
 			references: [users.id],
 			relationName: 'user',
 		}),
+		organization: one(organizations, {
+			fields: [purchases.organizationId],
+			references: [organizations.id],
+			relationName: 'organization',
+		}),
+		purchasedBy: one(organizationMemberships, {
+			fields: [purchases.purchasedByorganizationMembershipId],
+			references: [organizationMemberships.id],
+			relationName: 'organizationMembership',
+		}),
 		product: one(products, {
 			fields: [purchases.productId],
 			references: [products.id],

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

@@ -0,0 +1,69 @@
+import { relations, sql } from 'drizzle-orm'
+import {
+	index,
+	json,
+	MySqlTableFn,
+	primaryKey,
+	timestamp,
+	varchar,
+} from 'drizzle-orm/mysql-core'
+
+import { getOrganizationsSchema } from '../org/organizations.js'
+import { getMerchantSubscriptionSchema } from './merchant-subscription.js'
+import { getProductSchema } from './product.js'
+
+// TODO: do we add a renewal date here? probably just add that stuff to fields
+// 	even status feels out of place at the top level maybe
+export function getSubscriptionSchema(mysqlTable: MySqlTableFn) {
+	return mysqlTable(
+		'Subscription',
+		{
+			id: varchar('id', { length: 191 }).notNull(),
+			organizationId: varchar('organizationId', { length: 191 }),
+			productId: varchar('productId', { length: 191 }).notNull(),
+			createdAt: timestamp('createdAt', { mode: 'date', fsp: 3 })
+				.default(sql`CURRENT_TIMESTAMP(3)`)
+				.notNull(),
+			merchantSubscriptionId: varchar('merchantSubscriptionId', {
+				length: 191,
+			}).notNull(),
+			status: varchar('status', { length: 191 }).default('active').notNull(),
+			fields: json('fields').$type<Record<string, any>>().default({}),
+		},
+		(table) => {
+			return {
+				subscriptionId: primaryKey({
+					columns: [table.id],
+					name: 'Subscription_id',
+				}),
+				organizationIdIdx: index('organizationId_idx').on(table.organizationId),
+			}
+		},
+	)
+}
+
+export function getSubscriptionRelationsSchema(mysqlTable: MySqlTableFn) {
+	const subscriptions = getSubscriptionSchema(mysqlTable)
+	const products = getProductSchema(mysqlTable)
+
+	const organizations = getOrganizationsSchema(mysqlTable)
+	const merchantSubscriptions = getMerchantSubscriptionSchema(mysqlTable)
+
+	return relations(subscriptions, ({ many, one }) => ({
+		organization: one(organizations, {
+			fields: [subscriptions.organizationId],
+			references: [organizations.id],
+			relationName: 'organization',
+		}),
+		product: one(products, {
+			fields: [subscriptions.productId],
+			references: [products.id],
+			relationName: 'product',
+		}),
+		merchantSubscription: one(merchantSubscriptions, {
+			fields: [subscriptions.merchantSubscriptionId],
+			references: [merchantSubscriptions.id],
+			relationName: 'merchantSubscription',
+		}),
+	}))
+}

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

@@ -17,6 +17,7 @@ export function getUpgradableProductsSchema(mysqlTable: MySqlTableFn) {
 		{
 			upgradableToId: varchar('upgradableToId', { length: 255 }).notNull(),
 			upgradableFromId: varchar('upgradableFrom', { length: 255 }).notNull(),
+			organizationId: varchar('organizationId', { length: 191 }),
 			position: double('position').notNull().default(0),
 			metadata: json('metadata').$type<Record<string, any>>().default({}),
 			createdAt: timestamp('createdAt', {
@@ -36,6 +37,7 @@ export function getUpgradableProductsSchema(mysqlTable: MySqlTableFn) {
 			pk: primaryKey({ columns: [crr.upgradableToId, crr.upgradableFromId] }),
 			upgradableToIdIdx: index('upgradableFromId_idx').on(crr.upgradableToId),
 			upgradableFromIdIdx: index('upgradableToId_idx').on(crr.upgradableFromId),
+			organizationIdIdx: index('organizationId_idx').on(crr.organizationId),
 		}),
 	)
 }

package/src/lib/mysql/schemas/communication/comment.ts

@@ -10,6 +10,7 @@ import {
 } from 'drizzle-orm/mysql-core'
 
 import { getUsersSchema } from '../auth/users.js'
+import { getOrganizationMembershipsSchema } from '../org/organization-memberships.js'
 
 export function getCommentsSchema(mysqlTable: MySqlTableFn) {
 	return mysqlTable(
@@ -17,6 +18,9 @@ export function getCommentsSchema(mysqlTable: MySqlTableFn) {
 		{
 			id: varchar('id', { length: 191 }).notNull(),
 			userId: varchar('userId', { length: 255 }).notNull(),
+			organizationMembershipId: varchar('organizationMembershipId', {
+				length: 255,
+			}),
 			context: json('context').$type<Record<string, any>>().default({}),
 			text: text('text').notNull(),
 			createdAt: timestamp('createdAt', {
@@ -35,6 +39,9 @@ export function getCommentsSchema(mysqlTable: MySqlTableFn) {
 		(crr) => ({
 			pk: primaryKey({ columns: [crr.id] }),
 			crrUserIdIdKey: index('crr_userIdId_idx').on(crr.userId),
+			organizationMembershipIdIdx: index('organizationMembershipId_idx').on(
+				crr.organizationMembershipId,
+			),
 		}),
 	)
 }
@@ -42,11 +49,17 @@ export function getCommentsSchema(mysqlTable: MySqlTableFn) {
 export function getCommentRelationsSchema(mysqlTable: MySqlTableFn) {
 	const comment = getCommentsSchema(mysqlTable)
 	const user = getUsersSchema(mysqlTable)
+	const organizationMemberships = getOrganizationMembershipsSchema(mysqlTable)
 	return relations(comment, ({ one }) => ({
 		user: one(user, {
 			fields: [comment.userId],
 			references: [user.id],
 			relationName: 'user',
 		}),
+		organizationMembership: one(organizationMemberships, {
+			fields: [comment.organizationMembershipId],
+			references: [organizationMemberships.id],
+			relationName: 'organizationMembership',
+		}),
 	}))
 }

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

@@ -12,6 +12,7 @@ export function getCommunicationChannelSchema(mysqlTable: MySqlTableFn) {
 		'CommunicationChannel',
 		{
 			id: varchar('id', { length: 255 }).notNull().primaryKey(),
+			organizationId: varchar('organizationId', { length: 191 }),
 			name: varchar('name', { length: 255 }).notNull(),
 			description: text('description'),
 			active: boolean('active').notNull().default(true),
@@ -30,6 +31,7 @@ export function getCommunicationChannelSchema(mysqlTable: MySqlTableFn) {
 		},
 		(cc) => ({
 			nameIdx: index('name_idx').on(cc.name),
+			organizationIdIdx: index('organizationId_idx').on(cc.organizationId),
 		}),
 	)
 }

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

@@ -11,6 +11,7 @@ export function getCommunicationPreferenceTypesSchema(
 ) {
 	return mysqlTable('CommunicationPreferenceType', {
 		id: varchar('id', { length: 255 }).notNull().primaryKey(),
+		organizationId: varchar('organizationId', { length: 191 }),
 		name: varchar('name', { length: 255 }).notNull(),
 		description: text('description'),
 		active: boolean('active').notNull().default(true),

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

@@ -9,6 +9,7 @@ import {
 } from 'drizzle-orm/mysql-core'
 
 import { getUsersSchema } from '../auth/users.js'
+import { getOrganizationMembershipsSchema } from '../org/organization-memberships.js'
 import { getCommunicationChannelSchema } from './communication-channel.js'
 import { getCommunicationPreferenceTypesSchema } from './communication-preference-types.js'
 
@@ -17,7 +18,11 @@ export function getCommunicationPreferencesSchema(mysqlTable: MySqlTableFn) {
 		'CommunicationPreference',
 		{
 			id: varchar('id', { length: 255 }).notNull().primaryKey(),
+			organizationId: varchar('organizationId', { length: 191 }),
 			userId: varchar('userId', { length: 255 }).notNull(),
+			organizationMembershipId: varchar('organizationMembershipId', {
+				length: 255,
+			}),
 			channelId: varchar('channelId', { length: 255 }).notNull(),
 			preferenceLevel: mysqlEnum('preferenceLevel', ['low', 'medium', 'high'])
 				.notNull()
@@ -49,6 +54,9 @@ export function getCommunicationPreferencesSchema(mysqlTable: MySqlTableFn) {
 			userIdIdx: index('userId_idx').on(cp.userId),
 			preferenceTypeIdx: index('preferenceTypeId_idx').on(cp.preferenceTypeId),
 			channelIdIdx: index('channelId_idx').on(cp.channelId),
+			organizationMembershipIdIdx: index('organizationMembershipId_idx').on(
+				cp.organizationMembershipId,
+			),
 		}),
 	)
 }
@@ -61,12 +69,18 @@ export function getCommunicationPreferencesRelationsSchema(
 	const communicationChannel = getCommunicationChannelSchema(mysqlTable)
 	const communicationPreferenceTypes =
 		getCommunicationPreferenceTypesSchema(mysqlTable)
+	const organizationMemberships = getOrganizationMembershipsSchema(mysqlTable)
 	return relations(communicationPreferences, ({ one }) => ({
 		user: one(users, {
 			fields: [communicationPreferences.userId],
 			references: [users.id],
 			relationName: 'user',
 		}),
+		organizationMembership: one(organizationMemberships, {
+			fields: [communicationPreferences.organizationMembershipId],
+			references: [organizationMemberships.id],
+			relationName: 'organizationMembership',
+		}),
 		channel: one(communicationChannel, {
 			fields: [communicationPreferences.channelId],
 			references: [communicationChannel.id],

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

@@ -8,6 +8,7 @@ import {
 } from 'drizzle-orm/mysql-core'
 
 import { getUsersSchema } from '../auth/users.js'
+import { getOrganizationMembershipsSchema } from '../org/organization-memberships.js'
 import { getContentResourceSchema } from './content-resource.js'
 import { getContributionTypesSchema } from './contribution-types.js'
 
@@ -17,6 +18,10 @@ export function getContentContributionsSchema(mysqlTable: MySqlTableFn) {
 		{
 			id: varchar('id', { length: 255 }).notNull().primaryKey(),
 			userId: varchar('userId', { length: 255 }).notNull(),
+			organizationId: varchar('organizationId', { length: 191 }),
+			organizationMembershipId: varchar('organizationMembershipId', {
+				length: 255,
+			}),
 			contentId: varchar('contentId', { length: 255 }).notNull(),
 			contributionTypeId: varchar('contributionTypeId', {
 				length: 255,
@@ -41,6 +46,9 @@ export function getContentContributionsSchema(mysqlTable: MySqlTableFn) {
 			contributionTypeIdIdx: index('contributionTypeId_idx').on(
 				cc.contributionTypeId,
 			),
+			organizationMembershipIdIdx: index('organizationMembershipId_idx').on(
+				cc.organizationMembershipId,
+			),
 		}),
 	)
 }
@@ -52,6 +60,7 @@ export function getContentContributionRelationsSchema(
 	const users = getUsersSchema(mysqlTable)
 	const contentResource = getContentResourceSchema(mysqlTable)
 	const contributionTypes = getContributionTypesSchema(mysqlTable)
+	const organizationMemberships = getOrganizationMembershipsSchema(mysqlTable)
 
 	return relations(contentContributions, ({ one }) => ({
 		user: one(users, {
@@ -69,5 +78,10 @@ export function getContentContributionRelationsSchema(
 			references: [contributionTypes.id],
 			relationName: 'contributionType',
 		}),
+		organizationMembership: one(organizationMemberships, {
+			fields: [contentContributions.organizationMembershipId],
+			references: [organizationMemberships.id],
+			relationName: 'organizationMembership',
+		}),
 	}))
 }

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

@@ -18,6 +18,7 @@ export function getContentResourceProductSchema(mysqlTable: MySqlTableFn) {
 		{
 			productId: varchar('productId', { length: 255 }).notNull(),
 			resourceId: varchar('resourceId', { length: 255 }).notNull(),
+			organizationId: varchar('organizationId', { length: 191 }),
 			position: double('position').notNull().default(0),
 			metadata: json('metadata').$type<Record<string, any>>().default({}),
 			createdAt: timestamp('createdAt', {
@@ -37,6 +38,7 @@ export function getContentResourceProductSchema(mysqlTable: MySqlTableFn) {
 			pk: primaryKey({ columns: [crr.productId, crr.resourceId] }),
 			contentResourceIdIdx: index('contentResourceId_idx').on(crr.productId),
 			resourceIdIdx: index('resourceId_idx').on(crr.resourceId),
+			organizationIdIdx: index('organizationId_idx').on(crr.organizationId),
 		}),
 	)
 }

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

@@ -19,6 +19,7 @@ export function getContentResourceResourceSchema(mysqlTable: MySqlTableFn) {
 			resourceId: varchar('resourceId', { length: 255 }).notNull(),
 			position: double('position').notNull().default(0),
 			metadata: json('metadata').$type<Record<string, any>>().default({}),
+			organizationId: varchar('organizationId', { length: 191 }),
 			createdAt: timestamp('createdAt', {
 				mode: 'date',
 				fsp: 3,
@@ -36,6 +37,7 @@ export function getContentResourceResourceSchema(mysqlTable: MySqlTableFn) {
 			pk: primaryKey({ columns: [crr.resourceOfId, crr.resourceId] }),
 			contentResourceIdIdx: index('contentResourceId_idx').on(crr.resourceOfId),
 			resourceIdIdx: index('resourceId_idx').on(crr.resourceId),
+			organizationIdIdx: index('organizationId_idx').on(crr.organizationId),
 		}),
 	)
 }