@odla-ai/chapter 0.38.0 → 0.39.0

package/dist/worker/index.js

@@ -1198,10 +1198,10 @@ async function syncApplicationToCrm(deps, opts) {
   return recordId;
 }
 async function backfillCrm(deps) {
-  const [appsRes, usersRes] = await Promise.all([
-    deps.db.query({ applications: { $: { order: { createdAt: "desc" }, limit: 1e3 } } }),
-    deps.db.query({ $users: { $: { limit: 1e3 } } })
-  ]);
+  const data = await deps.db.query({
+    applications: { $: { order: { createdAt: "desc" }, limit: 1e3 } },
+    $users: { $: { limit: 1e3 } }
+  });
   const seen = /* @__PURE__ */ new Set();
   let synced = 0;
   const errors = [];
@@ -1216,8 +1216,8 @@ async function backfillCrm(deps) {
       errors.push({ email: key, error: err instanceof Error ? err.message : String(err) });
     }
   };
-  for (const a of appsRes.applications ?? []) await run(a, str(a.status));
-  for (const u of usersRes.$users ?? []) {
+  for (const a of data.applications ?? []) await run(a, str(a.status));
+  for (const u of data.$users ?? []) {
     if (u.deleted === true) continue;
     await run({ email: u.email, firstName: str(u.name) });
   }
@@ -3346,9 +3346,21 @@ function webhookMutationId(eventId) {
 function findApplicationRef(obj) {
   const metaOf = (v) => v && typeof v === "object" ? v.metadata ?? {} : {};
   const pick = (m) => typeof m.applicationId === "string" ? m.applicationId : void 0;
-  const applicationId = pick(metaOf(obj)) ?? pick(metaOf(obj.subscription_details)) ?? pick(metaOf(obj.parent?.subscription_details));
+  const candidates = [
+    metaOf(obj),
+    metaOf(obj.subscription_details),
+    metaOf(obj.parent?.subscription_details)
+  ];
+  const applicationId = candidates.map(pick).find(Boolean);
+  const appId = candidates.map((metadata) => typeof metadata.odlaAppId === "string" ? metadata.odlaAppId : void 0).find(Boolean);
+  const environment = candidates.map((metadata) => typeof metadata.odlaEnvironment === "string" ? metadata.odlaEnvironment : void 0).find(Boolean);
   const customerId = typeof obj.customer === "string" ? obj.customer : void 0;
-  return { ...applicationId ? { applicationId } : {}, ...customerId ? { customerId } : {} };
+  return {
+    ...applicationId ? { applicationId } : {},
+    ...customerId ? { customerId } : {},
+    ...appId ? { appId } : {},
+    ...environment ? { environment } : {}
+  };
 }
 function findGiftRef(obj) {
   const metaOf = (value) => value && typeof value === "object" ? value.metadata ?? {} : {};
@@ -3439,7 +3451,13 @@ function createStripeProvider(config) {
   return {
     async createSubscription(input) {
       const sk = requireSecret(secretKey);
-      const meta = { applicationId: input.applicationId, groupId: input.groupId, email: input.email };
+      const meta = {
+        applicationId: input.applicationId,
+        groupId: input.groupId,
+        email: input.email,
+        odlaAppId: input.appId,
+        odlaEnvironment: input.environment
+      };
       let customerId = input.existingCustomerId;
       if (!customerId) {
         const cust = await stripeCall(
@@ -3959,6 +3977,8 @@ async function startSubscription(req, env, ctx) {
   let result;
   try {
     result = await provider.createSubscription({
+      appId: env.ODLA_APP_ID,
+      environment: env.ODLA_ENV,
       applicationId,
       groupId: String(group.id),
       email: String(app.email ?? ""),
@@ -3988,6 +4008,10 @@ async function ingestWebhook(req, env, ctx) {
   if (!ingest.ok) return json({ error: "invalid signature" }, 400);
   const { eventId, event } = ingest;
   if (event.kind === "ignored") return json({ ok: true, ignored: event.type });
+  const identifiedEnvironment = event.appId !== void 0 || event.environment !== void 0;
+  if (env.ODLA_APP_ID && identifiedEnvironment && (event.appId !== env.ODLA_APP_ID || event.environment !== env.ODLA_ENV)) {
+    return json({ ok: true, matched: false });
+  }
   if (event.kind === "gift_paid" || event.kind === "gift_revoked") {
     const intent = await firstRow2(db, "giftPurchaseIntents", { where: { id: event.giftIntentId }, limit: 1 });
     if (!intent || intent.chapterId !== ctx.chapter.id || intent.environment !== env.ODLA_ENV) {
@@ -4342,14 +4366,16 @@ var handleAdminPeople = async (req, url, env, ctx) => {
   if (gate9 instanceof Response) return gate9;
   const { db } = gate9;
   const sk = await getVaultSecret(db, "clerk_secret_key");
-  const [appsRes, usersRes, roleList] = await Promise.all([
-    db.query({ applications: { $: { order: { createdAt: "desc" }, limit: 200 } } }),
-    db.query({ $users: { $: { limit: 200 } } }),
+  const [data, roleList] = await Promise.all([
+    db.query({
+      applications: { $: { order: { createdAt: "desc" }, limit: 200 } },
+      $users: { $: { limit: 200 } }
+    }),
     sk ? clerkListUsers(sk).catch(() => []) : Promise.resolve([])
   ]);
   const clerkByUserId = new Map(roleList.map((u) => [u.id, u]));
   const people = /* @__PURE__ */ new Map();
-  for (const u of usersRes.$users ?? []) {
+  for (const u of data.$users ?? []) {
     if (u.deleted === true) continue;
     const email = typeof u.email === "string" ? u.email : "";
     if (!email) continue;
@@ -4364,7 +4390,7 @@ var handleAdminPeople = async (req, url, env, ctx) => {
       application: null
     });
   }
-  for (const a of appsRes.applications ?? []) {
+  for (const a of data.applications ?? []) {
     const key = String(a.email ?? "").toLowerCase();
     if (!key) continue;
     const name = `${a.firstName ?? ""} ${a.lastName ?? ""}`.trim();
@@ -4569,13 +4595,19 @@ var handleAdminDashboard = async (req, url, env, ctx) => {
   const now = Date.now();
   const d7 = now - 7 * 864e5;
   const d30 = now - 30 * 864e5;
-  const [appsRes, meetingsRes, recsRes, groupRes] = await Promise.all([
-    db.query({ applications: { $: { order: { createdAt: "desc" }, limit: 1e3 } } }),
-    db.query({ meetings: { $: { where: { status: "scheduled" }, order: { startAt: "asc" }, limit: 500 } } }),
-    db.query({ crm_record: { $: { where: { type: "person" }, limit: 1e3 } } }),
-    db.query({ groups: { $: { where: { id: ctx.chapter.id }, limit: 1 } } })
-  ]);
-  const apps = rows3(appsRes.applications);
+  const data = await db.query({
+    applications: { $: { order: { createdAt: "desc" }, limit: 1e3 } },
+    meetings: {
+      $: {
+        where: { status: "scheduled" },
+        order: { startAt: "asc" },
+        limit: 500
+      }
+    },
+    crm_record: { $: { where: { type: "person" }, limit: 1e3 } },
+    groups: { $: { where: { id: ctx.chapter.id }, limit: 1 } }
+  });
+  const apps = rows3(data.applications);
   const applications = {
     total: apps.length,
     last7: apps.filter((a) => a.createdAt >= d7).length,
@@ -4587,7 +4619,7 @@ var handleAdminDashboard = async (req, url, env, ctx) => {
     pipeline[s] = 0;
     pipelineDelta[s] = 0;
   }
-  for (const r of rows3(recsRes.crm_record)) {
+  for (const r of rows3(data.crm_record)) {
     const s = r.stage;
     if (s in pipeline) {
       pipeline[s] = (pipeline[s] ?? 0) + 1;
@@ -4595,7 +4627,7 @@ var handleAdminDashboard = async (req, url, env, ctx) => {
       if (Number.isFinite(sc) && sc >= d7) pipelineDelta[s] = (pipelineDelta[s] ?? 0) + 1;
     }
   }
-  const meetings = rows3(meetingsRes.meetings);
+  const meetings = rows3(data.meetings);
   const appById = new Map(apps.map((a) => [a.id, a]));
   const upcoming = meetings.filter((m) => m.startAt >= now - 36e5);
   const calls = { upcoming: upcoming.length, needsAttention: meetings.filter((m) => m.drift && m.drift !== "none").length };
@@ -4611,7 +4643,7 @@ var handleAdminDashboard = async (req, url, env, ctx) => {
       email: a?.email ?? null
     };
   });
-  const group = groupRes.groups?.[0];
+  const group = data.groups?.[0];
   const timezone = resolveScheduling(group?.schedulingJson).timezone;
   let revenue = { billingReady: false };
   let revenueSeries = null;
@@ -4645,16 +4677,18 @@ var handleAdminBilling = async (req, url, env, ctx) => {
   const db = got;
   const sk = await getVaultSecret(db, "stripe_secret_key");
   if (!sk) return json({ billingReady: false, rows: [], summary: null });
-  const [appsRes, subsRes, groupRes] = await Promise.all([
-    db.query({ applications: { $: { order: { createdAt: "desc" }, limit: 200 } } }),
-    stripeCall(sk, "GET", "/v1/subscriptions", { limit: 100, status: "all" }),
-    db.query({ groups: { $: { where: { id: ctx.chapter.id }, limit: 1 } } })
+  const [data, subsRes] = await Promise.all([
+    db.query({
+      applications: { $: { order: { createdAt: "desc" }, limit: 200 } },
+      groups: { $: { where: { id: ctx.chapter.id }, limit: 1 } }
+    }),
+    stripeCall(sk, "GET", "/v1/subscriptions", { limit: 100, status: "all" })
   ]);
-  const testMode = String(groupRes.groups?.[0]?.stripePublishableKey ?? "").startsWith("pk_test");
+  const testMode = String(data.groups?.[0]?.stripePublishableKey ?? "").startsWith("pk_test");
   if (!subsRes.ok) return json({ error: "billing lookup failed upstream" }, 502);
   const subById = new Map(rows3(subsRes.body.data).map((s) => [s.id, s]));
   const billingRows = [];
-  for (const a of rows3(appsRes.applications)) {
+  for (const a of rows3(data.applications)) {
     if (!a.stripeCustomerId && !a.stripeSubscriptionId) continue;
     const sub = a.stripeSubscriptionId ? subById.get(a.stripeSubscriptionId) : void 0;
     const items = sub?.items?.data ?? [];
@@ -4994,21 +5028,27 @@ var handleAdminComms = async (req, url, env, ctx) => {
   if (got instanceof Response) return got;
   const db = got;
   const appId = m[1];
-  const [emailRes, meetingRes, appRes] = await Promise.all([
-    db.query({ emailLog: { $: { where: { applicationId: appId }, order: { sentAt: "desc" }, limit: 100 } } }),
-    db.query({ meetings: { $: { where: { applicationId: appId } } } }),
-    db.query({ applications: { $: { where: { id: appId }, limit: 1 } } })
-  ]);
-  const app = appRes.applications?.[0] ?? null;
+  const data = await db.query({
+    emailLog: {
+      $: {
+        where: { applicationId: appId },
+        order: { sentAt: "desc" },
+        limit: 100
+      }
+    },
+    meetings: { $: { where: { applicationId: appId } } },
+    applications: { $: { where: { id: appId }, limit: 1 } }
+  });
+  const app = data.applications?.[0] ?? null;
   const group = await loadGroup2(db, str2(app?.groupId, ctx.chapter.id));
   const vars = app ? { firstName: str2(app.firstName), lastName: str2(app.lastName), email: str2(app.email), phone: str2(app.phone), state: str2(app.state), adminUrl: `${url.origin}/admin/`, membersUrl: `${url.origin}/members/` } : null;
-  const emails = (emailRes.emailLog ?? []).filter((r) => r.template !== "adminNotification").map((r) => {
+  const emails = (data.emailLog ?? []).filter((r) => r.template !== "adminNotification").map((r) => {
     let mailBody = typeof r.body === "string" ? r.body : null;
     if (!mailBody && group && vars) mailBody = renderTemplateBody(emailGroupFrom(group), String(r.template), vars);
     const channel = r.error ? "email (failed)" : r.redirected ? "email (dev-redirected)" : r.transport === "log-only" ? "email (not delivered)" : "email";
     return { kind: "email", channel, label: String(r.template), subject: str2(r.subject), to: r.to ?? null, body: mailBody, at: r.sentAt, error: r.error ?? null };
   });
-  const calendar = (meetingRes.meetings ?? []).map((m2) => ({
+  const calendar = (data.meetings ?? []).map((m2) => ({
     kind: "calendar",
     channel: "Google Calendar",
     label: m2.status === "cancelled" ? "Invitation (call later cancelled)" : "Meeting invitation",