@coursebuilder/adapter-drizzle 1.0.2 → 1.0.4

package/dist/lib/mysql/index.js

@@ -3,11 +3,11 @@ import {
   getCourseBuilderSchema,
   guid,
   mySqlDrizzleAdapter
-} from "../../chunk-5QEGBX2O.js";
-import "../../chunk-253RMSB3.js";
+} from "../../chunk-ARHWIBFG.js";
 import "../../chunk-ET3QAIY7.js";
 import "../../chunk-6YPHJWS2.js";
 import "../../chunk-ORRM7KVW.js";
+import "../../chunk-253RMSB3.js";
 import "../../chunk-HWIQUI7O.js";
 import "../../chunk-FPAQINSA.js";
 import "../../chunk-LERR6HQ3.js";

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.2",
+  "version": "1.0.4",
   "description": "Drizzle adapter for Course Builder.",
   "keywords": [
     "coursebuilder",
@@ -43,7 +43,7 @@
   },
   "devDependencies": {
     "@auth/core": "0.37.2",
-    "@coursebuilder/core": "1.0.2",
+    "@coursebuilder/core": "1.0.5",
     "@libsql/client": "0.5.6",
     "@types/better-sqlite3": "7.6.9",
     "@types/uuid": "9.0.8",

package/src/lib/mysql/index.ts

@@ -432,6 +432,11 @@ export function mySqlDrizzleAdapter(
 				}
 
 				const purchaseId = `purchase-${v4()}`
+				const userMemberships = await adapter.getMembershipsForUser(user.id)
+				const organizationId =
+					coupon.organizationId ||
+					userMemberships.find((m) => m.organization.name?.includes(user.email))
+						?.organizationId // safer way to make sure we are using personal organization
 
 				await adapter.createPurchase({
 					id: purchaseId,
@@ -440,6 +445,7 @@ export function mySqlDrizzleAdapter(
 					redeemedBulkCouponId: bulkCouponRedemption ? coupon.id : null,
 					productId,
 					totalAmount: '0',
+					organizationId,
 					metadata: {
 						couponUsedId: bulkCouponRedemption ? null : coupon.id,
 					},
@@ -967,6 +973,7 @@ export function mySqlDrizzleAdapter(
 					name,
 					emailVerified: null,
 				})
+				console.log('newUser', { newUser })
 				if (!newUser) {
 					throw new Error('Could not create user')
 				}
@@ -994,6 +1001,18 @@ export function mySqlDrizzleAdapter(
 
 			return couponSchema.nullable().parse(loadedCoupon)
 		},
+		async getPurchasesForBulkCouponId(
+			bulkCouponId: string,
+		): Promise<(Purchase & { user: User })[]> {
+			return z.array(purchaseSchema.extend({ user: userSchema })).parse(
+				await client.query.purchases.findMany({
+					where: eq(purchaseTable.bulkCouponId, bulkCouponId),
+					with: {
+						user: true,
+					},
+				}),
+			)
+		},
 		async getCouponWithBulkPurchases(couponId: string): Promise<
 			| (Coupon & {
 					bulkPurchases?: Purchase[] | null
@@ -1543,11 +1562,11 @@ export function mySqlDrizzleAdapter(
 				id: newProductId,
 				name: input.name,
 				status: 1,
-				type: 'self-paced',
+				type: input.type || 'self-paced',
 				quantityAvailable: input.quantityAvailable,
 				fields: {
-					state: 'draft',
-					visibility: 'unlisted',
+					state: input.state || 'draft',
+					visibility: input.visibility || 'unlisted',
 					slug: slugify(`${input.name}-${hash}`),
 				},
 			}
@@ -1772,6 +1791,7 @@ export function mySqlDrizzleAdapter(
 						sourceUser: userSchema,
 						targetUser: userSchema.nullable(),
 						purchase: purchaseSchema,
+						organizationId: z.string().nullable(),
 					}),
 				)
 				.nullable()
@@ -2736,6 +2756,10 @@ export function mySqlDrizzleAdapter(
 						),
 						eq(organizationMembershipTable.userId, options.userId),
 					),
+					with: {
+						organization: true,
+						user: true,
+					},
 				})
 
 			if (currentMembership) {