@coursebuilder/adapter-drizzle 0.3.0 → 0.4.0

package/dist/lib/mysql/index.cjs

@@ -2305,10 +2305,10 @@ var _ZodObject = class _ZodObject extends ZodType {
   //   }) as any;
   //   return merged;
   // }
-  catchall(index18) {
+  catchall(index19) {
     return new _ZodObject({
       ...this._def,
-      catchall: index18
+      catchall: index19
     });
   }
   pick(mask) {
@@ -2623,9 +2623,9 @@ function mergeValues(a, b) {
       return { valid: false };
     }
     const newArray = [];
-    for (let index18 = 0; index18 < a.length; index18++) {
-      const itemA = a[index18];
-      const itemB = b[index18];
+    for (let index19 = 0; index19 < a.length; index19++) {
+      const itemA = a[index19];
+      const itemB = b[index19];
       const sharedValue = mergeValues(itemA, itemB);
       if (!sharedValue.valid) {
         return { valid: false };
@@ -2837,10 +2837,10 @@ var _ZodMap = class _ZodMap extends ZodType {
     }
     const keyType = this._def.keyType;
     const valueType = this._def.valueType;
-    const pairs = [...ctx.data.entries()].map(([key, value], index18) => {
+    const pairs = [...ctx.data.entries()].map(([key, value], index19) => {
       return {
-        key: keyType._parse(new ParseInputLazyPath(ctx, key, ctx.path, [index18, "key"])),
-        value: valueType._parse(new ParseInputLazyPath(ctx, value, ctx.path, [index18, "value"]))
+        key: keyType._parse(new ParseInputLazyPath(ctx, key, ctx.path, [index19, "key"])),
+        value: valueType._parse(new ParseInputLazyPath(ctx, value, ctx.path, [index19, "value"]))
       };
     });
     if (ctx.common.async) {
@@ -6338,10 +6338,10 @@ var _ZodObject2 = (_a18 = class extends ZodType2 {
   //   }) as any;
   //   return merged;
   // }
-  catchall(index18) {
+  catchall(index19) {
     return new _a18({
       ...this._def,
-      catchall: index18
+      catchall: index19
     });
   }
   pick(mask) {
@@ -6683,9 +6683,9 @@ function mergeValues2(a, b) {
       };
     }
     const newArray = [];
-    for (let index18 = 0; index18 < a.length; index18++) {
-      const itemA = a[index18];
-      const itemB = b[index18];
+    for (let index19 = 0; index19 < a.length; index19++) {
+      const itemA = a[index19];
+      const itemB = b[index19];
       const sharedValue = mergeValues2(itemA, itemB);
       if (!sharedValue.valid) {
         return {
@@ -6919,14 +6919,14 @@ var _ZodMap2 = (_a24 = class extends ZodType2 {
     const valueType = this._def.valueType;
     const pairs = [
       ...ctx.data.entries()
-    ].map(([key, value], index18) => {
+    ].map(([key, value], index19) => {
       return {
         key: keyType._parse(new ParseInputLazyPath2(ctx, key, ctx.path, [
-          index18,
+          index19,
           "key"
         ])),
         value: valueType._parse(new ParseInputLazyPath2(ctx, value, ctx.path, [
-          index18,
+          index19,
           "value"
         ]))
       };
@@ -8044,26 +8044,38 @@ var z2 = /* @__PURE__ */ Object.freeze({
   ZodError: ZodError2
 });
 
-// ../core/dist/chunk-LMH5A7OR.js
-var purchaseUserTransferSchema = z2.object({
+// ../core/dist/chunk-CHYUPSYW.js
+var userSchema = z2.object({
+  id: z2.string().max(255),
+  name: z2.string().max(255).optional().nullable(),
+  role: z2.enum([
+    "user",
+    "admin"
+  ]).default("user"),
+  email: z2.string().max(255).email(),
+  emailVerified: z2.coerce.date().nullable(),
+  image: z2.string().max(255).optional().nullable(),
+  createdAt: z2.coerce.date().nullable(),
+  roles: z2.array(z2.object({
+    id: z2.string(),
+    name: z2.string(),
+    description: z2.string().nullable(),
+    active: z2.boolean()
+  })).optional().default([])
+});
+
+// ../core/dist/chunk-47RWEDJ6.js
+var priceSchema = z2.object({
   id: z2.string().max(191),
-  transferState: z2.enum([
-    "AVAILABLE",
-    "INITIATED",
-    "VERIFIED",
-    "CANCELED",
-    "EXPIRED",
-    "CONFIRMED",
-    "COMPLETED"
-  ]).default("AVAILABLE"),
-  purchaseId: z2.string().max(191),
-  sourceUserId: z2.string().max(191),
-  targetUserId: z2.string().max(191).optional().nullable(),
+  productId: z2.string().max(191).optional().nullable(),
+  nickname: z2.string().max(191).optional().nullable(),
+  status: z2.number().int().default(0),
+  unitAmount: z2.coerce.number().refine((value) => {
+    const decimalPlaces = value.toString().split(".")[1]?.length || 0;
+    return decimalPlaces <= 2;
+  }),
   createdAt: z2.date().nullable(),
-  expiresAt: z2.date().nullable(),
-  canceledAt: z2.date().nullable(),
-  confirmedAt: z2.date().nullable(),
-  completedAt: z2.date().nullable()
+  fields: z2.record(z2.any()).default({})
 });
 
 // ../core/dist/chunk-YYIPQN6H.js
@@ -8110,111 +8122,6 @@ var ResourceVisibilitySchema = z2.union([
   z2.literal("unlisted")
 ]);
 
-// ../core/dist/chunk-GCYJ74DO.js
-var resourceProgressSchema = z2.object({
-  userId: z2.string().max(191),
-  contentResourceId: z2.string().max(191).optional().nullable(),
-  fields: z2.record(z2.any()).default({}),
-  completedAt: z2.date().nullable(),
-  updatedAt: z2.date().nullable(),
-  createdAt: z2.date().nullable()
-});
-var moduleProgressSchema = z2.object({
-  completedLessons: z2.array(resourceProgressSchema),
-  nextResource: ContentResourceSchema.nullable(),
-  percentCompleted: z2.number().default(0),
-  completedLessonsCount: z2.number().default(0),
-  totalLessonsCount: z2.number().default(0)
-});
-
-// ../core/dist/chunk-DLQA3JMA.js
-var upgradableProductSchema = z2.object({
-  upgradableToId: z2.string().max(255),
-  upgradableFromId: z2.string().max(255),
-  position: z2.number().default(0),
-  metadata: z2.record(z2.any()).default({}),
-  createdAt: z2.date().nullable(),
-  updatedAt: z2.date().nullable(),
-  deletedAt: z2.date().nullable()
-});
-
-// ../core/dist/chunk-G22WGQ3G.js
-var VideoResourceSchema = z2.object({
-  id: z2.string(),
-  updatedAt: z2.string().optional(),
-  createdAt: z2.string().optional(),
-  title: z2.string().optional().nullable(),
-  duration: z2.number().optional().nullable(),
-  muxPlaybackId: z2.string().optional().nullable(),
-  muxAssetId: z2.string().optional().nullable(),
-  transcript: z2.string().optional().nullable(),
-  transcriptWithScreenshots: z2.string().optional().nullable(),
-  srt: z2.string().optional().nullable(),
-  wordLevelSrt: z2.string().optional().nullable(),
-  state: z2.enum([
-    "new",
-    "processing",
-    "preparing",
-    "ready",
-    "errored"
-  ])
-});
-
-// ../core/dist/chunk-PS6USEN7.js
-var merchantPriceSchema = z2.object({
-  id: z2.string().max(191),
-  merchantAccountId: z2.string().max(191),
-  merchantProductId: z2.string().max(191),
-  status: z2.number().int().default(0),
-  identifier: z2.string().max(191).optional().nullable(),
-  createdAt: z2.date(),
-  priceId: z2.string().max(191).optional().nullable()
-});
-
-// ../core/dist/chunk-DAG4HKGL.js
-var merchantProductSchema = z2.object({
-  id: z2.string().max(191),
-  merchantAccountId: z2.string().max(191),
-  productId: z2.string().max(191),
-  status: z2.number().int().default(0),
-  identifier: z2.string().max(191).optional().nullable(),
-  createdAt: z2.date().nullable()
-});
-
-// ../core/dist/chunk-CHYUPSYW.js
-var userSchema = z2.object({
-  id: z2.string().max(255),
-  name: z2.string().max(255).optional().nullable(),
-  role: z2.enum([
-    "user",
-    "admin"
-  ]).default("user"),
-  email: z2.string().max(255).email(),
-  emailVerified: z2.coerce.date().nullable(),
-  image: z2.string().max(255).optional().nullable(),
-  createdAt: z2.coerce.date().nullable(),
-  roles: z2.array(z2.object({
-    id: z2.string(),
-    name: z2.string(),
-    description: z2.string().nullable(),
-    active: z2.boolean()
-  })).optional().default([])
-});
-
-// ../core/dist/chunk-47RWEDJ6.js
-var priceSchema = z2.object({
-  id: z2.string().max(191),
-  productId: z2.string().max(191).optional().nullable(),
-  nickname: z2.string().max(191).optional().nullable(),
-  status: z2.number().int().default(0),
-  unitAmount: z2.coerce.number().refine((value) => {
-    const decimalPlaces = value.toString().split(".")[1]?.length || 0;
-    return decimalPlaces <= 2;
-  }),
-  createdAt: z2.date().nullable(),
-  fields: z2.record(z2.any()).default({})
-});
-
 // ../core/dist/chunk-DGMGNBW7.js
 var productSchema = z2.object({
   id: z2.string().max(191),
@@ -8302,16 +8209,76 @@ var purchaseSchema = z2.object({
   product: productSchema.optional().nullable()
 });
 
-// ../core/dist/chunk-SGE7BCRS.js
-var merchantChargeSchema = z2.object({
+// ../core/dist/chunk-LMH5A7OR.js
+var purchaseUserTransferSchema = z2.object({
   id: z2.string().max(191),
-  status: z2.number().int().default(0),
-  identifier: z2.string().max(191),
+  transferState: z2.enum([
+    "AVAILABLE",
+    "INITIATED",
+    "VERIFIED",
+    "CANCELED",
+    "EXPIRED",
+    "CONFIRMED",
+    "COMPLETED"
+  ]).default("AVAILABLE"),
+  purchaseId: z2.string().max(191),
+  sourceUserId: z2.string().max(191),
+  targetUserId: z2.string().max(191).optional().nullable(),
+  createdAt: z2.date().nullable(),
+  expiresAt: z2.date().nullable(),
+  canceledAt: z2.date().nullable(),
+  confirmedAt: z2.date().nullable(),
+  completedAt: z2.date().nullable()
+});
+
+// ../core/dist/chunk-GCYJ74DO.js
+var resourceProgressSchema = z2.object({
   userId: z2.string().max(191),
-  merchantAccountId: z2.string().max(191),
-  merchantProductId: z2.string().max(191),
+  contentResourceId: z2.string().max(191).optional().nullable(),
+  fields: z2.record(z2.any()).default({}),
+  completedAt: z2.date().nullable(),
+  updatedAt: z2.date().nullable(),
+  createdAt: z2.date().nullable()
+});
+var moduleProgressSchema = z2.object({
+  completedLessons: z2.array(resourceProgressSchema),
+  nextResource: ContentResourceSchema.nullable(),
+  percentCompleted: z2.number().default(0),
+  completedLessonsCount: z2.number().default(0),
+  totalLessonsCount: z2.number().default(0)
+});
+
+// ../core/dist/chunk-DLQA3JMA.js
+var upgradableProductSchema = z2.object({
+  upgradableToId: z2.string().max(255),
+  upgradableFromId: z2.string().max(255),
+  position: z2.number().default(0),
+  metadata: z2.record(z2.any()).default({}),
   createdAt: z2.date().nullable(),
-  merchantCustomerId: z2.string().max(191)
+  updatedAt: z2.date().nullable(),
+  deletedAt: z2.date().nullable()
+});
+
+// ../core/dist/chunk-G22WGQ3G.js
+var VideoResourceSchema = z2.object({
+  id: z2.string(),
+  updatedAt: z2.string().optional(),
+  createdAt: z2.string().optional(),
+  title: z2.string().optional().nullable(),
+  duration: z2.number().optional().nullable(),
+  muxPlaybackId: z2.string().optional().nullable(),
+  muxAssetId: z2.string().optional().nullable(),
+  transcript: z2.string().optional().nullable(),
+  transcriptWithScreenshots: z2.string().optional().nullable(),
+  srt: z2.string().optional().nullable(),
+  wordLevelSrt: z2.string().optional().nullable(),
+  state: z2.enum([
+    "new",
+    "processing",
+    "preparing",
+    "ready",
+    "errored"
+  ])
 });
 
 // ../core/dist/chunk-EDDT2FFU.js
@@ -8324,6 +8291,39 @@ var merchantCustomerSchema = z2.object({
   status: z2.number().int().default(0)
 });
 
+// ../core/dist/chunk-PS6USEN7.js
+var merchantPriceSchema = z2.object({
+  id: z2.string().max(191),
+  merchantAccountId: z2.string().max(191),
+  merchantProductId: z2.string().max(191),
+  status: z2.number().int().default(0),
+  identifier: z2.string().max(191).optional().nullable(),
+  createdAt: z2.date(),
+  priceId: z2.string().max(191).optional().nullable()
+});
+
+// ../core/dist/chunk-DAG4HKGL.js
+var merchantProductSchema = z2.object({
+  id: z2.string().max(191),
+  merchantAccountId: z2.string().max(191),
+  productId: z2.string().max(191),
+  status: z2.number().int().default(0),
+  identifier: z2.string().max(191).optional().nullable(),
+  createdAt: z2.date().nullable()
+});
+
+// ../core/dist/chunk-SGE7BCRS.js
+var merchantChargeSchema = z2.object({
+  id: z2.string().max(191),
+  status: z2.number().int().default(0),
+  identifier: z2.string().max(191),
+  userId: z2.string().max(191),
+  merchantAccountId: z2.string().max(191),
+  merchantProductId: z2.string().max(191),
+  createdAt: z2.date().nullable(),
+  merchantCustomerId: z2.string().max(191)
+});
+
 // ../core/dist/chunk-256SROW3.js
 var merchantCouponSchema = z2.object({
   id: z2.string().max(191),
@@ -8939,6 +8939,7 @@ function getCouponSchema(mysqlTable) {
     })
   }, (table) => {
     return {
+      couponIdCodeIndex: (0, import_mysql_core9.index)("Coupon_id_code_index").on(table.id, table.code),
       couponId: (0, import_mysql_core9.primaryKey)({
         columns: [
           table.id
@@ -10607,7 +10608,13 @@ function mySqlDrizzleAdapter(client, tableFn = import_mysql_core32.mysqlTable) {
       };
     },
     async getCoupon(couponIdOrCode) {
-      return couponSchema.nullable().parse(await client.select().from(coupon).where((0, import_drizzle_orm27.or)((0, import_drizzle_orm27.eq)(coupon.id, couponIdOrCode), (0, import_drizzle_orm27.eq)(coupon.code, couponIdOrCode))).then((res) => res[0] ?? null));
+      const loadedCoupon = await client.query.coupon.findFirst({
+        where: (0, import_drizzle_orm27.or)((0, import_drizzle_orm27.eq)(coupon.id, couponIdOrCode), (0, import_drizzle_orm27.eq)(coupon.code, couponIdOrCode))
+      }) || null;
+      logger.debug("loadedCoupon", {
+        loadedCoupon
+      });
+      return couponSchema.nullable().parse(loadedCoupon);
     },
     async getCouponWithBulkPurchases(couponId) {
       logger.debug("getCouponWithBulkPurchases", {
@@ -10707,7 +10714,18 @@ function mySqlDrizzleAdapter(client, tableFn = import_mysql_core32.mysqlTable) {
       const user = await client.query.users.findFirst({
         where: (0, import_drizzle_orm27.or)((0, import_drizzle_orm27.eq)(users.id, userIdOrEmail), (0, import_drizzle_orm27.eq)(users.email, userIdOrEmail)),
         with: {
-          roles: true
+          roles: {
+            with: {
+              role: true
+            }
+          }
+        }
+      }).then(async (res) => {
+        if (res) {
+          return {
+            ...res,
+            roles: res.roles.map((r) => r.role)
+          };
         }
       });
       if (!user) {
@@ -10720,9 +10738,19 @@ function mySqlDrizzleAdapter(client, tableFn = import_mysql_core32.mysqlTable) {
           totalLessonsCount: parsedModuleResources.data.length
         };
       }
-      const parsedUser = userSchema.parse(user);
+      const parsedUser = userSchema.safeParse(user);
+      if (!parsedUser.success) {
+        console.error("Error parsing user", parsedUser.error);
+        return {
+          completedLessons: [],
+          nextResource: null,
+          percentCompleted: 0,
+          completedLessonsCount: 0,
+          totalLessonsCount: parsedModuleResources.data.length
+        };
+      }
       const userProgress = await client.query.resourceProgress.findMany({
-        where: (0, import_drizzle_orm27.and)((0, import_drizzle_orm27.eq)(resourceProgress.userId, parsedUser.id), (0, import_drizzle_orm27.isNotNull)(resourceProgress.completedAt), (0, import_drizzle_orm27.inArray)(resourceProgress.contentResourceId, parsedModuleResources.data.map((r) => r.resourceId))),
+        where: (0, import_drizzle_orm27.and)((0, import_drizzle_orm27.eq)(resourceProgress.userId, parsedUser.data.id), (0, import_drizzle_orm27.isNotNull)(resourceProgress.completedAt), (0, import_drizzle_orm27.inArray)(resourceProgress.contentResourceId, parsedModuleResources.data.map((r) => r.resourceId))),
         orderBy: (0, import_drizzle_orm27.asc)(resourceProgress.completedAt)
       });
       const nextResourceId = moduleResources.find((r) => !userProgress.find((p) => p.contentResourceId === r.resourceId))?.resourceId;