@coursebuilder/adapter-drizzle 0.4.0 → 0.5.0

package/dist/{chunk-A26D3TCA.js → chunk-Z245DYMP.js}

@@ -1,28 +1,41 @@
+import {
+  getLessonProgressSchema
+} from "./chunk-YVVXDJHI.js";
 import {
   getResourceProgressSchema
-} from "./chunk-FNYW3XKR.js";
+} from "./chunk-XIGJFVUM.js";
+import {
+  getPurchaseUserTransferRelationsSchema,
+  getPurchaseUserTransferSchema
+} from "./chunk-CQNKTFXE.js";
 import {
   getUpgradableProductsRelationsSchema,
   getUpgradableProductsSchema
-} from "./chunk-ULEUIL2Y.js";
+} from "./chunk-BM5UKWXI.js";
 import {
-  getPurchaseUserTransferRelationsSchema,
-  getPurchaseUserTransferSchema
-} from "./chunk-IDINCRHK.js";
+  getRolePermissionsRelationsSchema,
+  getRolePermissionsSchema
+} from "./chunk-O6JECJRY.js";
 import {
   getSessionRelationsSchema,
   getSessionsSchema
-} from "./chunk-DL3UMWB4.js";
+} from "./chunk-TBM3AK3P.js";
 import {
   getVerificationTokensSchema
-} from "./chunk-MBB4GIJI.js";
+} from "./chunk-LERR6HQ3.js";
 import {
-  getRolePermissionsRelationsSchema,
-  getRolePermissionsSchema
-} from "./chunk-XJHSXR42.js";
+  getDeviceAccessTokenRelationsSchema,
+  getDeviceAccessTokenSchema
+} from "./chunk-QTGVGIRO.js";
+import {
+  getDeviceVerificationRelationsSchema,
+  getDeviceVerificationSchema
+} from "./chunk-JZQ666KH.js";
 import {
   getAccountsRelationsSchema,
   getAccountsSchema,
+  getCommentRelationsSchema,
+  getCommentsSchema,
   getCommunicationPreferencesRelationsSchema,
   getCommunicationPreferencesSchema,
   getContentContributionRelationsSchema,
@@ -44,47 +57,49 @@ import {
   getRolesSchema,
   getUserPermissionsRelationsSchema,
   getUserPermissionsSchema,
+  getUserPrefsRelationsSchema,
+  getUserPrefsSchema,
   getUserRolesRelationsSchema,
   getUserRolesSchema,
   getUsersRelationsSchema,
   getUsersSchema
-} from "./chunk-N7UDJAI3.js";
+} from "./chunk-FRA4ZCRA.js";
 import {
   getContributionTypesRelationsSchema,
   getContributionTypesSchema
-} from "./chunk-GLPDG7UE.js";
+} from "./chunk-KDEWFXEP.js";
 import {
   getCommunicationChannelSchema
-} from "./chunk-J4LBG2TH.js";
+} from "./chunk-GINRTL6J.js";
 import {
   getCommunicationPreferenceTypesSchema
-} from "./chunk-BX5SO2JG.js";
-import {
-  getMerchantCouponSchema
-} from "./chunk-JKOYOL7A.js";
-import {
-  getMerchantPriceSchema
-} from "./chunk-PPBEA4EM.js";
-import {
-  getMerchantSessionSchema
-} from "./chunk-V23SCQL7.js";
+} from "./chunk-P4VXXTVA.js";
 import {
   getMerchantChargeRelationsSchema,
   getMerchantChargeSchema
-} from "./chunk-ZD3R6UPJ.js";
+} from "./chunk-SRTIWWLG.js";
+import {
+  getMerchantAccountSchema
+} from "./chunk-QP6YMUQX.js";
+import {
+  getMerchantCouponSchema
+} from "./chunk-YGRYHMCG.js";
 import {
   getMerchantCustomerSchema
-} from "./chunk-57CX5SOI.js";
+} from "./chunk-2UU2F4DM.js";
+import {
+  getMerchantPriceSchema
+} from "./chunk-6ON2O6UD.js";
 import {
   getMerchantProductSchema
-} from "./chunk-Y7QZGEPT.js";
+} from "./chunk-4ZWS76VQ.js";
 import {
-  getMerchantAccountSchema
-} from "./chunk-VXZRMVNY.js";
+  getMerchantSessionSchema
+} from "./chunk-3NUCFLQJ.js";
 import {
   getPermissionsRelationsSchema,
   getPermissionsSchema
-} from "./chunk-VDVCCU7D.js";
+} from "./chunk-LZHZDFNZ.js";
 import {
   __name
 } from "./chunk-H736K5TN.js";
@@ -8295,10 +8310,10 @@ var purchaseUserTransferSchema = z2.object({
   completedAt: z2.date().nullable()
 });
 
-// ../core/dist/chunk-GCYJ74DO.js
+// ../core/dist/chunk-K6G2HAJT.js
 var resourceProgressSchema = z2.object({
   userId: z2.string().max(191),
-  contentResourceId: z2.string().max(191).optional().nullable(),
+  resourceId: z2.string().max(191).optional().nullable(),
   fields: z2.record(z2.any()).default({}),
   completedAt: z2.date().nullable(),
   updatedAt: z2.date().nullable(),
@@ -8323,7 +8338,7 @@ var upgradableProductSchema = z2.object({
   deletedAt: z2.date().nullable()
 });
 
-// ../core/dist/chunk-G22WGQ3G.js
+// ../core/dist/chunk-5QZXOTEH.js
 var VideoResourceSchema = z2.object({
   id: z2.string(),
   updatedAt: z2.string().optional(),
@@ -8341,7 +8356,8 @@ var VideoResourceSchema = z2.object({
     "processing",
     "preparing",
     "ready",
-    "errored"
+    "errored",
+    "deleted"
   ])
 });
 
@@ -8561,6 +8577,7 @@ function getCourseBuilderSchema(mysqlTable) {
     verificationTokens: getVerificationTokensSchema(mysqlTable),
     coupon: getCouponSchema(mysqlTable),
     couponRelations: getCouponRelationsSchema(mysqlTable),
+    lessonProgress: getLessonProgressSchema(mysqlTable),
     merchantAccount: getMerchantAccountSchema(mysqlTable),
     merchantCharge: getMerchantChargeSchema(mysqlTable),
     merchantChargeRelations: getMerchantChargeRelationsSchema(mysqlTable),
@@ -8592,7 +8609,15 @@ function getCourseBuilderSchema(mysqlTable) {
     upgradableProductsRelations: getUpgradableProductsRelationsSchema(mysqlTable),
     contentResourceProduct: getContentResourceProductSchema(mysqlTable),
     contentResourceProductRelations: getContentResourceProductRelationsSchema(mysqlTable),
-    productRelations: getProductRelationsSchema(mysqlTable)
+    productRelations: getProductRelationsSchema(mysqlTable),
+    comments: getCommentsSchema(mysqlTable),
+    commentsRelations: getCommentRelationsSchema(mysqlTable),
+    deviceVerifications: getDeviceVerificationSchema(mysqlTable),
+    deviceVerificationRelations: getDeviceVerificationRelationsSchema(mysqlTable),
+    deviceAccessToken: getDeviceAccessTokenSchema(mysqlTable),
+    deviceAccessTokenRelations: getDeviceAccessTokenRelationsSchema(mysqlTable),
+    userPrefs: getUserPrefsSchema(mysqlTable),
+    userPrefsRelations: getUserPrefsRelationsSchema(mysqlTable)
   };
 }
 __name(getCourseBuilderSchema, "getCourseBuilderSchema");
@@ -8601,7 +8626,7 @@ function createTables(mySqlTable) {
 }
 __name(createTables, "createTables");
 function mySqlDrizzleAdapter(client, tableFn = defaultMySqlTableFn) {
-  const { users, accounts, sessions, verificationTokens, contentResource, contentResourceResource, purchases: purchaseTable, purchaseUserTransfer, coupon, merchantCoupon, merchantCharge, merchantAccount, merchantPrice, merchantCustomer, merchantSession, merchantProduct, prices, products, upgradableProducts, resourceProgress } = createTables(tableFn);
+  const { users, accounts, sessions, verificationTokens, contentResource, contentResourceResource, purchases: purchaseTable, purchaseUserTransfer, coupon, merchantCoupon, merchantCharge, merchantAccount, merchantPrice, merchantCustomer, merchantSession, merchantProduct, prices, products, upgradableProducts, resourceProgress, comments } = createTables(tableFn);
   const adapter = {
     client,
     async redeemFullPriceCoupon(options) {
@@ -8738,7 +8763,7 @@ function mySqlDrizzleAdapter(client, tableFn = defaultMySqlTableFn) {
         throw new Error("No lessonId provided");
       }
       let lessonProgress = await client.query.resourceProgress.findFirst({
-        where: and(eq(resourceProgress.userId, options.userId), eq(resourceProgress.contentResourceId, options.lessonId))
+        where: and(eq(resourceProgress.userId, options.userId), eq(resourceProgress.resourceId, options.lessonId))
       });
       const now = /* @__PURE__ */ new Date();
       if (lessonProgress) {
@@ -8746,18 +8771,18 @@ function mySqlDrizzleAdapter(client, tableFn = defaultMySqlTableFn) {
           await client.update(resourceProgress).set({
             completedAt: now,
             updatedAt: now
-          }).where(eq(resourceProgress.contentResourceId, options.lessonId));
+          }).where(eq(resourceProgress.resourceId, options.lessonId));
         }
       } else {
         await client.insert(resourceProgress).values({
           userId: options.userId,
-          contentResourceId: options.lessonId,
+          resourceId: options.lessonId,
           completedAt: now,
           updatedAt: now
         });
       }
       lessonProgress = await client.query.resourceProgress.findFirst({
-        where: and(eq(resourceProgress.userId, options.userId), eq(resourceProgress.contentResourceId, options.lessonId))
+        where: and(eq(resourceProgress.userId, options.userId), eq(resourceProgress.resourceId, options.lessonId))
       });
       const parsedLessonProgress = resourceProgressSchema.safeParse(lessonProgress);
       if (!parsedLessonProgress.success) {
@@ -8777,9 +8802,14 @@ function mySqlDrizzleAdapter(client, tableFn = defaultMySqlTableFn) {
       });
       if (!couponForIdOrCode)
         return null;
-      return couponSchema.extend({
+      const parsedCoupon = couponSchema.extend({
         merchantCoupon: merchantCouponSchema
-      }).parse(couponForIdOrCode);
+      }).safeParse(couponForIdOrCode);
+      if (!parsedCoupon.success) {
+        console.error("Error parsing coupon", JSON.stringify(parsedCoupon.error));
+        return null;
+      }
+      return parsedCoupon.data;
     },
     async createMerchantChargeAndPurchase(options) {
       const purchaseId = await client.transaction(async (trx) => {
@@ -8816,7 +8846,7 @@ function mySqlDrizzleAdapter(client, tableFn = defaultMySqlTableFn) {
             ]))
           }) || null);
           const existingBulkCoupon = couponSchema.nullable().parse(await client.select().from(coupon).leftJoin(purchaseTable, and(eq(coupon.id, purchaseTable.bulkCouponId), eq(purchaseTable.userId, userId))).where(and(eq(coupon.restrictedToProductId, productId), eq(purchaseTable.userId, userId))).then((res) => {
-            return res[0]?.coupons ?? null;
+            return res[0]?.Coupon ?? null;
           }));
           const isBulkPurchase = quantity > 1 || Boolean(existingBulkCoupon) || options.bulk || Boolean(existingPurchase?.status === "Valid");
           let bulkCouponId = null;
@@ -9007,22 +9037,67 @@ function mySqlDrizzleAdapter(client, tableFn = defaultMySqlTableFn) {
       return parsed.data;
     },
     async getModuleProgressForUser(userIdOrEmail, moduleIdOrSlug) {
+      const ALLOWED_MODULE_RESOURCE_TYPES = [
+        "lesson",
+        "exercise",
+        "solution"
+      ];
+      const COUNTABLE_MODULE_RESOURCE_TYPES = [
+        "lesson",
+        "exercise"
+      ];
       const module = await client.query.contentResource.findFirst({
         where: or(eq(contentResource.id, moduleIdOrSlug), eq(sql`JSON_EXTRACT (${contentResource.fields}, "$.slug")`, moduleIdOrSlug)),
         with: {
           resources: {
+            with: {
+              resource: {
+                with: {
+                  resources: {
+                    with: {
+                      resource: {
+                        with: {
+                          resources: {
+                            with: {
+                              resource: true
+                            }
+                          }
+                        }
+                      }
+                    },
+                    orderBy: asc(contentResourceResource.position)
+                  }
+                }
+              }
+            },
             orderBy: asc(contentResourceResource.position)
           }
         }
       });
       const parsedModule = ContentResourceSchema.parse(module);
-      const moduleResources = await client.query.contentResourceResource.findMany({
-        where: inArray(contentResourceResource.resourceOfId, parsedModule.resources?.map((r) => r.resourceId) ?? []),
-        orderBy: asc(contentResourceResource.position)
+      function flattenResources(resources) {
+        const result = [];
+        function recurse(resources2) {
+          for (const nestedResource of resources2) {
+            const resource = nestedResource.resource;
+            result.push(resource);
+            if (resource.resources) {
+              recurse(resource.resources);
+            }
+          }
+        }
+        __name(recurse, "recurse");
+        recurse(resources);
+        return result;
+      }
+      __name(flattenResources, "flattenResources");
+      const allResources = parsedModule?.resources && flattenResources(parsedModule.resources);
+      const filteredResources = allResources?.filter((resource) => {
+        return ALLOWED_MODULE_RESOURCE_TYPES.includes(resource.type);
       });
-      const parsedModuleResources = z.array(ContentResourceResourceSchema).safeParse(moduleResources);
-      if (!parsedModuleResources.success) {
-        console.error("Error parsing module resources", parsedModuleResources.error);
+      const parsedResources = z.array(ContentResourceSchema).safeParse(filteredResources);
+      if (!parsedResources.success) {
+        console.error("Error parsing module resources", parsedResources.error);
         return {
           completedLessons: [],
           nextResource: null,
@@ -9031,6 +9106,10 @@ function mySqlDrizzleAdapter(client, tableFn = defaultMySqlTableFn) {
           totalLessonsCount: 0
         };
       }
+      const progressResources = parsedResources.data.filter((r) => {
+        return COUNTABLE_MODULE_RESOURCE_TYPES.includes(r.type);
+      });
+      const totalLessonsCount = progressResources.length;
       const user = await client.query.users.findFirst({
         where: or(eq(users.id, userIdOrEmail), eq(users.email, userIdOrEmail)),
         with: {
@@ -9055,7 +9134,7 @@ function mySqlDrizzleAdapter(client, tableFn = defaultMySqlTableFn) {
           nextResource: null,
           percentCompleted: 0,
           completedLessonsCount: 0,
-          totalLessonsCount: parsedModuleResources.data.length
+          totalLessonsCount
         };
       }
       const parsedUser = userSchema.safeParse(user);
@@ -9066,14 +9145,16 @@ function mySqlDrizzleAdapter(client, tableFn = defaultMySqlTableFn) {
           nextResource: null,
           percentCompleted: 0,
           completedLessonsCount: 0,
-          totalLessonsCount: parsedModuleResources.data.length
+          totalLessonsCount
         };
       }
       const userProgress = await client.query.resourceProgress.findMany({
-        where: and(eq(resourceProgress.userId, parsedUser.data.id), isNotNull(resourceProgress.completedAt), inArray(resourceProgress.contentResourceId, parsedModuleResources.data.map((r) => r.resourceId))),
+        where: and(eq(resourceProgress.userId, parsedUser.data.id), isNotNull(resourceProgress.completedAt), inArray(resourceProgress.resourceId, progressResources.map((r) => r.id))),
         orderBy: asc(resourceProgress.completedAt)
       });
-      const nextResourceId = moduleResources.find((r) => !userProgress.find((p) => p.contentResourceId === r.resourceId))?.resourceId;
+      const nextResourceId = parsedResources.data.filter((r) => {
+        return COUNTABLE_MODULE_RESOURCE_TYPES.includes(r.type);
+      }).find((r) => !userProgress.find((p) => p.resourceId === r.id))?.id;
       const nextResource = await client.query.contentResource.findFirst({
         where: eq(contentResource.id, nextResourceId)
       });
@@ -9086,16 +9167,16 @@ function mySqlDrizzleAdapter(client, tableFn = defaultMySqlTableFn) {
           nextResource: null,
           percentCompleted: 0,
           completedLessonsCount: 0,
-          totalLessonsCount: parsedModuleResources.data.length
+          totalLessonsCount
         };
       }
-      const percentCompleted = Math.round(parsedProgress.data.length / parsedModuleResources.data.length * 100);
+      const percentCompleted = Math.round(parsedProgress.data.length / parsedResources.data.length * 100);
       return {
         completedLessons: parsedProgress.data,
         nextResource: parsedNextResource,
         percentCompleted,
         completedLessonsCount: parsedProgress.data.length,
-        totalLessonsCount: parsedModuleResources.data.length
+        totalLessonsCount
       };
     },
     getLessonProgresses() {
@@ -9155,6 +9236,14 @@ function mySqlDrizzleAdapter(client, tableFn = defaultMySqlTableFn) {
         where: eq(products.id, productId)
       }));
     },
+    async getPurchaseCountForProduct(productId) {
+      return await client.query.purchases.findMany({
+        where: and(eq(purchaseTable.productId, productId), inArray(purchaseTable.status, [
+          "Valid",
+          "Restricted"
+        ]))
+      }).then((res) => res.length);
+    },
     async getPurchase(purchaseId) {
       const purchase = await client.query.purchases.findFirst({
         where: eq(purchaseTable.id, purchaseId)
@@ -9360,24 +9449,24 @@ function mySqlDrizzleAdapter(client, tableFn = defaultMySqlTableFn) {
         throw new Error("No lessonId provided");
       }
       let lessonProgress = await client.query.resourceProgress.findFirst({
-        where: and(eq(resourceProgress.userId, options.userId), eq(resourceProgress.contentResourceId, options.lessonId))
+        where: and(eq(resourceProgress.userId, options.userId), eq(resourceProgress.resourceId, options.lessonId))
       });
       const now = /* @__PURE__ */ new Date();
       if (lessonProgress) {
         await client.update(resourceProgress).set({
           completedAt: lessonProgress.completedAt ? null : now,
           updatedAt: now
-        }).where(eq(resourceProgress.contentResourceId, options.lessonId));
+        }).where(eq(resourceProgress.resourceId, options.lessonId));
       } else {
         await client.insert(resourceProgress).values({
           userId: options.userId,
-          contentResourceId: options.lessonId,
+          resourceId: options.lessonId,
           completedAt: now,
           updatedAt: now
         });
       }
       lessonProgress = await client.query.resourceProgress.findFirst({
-        where: and(eq(resourceProgress.userId, options.userId), eq(resourceProgress.contentResourceId, options.lessonId))
+        where: and(eq(resourceProgress.userId, options.userId), eq(resourceProgress.resourceId, options.lessonId))
       });
       const parsedLessonProgress = resourceProgressSchema.safeParse(lessonProgress);
       if (!parsedLessonProgress.success) {
@@ -9537,7 +9626,15 @@ function mySqlDrizzleAdapter(client, tableFn = defaultMySqlTableFn) {
                 with: {
                   resources: {
                     with: {
-                      resource: true
+                      resource: {
+                        with: {
+                          resources: {
+                            with: {
+                              resource: true
+                            }
+                          }
+                        }
+                      }
                     },
                     orderBy: asc(contentResourceResource.position)
                   }
@@ -9603,7 +9700,7 @@ function mySqlDrizzleAdapter(client, tableFn = defaultMySqlTableFn) {
       if (!dbAccount) {
         return null;
       }
-      return dbAccount.user;
+      return dbAccount.User;
     },
     async deleteSession(sessionToken) {
       const session = await client.select().from(sessions).where(eq(sessions.sessionToken, sessionToken)).then((res) => res[0]) ?? null;
@@ -9655,4 +9752,4 @@ export {
   createTables,
   mySqlDrizzleAdapter
 };
-//# sourceMappingURL=chunk-A26D3TCA.js.map
+//# sourceMappingURL=chunk-Z245DYMP.js.map

package/dist/index.js

@@ -1,25 +1,28 @@
 import {
   createTables,
   mySqlDrizzleAdapter
-} from "./chunk-A26D3TCA.js";
-import "./chunk-FNYW3XKR.js";
-import "./chunk-ULEUIL2Y.js";
-import "./chunk-IDINCRHK.js";
-import "./chunk-DL3UMWB4.js";
-import "./chunk-MBB4GIJI.js";
-import "./chunk-XJHSXR42.js";
-import "./chunk-N7UDJAI3.js";
-import "./chunk-GLPDG7UE.js";
-import "./chunk-J4LBG2TH.js";
-import "./chunk-BX5SO2JG.js";
-import "./chunk-JKOYOL7A.js";
-import "./chunk-PPBEA4EM.js";
-import "./chunk-V23SCQL7.js";
-import "./chunk-ZD3R6UPJ.js";
-import "./chunk-57CX5SOI.js";
-import "./chunk-Y7QZGEPT.js";
-import "./chunk-VXZRMVNY.js";
-import "./chunk-VDVCCU7D.js";
+} from "./chunk-Z245DYMP.js";
+import "./chunk-YVVXDJHI.js";
+import "./chunk-XIGJFVUM.js";
+import "./chunk-CQNKTFXE.js";
+import "./chunk-BM5UKWXI.js";
+import "./chunk-O6JECJRY.js";
+import "./chunk-TBM3AK3P.js";
+import "./chunk-LERR6HQ3.js";
+import "./chunk-QTGVGIRO.js";
+import "./chunk-JZQ666KH.js";
+import "./chunk-FRA4ZCRA.js";
+import "./chunk-KDEWFXEP.js";
+import "./chunk-GINRTL6J.js";
+import "./chunk-P4VXXTVA.js";
+import "./chunk-SRTIWWLG.js";
+import "./chunk-QP6YMUQX.js";
+import "./chunk-YGRYHMCG.js";
+import "./chunk-2UU2F4DM.js";
+import "./chunk-6ON2O6UD.js";
+import "./chunk-4ZWS76VQ.js";
+import "./chunk-3NUCFLQJ.js";
+import "./chunk-LZHZDFNZ.js";
 import {
   __name
 } from "./chunk-H736K5TN.js";