@headless-lms/adapter-db 0.3.0 → 0.5.0

package/dist/repositories/notifications.js

@@ -1,66 +1,174 @@
-import { notificationPreferences, notifications } from "../schema/identity.js";
+import { notificationDeliveries, notifications } from "../schema/automations.js";
 import "../schema/index.js";
 import { translateDbErrors } from "./pg-errors.js";
-import { and, desc, eq, inArray, isNull, sql } from "drizzle-orm";
+import { and, arrayOverlaps, desc, eq, inArray, isNotNull, isNull, or, sql } from "drizzle-orm";
 //#region src/repositories/notifications.ts
+const n = notifications;
+const d = notificationDeliveries;
+function ref(type, id) {
+	return type && id ? {
+		type,
+		id
+	} : null;
+}
+function toStored(row) {
+	return {
+		id: row.id,
+		orgId: row.orgId,
+		userId: row.userId,
+		type: row.type,
+		scope: row.scope,
+		reasons: row.reasons,
+		matchedReason: row.matchedReason,
+		category: row.category,
+		communityId: row.communityId,
+		spaceId: row.spaceId,
+		actorId: row.actorId,
+		subject: ref(row.subjectType, row.subjectId),
+		parent: ref(row.parentType, row.parentId),
+		display: row.display,
+		createdAt: row.createdAt
+	};
+}
+function toDelivery(row) {
+	return {
+		id: row.id,
+		notificationId: row.notificationId,
+		channel: row.channel,
+		status: row.status,
+		lastError: row.lastError,
+		createdAt: row.createdAt,
+		sentAt: row.sentAt
+	};
+}
+function listed(orgId, userId, filter) {
+	const conditions = [
+		eq(n.orgId, orgId),
+		eq(n.userId, userId),
+		eq(n.inApp, true)
+	];
+	if (filter.scope === "org") conditions.push(isNull(n.communityId));
+	if (filter.scope === "community") conditions.push(isNotNull(n.communityId));
+	if (filter.communityId !== void 0) {
+		const community = eq(n.communityId, filter.communityId);
+		conditions.push(filter.includeOrg ? or(community, isNull(n.communityId)) : community);
+	}
+	if (filter.category && filter.category.length > 0) conditions.push(inArray(n.category, filter.category));
+	if (filter.reason && filter.reason.length > 0) conditions.push(arrayOverlaps(n.reasons, filter.reason));
+	if (filter.type && filter.type.length > 0) conditions.push(inArray(n.type, filter.type));
+	if (filter.unread === true) conditions.push(isNull(n.readAt));
+	return conditions;
+}
 var DrizzleNotificationsRepository = class {
 	db;
 	constructor(db) {
 		this.db = db;
 	}
-	async insert(orgId, rows) {
+	async insert(orgId, rows, deliveries) {
 		if (rows.length === 0) return;
-		await this.db.insert(notifications).values(rows.map((row) => ({
-			...row,
-			orgId
-		})));
+		await this.db.transaction(async (tx) => {
+			const inserted = await tx.insert(n).values(rows.map((row) => ({
+				orgId,
+				id: row.id,
+				userId: row.userId,
+				sourceEventId: row.sourceEventId,
+				type: row.type,
+				scope: row.scope,
+				reasons: row.reasons,
+				matchedReason: row.matchedReason,
+				category: row.category,
+				communityId: row.communityId,
+				spaceId: row.spaceId,
+				actorId: row.actorId,
+				subjectType: row.subject?.type ?? null,
+				subjectId: row.subject?.id ?? null,
+				parentType: row.parent?.type ?? null,
+				parentId: row.parent?.id ?? null,
+				display: row.display,
+				inApp: row.inApp,
+				createdAt: row.createdAt
+			}))).onConflictDoNothing().returning({ id: n.id });
+			const kept = new Set(inserted.map((row) => row.id));
+			const pending = deliveries.filter((delivery) => kept.has(delivery.notificationId));
+			if (pending.length === 0) return;
+			await tx.insert(d).values(pending.map((delivery) => ({
+				orgId,
+				id: delivery.id,
+				notificationId: delivery.notificationId,
+				channel: delivery.channel,
+				status: "pending"
+			}))).onConflictDoNothing();
+		});
+	}
+	async pendingDeliveriesForEvent(orgId, sourceEventId) {
+		return this.db.select({ id: d.id }).from(d).innerJoin(n, and(eq(n.orgId, d.orgId), eq(n.id, d.notificationId))).where(and(eq(n.orgId, orgId), eq(n.sourceEventId, sourceEventId), eq(d.status, "pending"))).orderBy(d.id);
+	}
+	async findDelivery(orgId, deliveryId) {
+		const [row] = await this.db.select({
+			delivery: d,
+			notification: n
+		}).from(d).innerJoin(n, and(eq(n.orgId, d.orgId), eq(n.id, d.notificationId))).where(and(eq(d.orgId, orgId), eq(d.id, deliveryId))).limit(1);
+		return row ? {
+			delivery: toDelivery(row.delivery),
+			notification: toStored(row.notification)
+		} : null;
+	}
+	async markSent(orgId, deliveryId, at) {
+		await this.db.update(d).set({
+			status: "sent",
+			sentAt: at
+		}).where(and(eq(d.orgId, orgId), eq(d.id, deliveryId), eq(d.status, "pending")));
+	}
+	async recordError(orgId, deliveryId, error) {
+		await this.db.update(d).set({ lastError: error }).where(and(eq(d.orgId, orgId), eq(d.id, deliveryId), eq(d.status, "pending")));
 	}
-	async page(orgId, userId, query) {
-		const mine = and(eq(notifications.orgId, orgId), eq(notifications.userId, userId));
-		const [rows, counts] = await Promise.all([this.db.select().from(notifications).where(mine).orderBy(desc(notifications.createdAt), desc(notifications.id)).limit(query.pageSize).offset((query.page - 1) * query.pageSize), this.db.select({
+	async markFailed(orgId, deliveryId, error) {
+		await this.db.update(d).set({
+			status: "failed",
+			lastError: error
+		}).where(and(eq(d.orgId, orgId), eq(d.id, deliveryId), eq(d.status, "pending")));
+	}
+	async page(orgId, userId, filter, page) {
+		const where = and(...listed(orgId, userId, filter));
+		const [rows, counts] = await Promise.all([this.db.select().from(n).where(where).orderBy(desc(n.createdAt), desc(n.id)).limit(page.pageSize).offset((page.page - 1) * page.pageSize), this.db.select({
 			total: sql`count(*)::int`,
-			unread: sql`(count(*) filter (where ${notifications.readAt} is null))::int`
-		}).from(notifications).where(mine)]);
+			unread: sql`(count(*) filter (where ${n.readAt} is null))::int`
+		}).from(n).where(where)]);
 		return {
-			rows,
+			items: rows.map((row) => ({
+				...toStored(row),
+				readAt: row.readAt
+			})),
 			total: Number(counts[0]?.total ?? 0),
 			unreadCount: Number(counts[0]?.unread ?? 0)
 		};
 	}
-	async markRead(orgId, userId, notificationId, at) {
-		const [row] = await this.db.update(notifications).set({ readAt: sql`coalesce(${notifications.readAt}, ${at.toISOString()}::timestamptz)` }).where(and(eq(notifications.orgId, orgId), eq(notifications.userId, userId), eq(notifications.id, notificationId))).returning();
-		return row ?? null;
+	async find(orgId, userId, notificationId) {
+		const [row] = await this.db.select().from(n).where(and(eq(n.orgId, orgId), eq(n.userId, userId), eq(n.id, notificationId), eq(n.inApp, true))).limit(1);
+		return row ? {
+			...toStored(row),
+			readAt: row.readAt
+		} : null;
 	}
-	async markAllRead(orgId, userId, at) {
-		return (await this.db.update(notifications).set({ readAt: at }).where(and(eq(notifications.orgId, orgId), eq(notifications.userId, userId), isNull(notifications.readAt))).returning({ id: notifications.id })).length;
+	async unreadCounts(orgId, userId, communityIds) {
+		const unread = and(eq(n.orgId, orgId), eq(n.userId, userId), eq(n.inApp, true), isNull(n.readAt));
+		const [org, communities] = await Promise.all([this.db.select({ unread: sql`count(*)::int` }).from(n).where(and(unread, isNull(n.communityId))), communityIds.length === 0 ? Promise.resolve([]) : this.db.select({
+			communityId: n.communityId,
+			unread: sql`count(*)::int`
+		}).from(n).where(and(unread, inArray(n.communityId, communityIds))).groupBy(n.communityId)]);
+		return {
+			org: Number(org[0]?.unread ?? 0),
+			communities: communities.flatMap((row) => row.communityId ? [{
+				communityId: row.communityId,
+				unread: Number(row.unread)
+			}] : [])
+		};
 	}
-	async preferences(orgId, userIds) {
-		if (userIds.length === 0) return [];
-		return this.db.select({
-			userId: notificationPreferences.userId,
-			kind: notificationPreferences.kind,
-			inApp: notificationPreferences.inApp,
-			email: notificationPreferences.email
-		}).from(notificationPreferences).where(and(eq(notificationPreferences.orgId, orgId), inArray(notificationPreferences.userId, userIds)));
+	async markRead(orgId, userId, notificationId, at) {
+		return (await this.db.update(n).set({ readAt: sql`coalesce(${n.readAt}, ${at.toISOString()}::timestamptz)` }).where(and(eq(n.orgId, orgId), eq(n.userId, userId), eq(n.id, notificationId), eq(n.inApp, true))).returning({ id: n.id })).length > 0;
 	}
-	async upsertPreferences(orgId, userId, preferences) {
-		if (preferences.length === 0) return;
-		await this.db.insert(notificationPreferences).values(preferences.map((pref) => ({
-			orgId,
-			userId,
-			...pref
-		}))).onConflictDoUpdate({
-			target: [
-				notificationPreferences.orgId,
-				notificationPreferences.userId,
-				notificationPreferences.kind
-			],
-			set: {
-				inApp: sql`excluded.in_app`,
-				email: sql`excluded.email`,
-				updatedAt: sql`now()`
-			}
-		});
+	async markAllRead(orgId, userId, filter, at) {
+		return (await this.db.update(n).set({ readAt: at }).where(and(...listed(orgId, userId, filter), isNull(n.readAt))).returning({ id: n.id })).length;
 	}
 };
 translateDbErrors(DrizzleNotificationsRepository);

package/dist/repositories/notifications.js.map

@@ -1 +1 @@
-{"version":3,"file":"notifications.js","names":[],"sources":["../../src/repositories/notifications.ts"],"sourcesContent":["import { and, desc, eq, inArray, isNull, sql } from \"drizzle-orm\";\nimport type { NodePgDatabase } from \"drizzle-orm/node-postgres\";\nimport type { NotificationsQuery, NotificationsRepository } from \"@headless-lms/core/identity\";\nimport type { Notification, NotificationPreference } from \"@headless-lms/core/types\";\nimport { notificationPreferences, notifications } from \"../schema/index.js\";\nimport { translateDbErrors } from \"./pg-errors.js\";\n\nexport class DrizzleNotificationsRepository implements NotificationsRepository {\n  constructor(private readonly db: NodePgDatabase) {}\n\n  async insert(orgId: string, rows: Notification[]): Promise<void> {\n    if (rows.length === 0) {\n      return;\n    }\n    await this.db.insert(notifications).values(rows.map((row) => ({ ...row, orgId })));\n  }\n\n  async page(\n    orgId: string,\n    userId: string,\n    query: NotificationsQuery,\n  ): Promise<{ rows: Notification[]; total: number; unreadCount: number }> {\n    const mine = and(eq(notifications.orgId, orgId), eq(notifications.userId, userId));\n    const [rows, counts] = await Promise.all([\n      this.db\n        .select()\n        .from(notifications)\n        .where(mine)\n        .orderBy(desc(notifications.createdAt), desc(notifications.id))\n        .limit(query.pageSize)\n        .offset((query.page - 1) * query.pageSize),\n      this.db\n        .select({\n          total: sql<number>`count(*)::int`,\n          unread: sql<number>`(count(*) filter (where ${notifications.readAt} is null))::int`,\n        })\n        .from(notifications)\n        .where(mine),\n    ]);\n    return {\n      rows,\n      total: Number(counts[0]?.total ?? 0),\n      unreadCount: Number(counts[0]?.unread ?? 0),\n    };\n  }\n\n  async markRead(\n    orgId: string,\n    userId: string,\n    notificationId: string,\n    at: Date,\n  ): Promise<Notification | null> {\n    const [row] = await this.db\n      .update(notifications)\n      .set({ readAt: sql`coalesce(${notifications.readAt}, ${at.toISOString()}::timestamptz)` })\n      .where(\n        and(\n          eq(notifications.orgId, orgId),\n          eq(notifications.userId, userId),\n          eq(notifications.id, notificationId),\n        ),\n      )\n      .returning();\n    return row ?? null;\n  }\n\n  async markAllRead(orgId: string, userId: string, at: Date): Promise<number> {\n    const rows = await this.db\n      .update(notifications)\n      .set({ readAt: at })\n      .where(\n        and(\n          eq(notifications.orgId, orgId),\n          eq(notifications.userId, userId),\n          isNull(notifications.readAt),\n        ),\n      )\n      .returning({ id: notifications.id });\n    return rows.length;\n  }\n\n  async preferences(\n    orgId: string,\n    userIds: string[],\n  ): Promise<(NotificationPreference & { userId: string })[]> {\n    if (userIds.length === 0) {\n      return [];\n    }\n    return this.db\n      .select({\n        userId: notificationPreferences.userId,\n        kind: notificationPreferences.kind,\n        inApp: notificationPreferences.inApp,\n        email: notificationPreferences.email,\n      })\n      .from(notificationPreferences)\n      .where(\n        and(\n          eq(notificationPreferences.orgId, orgId),\n          inArray(notificationPreferences.userId, userIds),\n        ),\n      );\n  }\n\n  async upsertPreferences(\n    orgId: string,\n    userId: string,\n    preferences: NotificationPreference[],\n  ): Promise<void> {\n    if (preferences.length === 0) {\n      return;\n    }\n    await this.db\n      .insert(notificationPreferences)\n      .values(preferences.map((pref) => ({ orgId, userId, ...pref })))\n      .onConflictDoUpdate({\n        target: [\n          notificationPreferences.orgId,\n          notificationPreferences.userId,\n          notificationPreferences.kind,\n        ],\n        set: {\n          inApp: sql`excluded.in_app`,\n          email: sql`excluded.email`,\n          updatedAt: sql`now()`,\n        },\n      });\n  }\n}\n\ntranslateDbErrors(DrizzleNotificationsRepository);\n"],"mappings":";;;;;AAOA,IAAa,iCAAb,MAA+E;CAChD;CAA7B,YAAY,IAAqC;EAApB,KAAA,KAAA;CAAqB;CAElD,MAAM,OAAO,OAAe,MAAqC;EAC/D,IAAI,KAAK,WAAW,GAClB;EAEF,MAAM,KAAK,GAAG,OAAO,aAAa,CAAC,CAAC,OAAO,KAAK,KAAK,SAAS;GAAE,GAAG;GAAK;EAAM,EAAE,CAAC;CACnF;CAEA,MAAM,KACJ,OACA,QACA,OACuE;EACvE,MAAM,OAAO,IAAI,GAAG,cAAc,OAAO,KAAK,GAAG,GAAG,cAAc,QAAQ,MAAM,CAAC;EACjF,MAAM,CAAC,MAAM,UAAU,MAAM,QAAQ,IAAI,CACvC,KAAK,GACF,OAAO,CAAC,CACR,KAAK,aAAa,CAAC,CACnB,MAAM,IAAI,CAAC,CACX,QAAQ,KAAK,cAAc,SAAS,GAAG,KAAK,cAAc,EAAE,CAAC,CAAC,CAC9D,MAAM,MAAM,QAAQ,CAAC,CACrB,QAAQ,MAAM,OAAO,KAAK,MAAM,QAAQ,GAC3C,KAAK,GACF,OAAO;GACN,OAAO,GAAW;GAClB,QAAQ,GAAW,2BAA2B,cAAc,OAAO;EACrE,CAAC,CAAC,CACD,KAAK,aAAa,CAAC,CACnB,MAAM,IAAI,CACf,CAAC;EACD,OAAO;GACL;GACA,OAAO,OAAO,OAAO,EAAE,EAAE,SAAS,CAAC;GACnC,aAAa,OAAO,OAAO,EAAE,EAAE,UAAU,CAAC;EAC5C;CACF;CAEA,MAAM,SACJ,OACA,QACA,gBACA,IAC8B;EAC9B,MAAM,CAAC,OAAO,MAAM,KAAK,GACtB,OAAO,aAAa,CAAC,CACrB,IAAI,EAAE,QAAQ,GAAG,YAAY,cAAc,OAAO,IAAI,GAAG,YAAY,EAAE,gBAAgB,CAAC,CAAC,CACzF,MACC,IACE,GAAG,cAAc,OAAO,KAAK,GAC7B,GAAG,cAAc,QAAQ,MAAM,GAC/B,GAAG,cAAc,IAAI,cAAc,CACrC,CACF,CAAC,CACA,UAAU;EACb,OAAO,OAAO;CAChB;CAEA,MAAM,YAAY,OAAe,QAAgB,IAA2B;EAY1E,QAAO,MAXY,KAAK,GACrB,OAAO,aAAa,CAAC,CACrB,IAAI,EAAE,QAAQ,GAAG,CAAC,CAAC,CACnB,MACC,IACE,GAAG,cAAc,OAAO,KAAK,GAC7B,GAAG,cAAc,QAAQ,MAAM,GAC/B,OAAO,cAAc,MAAM,CAC7B,CACF,CAAC,CACA,UAAU,EAAE,IAAI,cAAc,GAAG,CAAC,EAAA,CACzB;CACd;CAEA,MAAM,YACJ,OACA,SAC0D;EAC1D,IAAI,QAAQ,WAAW,GACrB,OAAO,CAAC;EAEV,OAAO,KAAK,GACT,OAAO;GACN,QAAQ,wBAAwB;GAChC,MAAM,wBAAwB;GAC9B,OAAO,wBAAwB;GAC/B,OAAO,wBAAwB;EACjC,CAAC,CAAC,CACD,KAAK,uBAAuB,CAAC,CAC7B,MACC,IACE,GAAG,wBAAwB,OAAO,KAAK,GACvC,QAAQ,wBAAwB,QAAQ,OAAO,CACjD,CACF;CACJ;CAEA,MAAM,kBACJ,OACA,QACA,aACe;EACf,IAAI,YAAY,WAAW,GACzB;EAEF,MAAM,KAAK,GACR,OAAO,uBAAuB,CAAC,CAC/B,OAAO,YAAY,KAAK,UAAU;GAAE;GAAO;GAAQ,GAAG;EAAK,EAAE,CAAC,CAAC,CAC/D,mBAAmB;GAClB,QAAQ;IACN,wBAAwB;IACxB,wBAAwB;IACxB,wBAAwB;GAC1B;GACA,KAAK;IACH,OAAO,GAAG;IACV,OAAO,GAAG;IACV,WAAW,GAAG;GAChB;EACF,CAAC;CACL;AACF;AAEA,kBAAkB,8BAA8B"}
+{"version":3,"file":"notifications.js","names":[],"sources":["../../src/repositories/notifications.ts"],"sourcesContent":["import {\n  and,\n  arrayOverlaps,\n  desc,\n  eq,\n  inArray,\n  isNotNull,\n  isNull,\n  or,\n  sql,\n  type SQL,\n} from \"drizzle-orm\";\nimport type {\n  ListedNotification,\n  NewDelivery,\n  NewNotification,\n  NotificationPage,\n  NotificationsRepository,\n  UnreadCounts,\n} from \"@headless-lms/core/automations\";\nimport type {\n  Delivery,\n  NotificationFilter,\n  StoredNotification,\n  SubjectRef,\n} from \"@headless-lms/core/types\";\nimport type { DbExecutor } from \"../client.js\";\nimport { notificationDeliveries, notifications } from \"../schema/index.js\";\nimport { translateDbErrors } from \"./pg-errors.js\";\n\nconst n = notifications;\nconst d = notificationDeliveries;\n\ntype NotificationRow = typeof notifications.$inferSelect;\ntype DeliveryRow = typeof notificationDeliveries.$inferSelect;\n\nfunction ref(type: string | null, id: string | null): SubjectRef | null {\n  return type && id ? { type: type as SubjectRef[\"type\"], id } : null;\n}\n\nfunction toStored(row: NotificationRow): StoredNotification {\n  return {\n    id: row.id,\n    orgId: row.orgId,\n    userId: row.userId,\n    type: row.type,\n    scope: row.scope,\n    reasons: row.reasons,\n    matchedReason: row.matchedReason,\n    category: row.category,\n    communityId: row.communityId,\n    spaceId: row.spaceId,\n    actorId: row.actorId,\n    subject: ref(row.subjectType, row.subjectId),\n    parent: ref(row.parentType, row.parentId),\n    display: row.display,\n    createdAt: row.createdAt,\n  };\n}\n\nfunction toDelivery(row: DeliveryRow): Delivery {\n  return {\n    id: row.id,\n    notificationId: row.notificationId,\n    channel: row.channel,\n    status: row.status,\n    lastError: row.lastError,\n    createdAt: row.createdAt,\n    sentAt: row.sentAt,\n  };\n}\n\nfunction listed(orgId: string, userId: string, filter: NotificationFilter): SQL[] {\n  const conditions: SQL[] = [eq(n.orgId, orgId), eq(n.userId, userId), eq(n.inApp, true)];\n  if (filter.scope === \"org\") {\n    conditions.push(isNull(n.communityId));\n  }\n  if (filter.scope === \"community\") {\n    conditions.push(isNotNull(n.communityId));\n  }\n  if (filter.communityId !== undefined) {\n    const community = eq(n.communityId, filter.communityId);\n    conditions.push(filter.includeOrg ? or(community, isNull(n.communityId))! : community);\n  }\n  if (filter.category && filter.category.length > 0) {\n    conditions.push(inArray(n.category, filter.category));\n  }\n  if (filter.reason && filter.reason.length > 0) {\n    conditions.push(arrayOverlaps(n.reasons, filter.reason));\n  }\n  if (filter.type && filter.type.length > 0) {\n    conditions.push(inArray(n.type, filter.type));\n  }\n  if (filter.unread === true) {\n    conditions.push(isNull(n.readAt));\n  }\n  return conditions;\n}\n\nexport class DrizzleNotificationsRepository implements NotificationsRepository {\n  constructor(private readonly db: DbExecutor) {}\n\n  async insert(orgId: string, rows: NewNotification[], deliveries: NewDelivery[]): Promise<void> {\n    if (rows.length === 0) {\n      return;\n    }\n    await this.db.transaction(async (tx) => {\n      const inserted = await tx\n        .insert(n)\n        .values(\n          rows.map((row) => ({\n            orgId,\n            id: row.id,\n            userId: row.userId,\n            sourceEventId: row.sourceEventId,\n            type: row.type,\n            scope: row.scope,\n            reasons: row.reasons,\n            matchedReason: row.matchedReason,\n            category: row.category,\n            communityId: row.communityId,\n            spaceId: row.spaceId,\n            actorId: row.actorId,\n            subjectType: row.subject?.type ?? null,\n            subjectId: row.subject?.id ?? null,\n            parentType: row.parent?.type ?? null,\n            parentId: row.parent?.id ?? null,\n            display: row.display,\n            inApp: row.inApp,\n            createdAt: row.createdAt,\n          })),\n        )\n        .onConflictDoNothing()\n        .returning({ id: n.id });\n      const kept = new Set(inserted.map((row) => row.id));\n      const pending = deliveries.filter((delivery) => kept.has(delivery.notificationId));\n      if (pending.length === 0) {\n        return;\n      }\n      await tx\n        .insert(d)\n        .values(\n          pending.map((delivery) => ({\n            orgId,\n            id: delivery.id,\n            notificationId: delivery.notificationId,\n            channel: delivery.channel,\n            status: \"pending\" as const,\n          })),\n        )\n        .onConflictDoNothing();\n    });\n  }\n\n  async pendingDeliveriesForEvent(orgId: string, sourceEventId: string): Promise<{ id: string }[]> {\n    return this.db\n      .select({ id: d.id })\n      .from(d)\n      .innerJoin(n, and(eq(n.orgId, d.orgId), eq(n.id, d.notificationId)))\n      .where(and(eq(n.orgId, orgId), eq(n.sourceEventId, sourceEventId), eq(d.status, \"pending\")))\n      .orderBy(d.id);\n  }\n\n  async findDelivery(\n    orgId: string,\n    deliveryId: string,\n  ): Promise<{ delivery: Delivery; notification: StoredNotification } | null> {\n    const [row] = await this.db\n      .select({ delivery: d, notification: n })\n      .from(d)\n      .innerJoin(n, and(eq(n.orgId, d.orgId), eq(n.id, d.notificationId)))\n      .where(and(eq(d.orgId, orgId), eq(d.id, deliveryId)))\n      .limit(1);\n    return row\n      ? { delivery: toDelivery(row.delivery), notification: toStored(row.notification) }\n      : null;\n  }\n\n  async markSent(orgId: string, deliveryId: string, at: Date): Promise<void> {\n    await this.db\n      .update(d)\n      .set({ status: \"sent\", sentAt: at })\n      .where(and(eq(d.orgId, orgId), eq(d.id, deliveryId), eq(d.status, \"pending\")));\n  }\n\n  async recordError(orgId: string, deliveryId: string, error: string): Promise<void> {\n    await this.db\n      .update(d)\n      .set({ lastError: error })\n      .where(and(eq(d.orgId, orgId), eq(d.id, deliveryId), eq(d.status, \"pending\")));\n  }\n\n  async markFailed(orgId: string, deliveryId: string, error: string): Promise<void> {\n    await this.db\n      .update(d)\n      .set({ status: \"failed\", lastError: error })\n      .where(and(eq(d.orgId, orgId), eq(d.id, deliveryId), eq(d.status, \"pending\")));\n  }\n\n  async page(\n    orgId: string,\n    userId: string,\n    filter: NotificationFilter,\n    page: { page: number; pageSize: number },\n  ): Promise<NotificationPage> {\n    const where = and(...listed(orgId, userId, filter));\n    const [rows, counts] = await Promise.all([\n      this.db\n        .select()\n        .from(n)\n        .where(where)\n        .orderBy(desc(n.createdAt), desc(n.id))\n        .limit(page.pageSize)\n        .offset((page.page - 1) * page.pageSize),\n      this.db\n        .select({\n          total: sql<number>`count(*)::int`,\n          unread: sql<number>`(count(*) filter (where ${n.readAt} is null))::int`,\n        })\n        .from(n)\n        .where(where),\n    ]);\n    return {\n      items: rows.map((row) => ({ ...toStored(row), readAt: row.readAt })),\n      total: Number(counts[0]?.total ?? 0),\n      unreadCount: Number(counts[0]?.unread ?? 0),\n    };\n  }\n\n  async find(\n    orgId: string,\n    userId: string,\n    notificationId: string,\n  ): Promise<ListedNotification | null> {\n    const [row] = await this.db\n      .select()\n      .from(n)\n      .where(\n        and(eq(n.orgId, orgId), eq(n.userId, userId), eq(n.id, notificationId), eq(n.inApp, true)),\n      )\n      .limit(1);\n    return row ? { ...toStored(row), readAt: row.readAt } : null;\n  }\n\n  async unreadCounts(orgId: string, userId: string, communityIds: string[]): Promise<UnreadCounts> {\n    const unread = and(\n      eq(n.orgId, orgId),\n      eq(n.userId, userId),\n      eq(n.inApp, true),\n      isNull(n.readAt),\n    );\n    const [org, communities] = await Promise.all([\n      this.db\n        .select({ unread: sql<number>`count(*)::int` })\n        .from(n)\n        .where(and(unread, isNull(n.communityId))),\n      communityIds.length === 0\n        ? Promise.resolve([])\n        : this.db\n            .select({ communityId: n.communityId, unread: sql<number>`count(*)::int` })\n            .from(n)\n            .where(and(unread, inArray(n.communityId, communityIds)))\n            .groupBy(n.communityId),\n    ]);\n    return {\n      org: Number(org[0]?.unread ?? 0),\n      communities: communities.flatMap((row) =>\n        row.communityId ? [{ communityId: row.communityId, unread: Number(row.unread) }] : [],\n      ),\n    };\n  }\n\n  async markRead(\n    orgId: string,\n    userId: string,\n    notificationId: string,\n    at: Date,\n  ): Promise<boolean> {\n    const rows = await this.db\n      .update(n)\n      .set({ readAt: sql`coalesce(${n.readAt}, ${at.toISOString()}::timestamptz)` })\n      .where(\n        and(eq(n.orgId, orgId), eq(n.userId, userId), eq(n.id, notificationId), eq(n.inApp, true)),\n      )\n      .returning({ id: n.id });\n    return rows.length > 0;\n  }\n\n  async markAllRead(\n    orgId: string,\n    userId: string,\n    filter: NotificationFilter,\n    at: Date,\n  ): Promise<number> {\n    const rows = await this.db\n      .update(n)\n      .set({ readAt: at })\n      .where(and(...listed(orgId, userId, filter), isNull(n.readAt)))\n      .returning({ id: n.id });\n    return rows.length;\n  }\n}\n\ntranslateDbErrors(DrizzleNotificationsRepository);\n"],"mappings":"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"}

package/dist/repositories/org-user-profile.d.ts

@@ -88,23 +88,6 @@ declare const orgUserProfileColumns: {
   }, {}, {}>;
 };
 declare const authorProfileColumns: {
-  role: import("drizzle-orm/pg-core").PgColumn<{
-    name: "role";
-    tableName: "org_users";
-    dataType: "string";
-    columnType: "PgText";
-    data: "student" | "owner" | "admin" | "instructor" | "moderator";
-    driverParam: string;
-    notNull: true;
-    hasDefault: false;
-    isPrimaryKey: false;
-    isAutoincrement: false;
-    hasRuntimeDefault: false;
-    enumValues: ["owner", "admin", "instructor", "moderator", "student"];
-    baseColumn: never;
-    identity: undefined;
-    generated: undefined;
-  }, {}, {}>;
   displayName: import("drizzle-orm/pg-core").PgColumn<{
     name: "display_name";
     tableName: "user_profiles";

package/dist/repositories/org-user-profile.js

@@ -13,7 +13,6 @@ const orgUserProfileColumns = {
 };
 const authorProfileColumns = {
 	...orgUserProfileColumns,
-	role: orgUsers.role,
 	displayName: userProfiles.displayName,
 	headline: userProfiles.headline,
 	imageAssetOrgId: userProfiles.imageAssetOrgId,

package/dist/repositories/org-user-profile.js.map

@@ -1 +1 @@
-{"version":3,"file":"org-user-profile.js","names":[],"sources":["../../src/repositories/org-user-profile.ts"],"sourcesContent":["// The one display join for an org user's profile.\n//\n// The names and email live on the identity `users` row the org_users row links\n// to; the avatar lives on the auth engine's mirrored `user` table, reached\n// through that same identity row. The identity join is INNER (user_id is NOT\n// NULL); the auth join is LEFT, since only the avatar depends on it.\n//\n// Sanctioned by .eslintrc.cjs — \"db repositories read the auth adapter's\n// mirrored `user` table for display joins\".\n//\n// No `joinOrgUserProfile` helper: Drizzle's query builder type narrows on every\n// chained call, so a generic wrapper around `.innerJoin(...).leftJoin(...)`\n// can't be typed without widening it to `unknown` — each repository chains the\n// two joins inline instead.\nimport { sql } from \"drizzle-orm\";\nimport { orgUsers } from \"../schema/organizations.js\";\nimport { userProfiles, users } from \"../schema/identity.js\";\nimport { user } from \"../schema/better-auth.js\";\n\n/** Spread into a `.select({ ... })` to get the profile columns. */\nexport const orgUserProfileColumns = {\n  id: orgUsers.id,\n  firstName: users.firstName,\n  lastName: users.lastName,\n  email: users.email,\n  image: user.image,\n};\n\nexport const authorProfileColumns = {\n  ...orgUserProfileColumns,\n  role: orgUsers.role,\n  displayName: userProfiles.displayName,\n  headline: userProfiles.headline,\n  imageAssetOrgId: userProfiles.imageAssetOrgId,\n  imageAssetId: userProfiles.imageAssetId,\n};\n\n// A person is shared across organizations. Until an invited student accepts,\n// the inviting org sees the name and avatar only when the profile is its own:\n// no account yet and no other organization.\nconst profileVisible = sql`(${orgUsers.status} <> 'invited' or (${users.externalId} is null and not exists (\n  select 1 from org_users other where other.user_id = ${users.id} and other.org_id <> ${orgUsers.orgId}\n)))`;\n\nexport const studentFirstName = sql<\n  string | null\n>`case when ${profileVisible} then ${users.firstName} end`;\nexport const studentLastName = sql<\n  string | null\n>`case when ${profileVisible} then ${users.lastName} end`;\n\nexport const studentProfileColumns = {\n  id: orgUsers.id,\n  firstName: studentFirstName,\n  lastName: studentLastName,\n  email: users.email,\n  image: sql<string | null>`case when ${profileVisible} then ${user.image} end`,\n};\n"],"mappings":";;;;;;AAoBA,MAAa,wBAAwB;CACnC,IAAI,SAAS;CACb,WAAW,MAAM;CACjB,UAAU,MAAM;CAChB,OAAO,MAAM;CACb,OAAO,KAAK;AACd;AAEA,MAAa,uBAAuB;CAClC,GAAG;CACH,MAAM,SAAS;CACf,aAAa,aAAa;CAC1B,UAAU,aAAa;CACvB,iBAAiB,aAAa;CAC9B,cAAc,aAAa;AAC7B;AAKA,MAAM,iBAAiB,GAAG,IAAI,SAAS,OAAO,oBAAoB,MAAM,WAAW;wDAC3B,MAAM,GAAG,uBAAuB,SAAS,MAAM;;AAGvG,MAAa,mBAAmB,GAE/B,aAAa,eAAe,QAAQ,MAAM,UAAU;AACrD,MAAa,kBAAkB,GAE9B,aAAa,eAAe,QAAQ,MAAM,SAAS;AAEpD,MAAa,wBAAwB;CACnC,IAAI,SAAS;CACb,WAAW;CACX,UAAU;CACV,OAAO,MAAM;CACb,OAAO,GAAkB,aAAa,eAAe,QAAQ,KAAK,MAAM;AAC1E"}
+{"version":3,"file":"org-user-profile.js","names":[],"sources":["../../src/repositories/org-user-profile.ts"],"sourcesContent":["// The one display join for an org user's profile.\n//\n// The names and email live on the identity `users` row the org_users row links\n// to; the avatar lives on the auth engine's mirrored `user` table, reached\n// through that same identity row. The identity join is INNER (user_id is NOT\n// NULL); the auth join is LEFT, since only the avatar depends on it.\n//\n// Sanctioned by .eslintrc.cjs — \"db repositories read the auth adapter's\n// mirrored `user` table for display joins\".\n//\n// No `joinOrgUserProfile` helper: Drizzle's query builder type narrows on every\n// chained call, so a generic wrapper around `.innerJoin(...).leftJoin(...)`\n// can't be typed without widening it to `unknown` — each repository chains the\n// two joins inline instead.\nimport { sql } from \"drizzle-orm\";\nimport { orgUsers } from \"../schema/organizations.js\";\nimport { userProfiles, users } from \"../schema/identity.js\";\nimport { user } from \"../schema/better-auth.js\";\n\n/** Spread into a `.select({ ... })` to get the profile columns. */\nexport const orgUserProfileColumns = {\n  id: orgUsers.id,\n  firstName: users.firstName,\n  lastName: users.lastName,\n  email: users.email,\n  image: user.image,\n};\n\nexport const authorProfileColumns = {\n  ...orgUserProfileColumns,\n  displayName: userProfiles.displayName,\n  headline: userProfiles.headline,\n  imageAssetOrgId: userProfiles.imageAssetOrgId,\n  imageAssetId: userProfiles.imageAssetId,\n};\n\n// A person is shared across organizations. Until an invited student accepts,\n// the inviting org sees the name and avatar only when the profile is its own:\n// no account yet and no other organization.\nconst profileVisible = sql`(${orgUsers.status} <> 'invited' or (${users.externalId} is null and not exists (\n  select 1 from org_users other where other.user_id = ${users.id} and other.org_id <> ${orgUsers.orgId}\n)))`;\n\nexport const studentFirstName = sql<\n  string | null\n>`case when ${profileVisible} then ${users.firstName} end`;\nexport const studentLastName = sql<\n  string | null\n>`case when ${profileVisible} then ${users.lastName} end`;\n\nexport const studentProfileColumns = {\n  id: orgUsers.id,\n  firstName: studentFirstName,\n  lastName: studentLastName,\n  email: users.email,\n  image: sql<string | null>`case when ${profileVisible} then ${user.image} end`,\n};\n"],"mappings":";;;;;;AAoBA,MAAa,wBAAwB;CACnC,IAAI,SAAS;CACb,WAAW,MAAM;CACjB,UAAU,MAAM;CAChB,OAAO,MAAM;CACb,OAAO,KAAK;AACd;AAEA,MAAa,uBAAuB;CAClC,GAAG;CACH,aAAa,aAAa;CAC1B,UAAU,aAAa;CACvB,iBAAiB,aAAa;CAC9B,cAAc,aAAa;AAC7B;AAKA,MAAM,iBAAiB,GAAG,IAAI,SAAS,OAAO,oBAAoB,MAAM,WAAW;wDAC3B,MAAM,GAAG,uBAAuB,SAAS,MAAM;;AAGvG,MAAa,mBAAmB,GAE/B,aAAa,eAAe,QAAQ,MAAM,UAAU;AACrD,MAAa,kBAAkB,GAE9B,aAAa,eAAe,QAAQ,MAAM,SAAS;AAEpD,MAAa,wBAAwB;CACnC,IAAI,SAAS;CACb,WAAW;CACX,UAAU;CACV,OAAO,MAAM;CACb,OAAO,GAAkB,aAAa,eAAe,QAAQ,KAAK,MAAM;AAC1E"}

package/dist/repositories/organizations.d.ts

@@ -1,5 +1,5 @@
 import { NodePgDatabase } from "drizzle-orm/node-postgres";
-import { CreateOrgUserInput, Invite, NewInviteRow, NewOrganizationRow, OrgUser, Organization, OrganizationsRepository, Role, UpdateOrgUserInput, UpdateOrganizationInput } from "@headless-lms/core/organizations";
+import { CreateOrgUserInput, Invite, NewInviteRow, NewOrganizationRow, OrgUser, Organization, OrganizationsRepository, UpdateOrgUserInput, UpdateOrganizationInput } from "@headless-lms/core/organizations";
 import { Logger } from "@headless-lms/core/shared/ports";
 //#region src/repositories/organizations.d.ts
 declare class DrizzleOrganizationsRepository implements OrganizationsRepository {
@@ -10,21 +10,21 @@ declare class DrizzleOrganizationsRepository implements OrganizationsRepository
   update(id: string, input: UpdateOrganizationInput): Promise<Organization | null>;
   delete(id: string): Promise<Organization>;
   findById(id: string): Promise<Organization | null>;
+  listIds(): Promise<string[]>;
   findByExternalId(externalId: string): Promise<Organization | null>;
   findBySlug(slug: string): Promise<Organization | null>;
   upsertPendingInvite(orgId: string, input: NewInviteRow): Promise<Invite>;
   setInviteStatus(orgId: string, id: string, status: string): Promise<Invite | null>;
+  setInviteRole(orgId: string, id: string, roleKey: string, invitedBy: string): Promise<Invite | null>;
   findInviteByTokenHash(tokenHash: string): Promise<Invite | null>;
   findPendingInvite(orgId: string, email: string): Promise<Invite | null>;
-  setInviteToken(orgId: string, id: string, tokenHash: string, expiresAt: Date): Promise<Invite | null>;
+  setInviteToken(orgId: string, id: string, tokenHash: string, expiresAt: Date, invitedBy: string): Promise<Invite | null>;
   findOrgUser(orgId: string, userId: string): Promise<OrgUser | null>;
   findOrgUsersByUser(userId: string): Promise<OrgUser[]>;
   findOrgUserById(orgId: string, id: string): Promise<OrgUser | null>;
   findOrgUsersByIds(orgId: string, ids: string[]): Promise<OrgUser[]>;
-  findOrgUserIdsByRole(orgId: string, roles: Role[]): Promise<string[]>;
   createOrgUser(input: CreateOrgUserInput): Promise<OrgUser>;
   updateOrgUser(orgId: string, id: string, patch: UpdateOrgUserInput): Promise<OrgUser | null>;
-  findStudentOrgUsers(userId: string): Promise<OrgUser[]>;
   deleteOrgUser(orgId: string, id: string): Promise<OrgUser | null>;
 }
 //#endregion

package/dist/repositories/organizations.js

@@ -1,9 +1,8 @@
 import { invites, orgUsers, organizations } from "../schema/organizations.js";
 import { isUniqueViolation, pgErrorFields, translateDbErrors } from "./pg-errors.js";
-import { and, eq, inArray, sql } from "drizzle-orm";
-import { ConflictError } from "@headless-lms/core/shared/errors";
 import { noopLogger } from "@headless-lms/core/shared/logger";
-import { parseRole } from "@headless-lms/core/organizations";
+import { and, asc, eq, inArray, sql } from "drizzle-orm";
+import { ConflictError } from "@headless-lms/core/shared/errors";
 //#region src/repositories/organizations.ts
 const INVITE_STATUSES = [
 	"pending",
@@ -17,7 +16,7 @@ function toInvite(row) {
 		id: row.id,
 		orgId: row.orgId,
 		email: row.email,
-		role: row.role,
+		roleKey: row.roleKey,
 		status: row.status,
 		invitedBy: row.invitedBy,
 		tokenHash: row.tokenHash,
@@ -60,6 +59,9 @@ var DrizzleOrganizationsRepository = class {
 		const [row] = await this.db.select().from(organizations).where(eq(organizations.id, id));
 		return row ?? null;
 	}
+	async listIds() {
+		return (await this.db.select({ id: organizations.id }).from(organizations).orderBy(asc(organizations.id))).map((row) => row.id);
+	}
 	async findByExternalId(externalId) {
 		const [row] = await this.db.select().from(organizations).where(eq(organizations.externalId, externalId)).limit(1);
 		return row ?? null;
@@ -72,7 +74,7 @@ var DrizzleOrganizationsRepository = class {
 		const [row] = await this.db.insert(invites).values({
 			orgId,
 			email: input.email,
-			role: input.role,
+			roleKey: input.roleKey,
 			status: "pending",
 			invitedBy: input.invitedBy,
 			tokenHash: input.tokenHash,
@@ -81,7 +83,7 @@ var DrizzleOrganizationsRepository = class {
 			target: [invites.orgId, invites.email],
 			targetWhere: sql`${invites.status} = 'pending'`,
 			set: {
-				role: input.role,
+				roleKey: input.roleKey,
 				invitedBy: input.invitedBy,
 				tokenHash: input.tokenHash,
 				expiresAt: input.expiresAt
@@ -94,6 +96,13 @@ var DrizzleOrganizationsRepository = class {
 		const [row] = await this.db.update(invites).set({ status: toStatus(status) }).where(and(eq(invites.orgId, orgId), eq(invites.id, id))).returning();
 		return row ? toInvite(row) : null;
 	}
+	async setInviteRole(orgId, id, roleKey, invitedBy) {
+		const [row] = await this.db.update(invites).set({
+			roleKey,
+			invitedBy
+		}).where(and(eq(invites.orgId, orgId), eq(invites.id, id), eq(invites.status, "pending"))).returning();
+		return row ? toInvite(row) : null;
+	}
 	async findInviteByTokenHash(tokenHash) {
 		const [row] = await this.db.select().from(invites).where(eq(invites.tokenHash, tokenHash)).limit(1);
 		return row ? toInvite(row) : null;
@@ -102,77 +111,46 @@ var DrizzleOrganizationsRepository = class {
 		const [row] = await this.db.select().from(invites).where(and(eq(invites.orgId, orgId), sql`lower(${invites.email}) = lower(${email})`, eq(invites.status, "pending"))).limit(1);
 		return row ? toInvite(row) : null;
 	}
-	async setInviteToken(orgId, id, tokenHash, expiresAt) {
+	async setInviteToken(orgId, id, tokenHash, expiresAt, invitedBy) {
 		const [row] = await this.db.update(invites).set({
 			tokenHash,
-			expiresAt
+			expiresAt,
+			invitedBy
 		}).where(and(eq(invites.orgId, orgId), eq(invites.id, id), eq(invites.status, "pending"))).returning();
 		return row ? toInvite(row) : null;
 	}
 	async findOrgUser(orgId, userId) {
 		const [row] = await this.db.select().from(orgUsers).where(and(eq(orgUsers.orgId, orgId), eq(orgUsers.userId, userId))).limit(1);
-		return row ? {
-			...row,
-			role: parseRole(row.role)
-		} : null;
+		return row ?? null;
 	}
 	async findOrgUsersByUser(userId) {
-		return (await this.db.select().from(orgUsers).where(eq(orgUsers.userId, userId)).orderBy(orgUsers.createdAt)).map((row) => ({
-			...row,
-			role: parseRole(row.role)
-		}));
+		return await this.db.select().from(orgUsers).where(eq(orgUsers.userId, userId)).orderBy(orgUsers.createdAt);
 	}
 	async findOrgUserById(orgId, id) {
 		const [row] = await this.db.select().from(orgUsers).where(and(eq(orgUsers.orgId, orgId), eq(orgUsers.id, id))).limit(1);
-		return row ? {
-			...row,
-			role: parseRole(row.role)
-		} : null;
+		return row ?? null;
 	}
 	async findOrgUsersByIds(orgId, ids) {
 		if (ids.length === 0) return [];
-		return (await this.db.select().from(orgUsers).where(and(eq(orgUsers.orgId, orgId), inArray(orgUsers.id, ids)))).map((row) => ({
-			...row,
-			role: parseRole(row.role)
-		}));
-	}
-	async findOrgUserIdsByRole(orgId, roles) {
-		if (roles.length === 0) return [];
-		return (await this.db.select({ id: orgUsers.id }).from(orgUsers).where(and(eq(orgUsers.orgId, orgId), eq(orgUsers.status, "active"), inArray(orgUsers.role, roles))).orderBy(orgUsers.id)).map((row) => row.id);
+		return await this.db.select().from(orgUsers).where(and(eq(orgUsers.orgId, orgId), inArray(orgUsers.id, ids)));
 	}
 	async createOrgUser(input) {
 		try {
 			const [row] = await this.db.insert(orgUsers).values({
 				orgId: input.orgId,
 				userId: input.userId,
-				role: input.role,
 				status: input.status ?? "active"
 			}).returning();
 			if (!row) throw new Error("failed to insert org user");
-			return {
-				...row,
-				role: parseRole(row.role)
-			};
+			return row;
 		} catch (err) {
 			if (isUniqueViolation(err)) throw new ConflictError("That account already belongs to this organization");
 			throw err;
 		}
 	}
 	async updateOrgUser(orgId, id, patch) {
-		const [row] = await this.db.update(orgUsers).set({
-			...patch.role !== void 0 && { role: patch.role },
-			...patch.status !== void 0 && { status: patch.status }
-		}).where(and(eq(orgUsers.orgId, orgId), eq(orgUsers.id, id))).returning();
-		return row ? {
-			...row,
-			role: parseRole(row.role)
-		} : null;
-	}
-	async findStudentOrgUsers(userId) {
-		return (await this.db.select().from(orgUsers).where(and(eq(orgUsers.userId, userId), eq(orgUsers.role, "student"))).orderBy(orgUsers.createdAt)).map((row) => ({
-			...row,
-			role: parseRole(row.role)
-		}));
+		const [row] = await this.db.update(orgUsers).set({ ...patch.status !== void 0 && { status: patch.status } }).where(and(eq(orgUsers.orgId, orgId), eq(orgUsers.id, id))).returning();
+		return row ?? null;
 	}
 	async deleteOrgUser(orgId, id) {
 		try {

package/dist/repositories/organizations.js.map

@@ -1 +1 @@
-{"version":3,"file":"organizations.js","names":[],"sources":["../../src/repositories/organizations.ts"],"sourcesContent":["// organizations — Drizzle repository (implements the core outbound port).\nimport { and, eq, inArray, sql } from \"drizzle-orm\";\nimport type { NodePgDatabase } from \"drizzle-orm/node-postgres\";\nimport {\n  parseRole,\n  type CreateOrgUserInput,\n  type Invite,\n  type NewInviteRow,\n  type NewOrganizationRow,\n  type Organization,\n  type OrganizationsRepository,\n  type OrgUser,\n  type Role,\n  type UpdateOrganizationInput,\n  type UpdateOrgUserInput,\n} from \"@headless-lms/core/organizations\";\nimport { invites, organizations, orgUsers } from \"../schema/organizations.js\";\nimport type { Logger } from \"@headless-lms/core/shared/ports\";\nimport { noopLogger } from \"@headless-lms/core/shared/logger\";\nimport { ConflictError } from \"@headless-lms/core/shared/errors\";\nimport { isUniqueViolation, pgErrorFields, translateDbErrors } from \"./pg-errors.js\";\n\nconst INVITE_STATUSES = [\"pending\", \"accepted\", \"rejected\", \"canceled\"] as const;\ntype InviteStatus = (typeof INVITE_STATUSES)[number];\nconst toStatus = (s: string): InviteStatus =>\n  (INVITE_STATUSES as readonly string[]).includes(s) ? (s as InviteStatus) : \"pending\";\n\nfunction toInvite(row: typeof invites.$inferSelect): Invite {\n  return {\n    id: row.id,\n    orgId: row.orgId,\n    email: row.email,\n    role: row.role,\n    status: row.status,\n    invitedBy: row.invitedBy,\n    tokenHash: row.tokenHash,\n    expiresAt: row.expiresAt,\n    createdAt: row.createdAt,\n    updatedAt: row.updatedAt,\n  };\n}\n\nexport class DrizzleOrganizationsRepository implements OrganizationsRepository {\n  constructor(\n    private readonly db: NodePgDatabase,\n    private readonly logger: Logger = noopLogger,\n  ) {}\n\n  async create(input: NewOrganizationRow): Promise<Organization> {\n    const [row] = await this.db\n      .insert(organizations)\n      .values({\n        externalId: input.externalId,\n        name: input.name,\n        slug: input.slug,\n        ownerId: input.ownerId,\n        id: input.id,\n      })\n      .returning();\n    if (!row) {\n      throw new Error(\"failed to insert organization\");\n    }\n    return row!;\n  }\n\n  async update(id: string, input: UpdateOrganizationInput): Promise<Organization | null> {\n    const [row] = await this.db\n      .update(organizations)\n      .set({ name: input.name, slug: input.slug })\n      .where(eq(organizations.id, id))\n      .returning();\n    return row ?? null;\n  }\n\n  async delete(id: string): Promise<Organization> {\n    const [row] = await this.db.delete(organizations).where(eq(organizations.id, id)).returning();\n\n    if (!row) {\n      throw new Error(\"failed to delete organization\");\n    }\n    return row;\n  }\n\n  async findById(id: string): Promise<Organization | null> {\n    const [row] = await this.db.select().from(organizations).where(eq(organizations.id, id));\n    return row ?? null;\n  }\n\n  async findByExternalId(externalId: string): Promise<Organization | null> {\n    const [row] = await this.db\n      .select()\n      .from(organizations)\n      .where(eq(organizations.externalId, externalId))\n      .limit(1);\n    return row ?? null;\n  }\n\n  async findBySlug(slug: string): Promise<Organization | null> {\n    const [row] = await this.db\n      .select()\n      .from(organizations)\n      .where(eq(organizations.slug, slug))\n      .limit(1);\n    return row ?? null;\n  }\n\n  async upsertPendingInvite(orgId: string, input: NewInviteRow): Promise<Invite> {\n    const [row] = await this.db\n      .insert(invites)\n      .values({\n        orgId,\n        email: input.email,\n        role: input.role,\n        status: \"pending\",\n        invitedBy: input.invitedBy,\n        tokenHash: input.tokenHash,\n        expiresAt: input.expiresAt,\n      })\n      .onConflictDoUpdate({\n        target: [invites.orgId, invites.email],\n        targetWhere: sql`${invites.status} = 'pending'`,\n        set: {\n          role: input.role,\n          invitedBy: input.invitedBy,\n          tokenHash: input.tokenHash,\n          expiresAt: input.expiresAt,\n        },\n      })\n      .returning();\n    if (!row) {\n      throw new Error(\"failed to upsert invite\");\n    }\n    return toInvite(row);\n  }\n\n  async setInviteStatus(orgId: string, id: string, status: string): Promise<Invite | null> {\n    const [row] = await this.db\n      .update(invites)\n      .set({ status: toStatus(status) })\n      .where(and(eq(invites.orgId, orgId), eq(invites.id, id)))\n      .returning();\n    return row ? toInvite(row) : null;\n  }\n\n  async findInviteByTokenHash(tokenHash: string): Promise<Invite | null> {\n    const [row] = await this.db\n      .select()\n      .from(invites)\n      .where(eq(invites.tokenHash, tokenHash))\n      .limit(1);\n    return row ? toInvite(row) : null;\n  }\n\n  async findPendingInvite(orgId: string, email: string): Promise<Invite | null> {\n    const [row] = await this.db\n      .select()\n      .from(invites)\n      .where(\n        and(\n          eq(invites.orgId, orgId),\n          sql`lower(${invites.email}) = lower(${email})`,\n          eq(invites.status, \"pending\"),\n        ),\n      )\n      .limit(1);\n    return row ? toInvite(row) : null;\n  }\n\n  async setInviteToken(\n    orgId: string,\n    id: string,\n    tokenHash: string,\n    expiresAt: Date,\n  ): Promise<Invite | null> {\n    const [row] = await this.db\n      .update(invites)\n      .set({ tokenHash, expiresAt })\n      .where(and(eq(invites.orgId, orgId), eq(invites.id, id), eq(invites.status, \"pending\")))\n      .returning();\n    return row ? toInvite(row) : null;\n  }\n\n  async findOrgUser(orgId: string, userId: string): Promise<OrgUser | null> {\n    const [row] = await this.db\n      .select()\n      .from(orgUsers)\n      .where(and(eq(orgUsers.orgId, orgId), eq(orgUsers.userId, userId)))\n      .limit(1);\n    return row ? { ...row, role: parseRole(row.role) } : null;\n  }\n\n  async findOrgUsersByUser(userId: string): Promise<OrgUser[]> {\n    const rows = await this.db\n      .select()\n      .from(orgUsers)\n      .where(eq(orgUsers.userId, userId))\n      .orderBy(orgUsers.createdAt);\n    return rows.map((row) => ({ ...row, role: parseRole(row.role) }));\n  }\n\n  async findOrgUserById(orgId: string, id: string): Promise<OrgUser | null> {\n    const [row] = await this.db\n      .select()\n      .from(orgUsers)\n      .where(and(eq(orgUsers.orgId, orgId), eq(orgUsers.id, id)))\n      .limit(1);\n    return row ? { ...row, role: parseRole(row.role) } : null;\n  }\n\n  async findOrgUsersByIds(orgId: string, ids: string[]): Promise<OrgUser[]> {\n    if (ids.length === 0) {\n      return [];\n    }\n    const rows = await this.db\n      .select()\n      .from(orgUsers)\n      .where(and(eq(orgUsers.orgId, orgId), inArray(orgUsers.id, ids)));\n    return rows.map((row) => ({ ...row, role: parseRole(row.role) }));\n  }\n\n  async findOrgUserIdsByRole(orgId: string, roles: Role[]): Promise<string[]> {\n    if (roles.length === 0) {\n      return [];\n    }\n    const rows = await this.db\n      .select({ id: orgUsers.id })\n      .from(orgUsers)\n      .where(\n        and(\n          eq(orgUsers.orgId, orgId),\n          eq(orgUsers.status, \"active\"),\n          inArray(orgUsers.role, roles),\n        ),\n      )\n      .orderBy(orgUsers.id);\n    return rows.map((row) => row.id);\n  }\n\n  async createOrgUser(input: CreateOrgUserInput): Promise<OrgUser> {\n    try {\n      const [row] = await this.db\n        .insert(orgUsers)\n        .values({\n          orgId: input.orgId,\n          userId: input.userId,\n          role: input.role,\n          status: input.status ?? \"active\",\n        })\n        .returning();\n      if (!row) {\n        throw new Error(\"failed to insert org user\");\n      }\n      return { ...row, role: parseRole(row.role) };\n    } catch (err) {\n      if (isUniqueViolation(err)) {\n        throw new ConflictError(\"That account already belongs to this organization\");\n      }\n      throw err;\n    }\n  }\n\n  async updateOrgUser(\n    orgId: string,\n    id: string,\n    patch: UpdateOrgUserInput,\n  ): Promise<OrgUser | null> {\n    const [row] = await this.db\n      .update(orgUsers)\n      .set({\n        ...(patch.role !== undefined && { role: patch.role }),\n        ...(patch.status !== undefined && { status: patch.status }),\n      })\n      .where(and(eq(orgUsers.orgId, orgId), eq(orgUsers.id, id)))\n      .returning();\n    return row ? { ...row, role: parseRole(row.role) } : null;\n  }\n\n  async findStudentOrgUsers(userId: string): Promise<OrgUser[]> {\n    const rows = await this.db\n      .select()\n      .from(orgUsers)\n      .where(and(eq(orgUsers.userId, userId), eq(orgUsers.role, \"student\")))\n      .orderBy(orgUsers.createdAt);\n    return rows.map((row) => ({ ...row, role: parseRole(row.role) }));\n  }\n\n  async deleteOrgUser(orgId: string, id: string): Promise<OrgUser | null> {\n    try {\n      const [row] = await this.db\n        .delete(orgUsers)\n        .where(and(eq(orgUsers.orgId, orgId), eq(orgUsers.id, id)))\n        .returning();\n      return row ?? null;\n    } catch (err) {\n      if (pgErrorFields(err)?.code === \"23503\") {\n        throw Object.assign(\n          new ConflictError(\n            \"This person has written posts, comments or messages and cannot be deleted\",\n          ),\n          { cause: err },\n        );\n      }\n      throw err;\n    }\n  }\n}\ntranslateDbErrors(DrizzleOrganizationsRepository);\n"],"mappings":"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"}
+{"version":3,"file":"organizations.js","names":[],"sources":["../../src/repositories/organizations.ts"],"sourcesContent":["// organizations — Drizzle repository (implements the core outbound port).\nimport { and, asc, eq, inArray, sql } from \"drizzle-orm\";\nimport type { NodePgDatabase } from \"drizzle-orm/node-postgres\";\nimport type {\n  CreateOrgUserInput,\n  Invite,\n  NewInviteRow,\n  NewOrganizationRow,\n  Organization,\n  OrganizationsRepository,\n  OrgUser,\n  UpdateOrganizationInput,\n  UpdateOrgUserInput,\n} from \"@headless-lms/core/organizations\";\nimport { invites, organizations, orgUsers } from \"../schema/organizations.js\";\nimport type { Logger } from \"@headless-lms/core/shared/ports\";\nimport { noopLogger } from \"@headless-lms/core/shared/logger\";\nimport { ConflictError } from \"@headless-lms/core/shared/errors\";\nimport { isUniqueViolation, pgErrorFields, translateDbErrors } from \"./pg-errors.js\";\n\nconst INVITE_STATUSES = [\"pending\", \"accepted\", \"rejected\", \"canceled\"] as const;\ntype InviteStatus = (typeof INVITE_STATUSES)[number];\nconst toStatus = (s: string): InviteStatus =>\n  (INVITE_STATUSES as readonly string[]).includes(s) ? (s as InviteStatus) : \"pending\";\n\nfunction toInvite(row: typeof invites.$inferSelect): Invite {\n  return {\n    id: row.id,\n    orgId: row.orgId,\n    email: row.email,\n    roleKey: row.roleKey,\n    status: row.status,\n    invitedBy: row.invitedBy,\n    tokenHash: row.tokenHash,\n    expiresAt: row.expiresAt,\n    createdAt: row.createdAt,\n    updatedAt: row.updatedAt,\n  };\n}\n\nexport class DrizzleOrganizationsRepository implements OrganizationsRepository {\n  constructor(\n    private readonly db: NodePgDatabase,\n    private readonly logger: Logger = noopLogger,\n  ) {}\n\n  async create(input: NewOrganizationRow): Promise<Organization> {\n    const [row] = await this.db\n      .insert(organizations)\n      .values({\n        externalId: input.externalId,\n        name: input.name,\n        slug: input.slug,\n        ownerId: input.ownerId,\n        id: input.id,\n      })\n      .returning();\n    if (!row) {\n      throw new Error(\"failed to insert organization\");\n    }\n    return row!;\n  }\n\n  async update(id: string, input: UpdateOrganizationInput): Promise<Organization | null> {\n    const [row] = await this.db\n      .update(organizations)\n      .set({ name: input.name, slug: input.slug })\n      .where(eq(organizations.id, id))\n      .returning();\n    return row ?? null;\n  }\n\n  async delete(id: string): Promise<Organization> {\n    const [row] = await this.db.delete(organizations).where(eq(organizations.id, id)).returning();\n\n    if (!row) {\n      throw new Error(\"failed to delete organization\");\n    }\n    return row;\n  }\n\n  async findById(id: string): Promise<Organization | null> {\n    const [row] = await this.db.select().from(organizations).where(eq(organizations.id, id));\n    return row ?? null;\n  }\n\n  async listIds(): Promise<string[]> {\n    const rows = await this.db\n      .select({ id: organizations.id })\n      .from(organizations)\n      .orderBy(asc(organizations.id));\n    return rows.map((row) => row.id);\n  }\n\n  async findByExternalId(externalId: string): Promise<Organization | null> {\n    const [row] = await this.db\n      .select()\n      .from(organizations)\n      .where(eq(organizations.externalId, externalId))\n      .limit(1);\n    return row ?? null;\n  }\n\n  async findBySlug(slug: string): Promise<Organization | null> {\n    const [row] = await this.db\n      .select()\n      .from(organizations)\n      .where(eq(organizations.slug, slug))\n      .limit(1);\n    return row ?? null;\n  }\n\n  async upsertPendingInvite(orgId: string, input: NewInviteRow): Promise<Invite> {\n    const [row] = await this.db\n      .insert(invites)\n      .values({\n        orgId,\n        email: input.email,\n        roleKey: input.roleKey,\n        status: \"pending\",\n        invitedBy: input.invitedBy,\n        tokenHash: input.tokenHash,\n        expiresAt: input.expiresAt,\n      })\n      .onConflictDoUpdate({\n        target: [invites.orgId, invites.email],\n        targetWhere: sql`${invites.status} = 'pending'`,\n        set: {\n          roleKey: input.roleKey,\n          invitedBy: input.invitedBy,\n          tokenHash: input.tokenHash,\n          expiresAt: input.expiresAt,\n        },\n      })\n      .returning();\n    if (!row) {\n      throw new Error(\"failed to upsert invite\");\n    }\n    return toInvite(row);\n  }\n\n  async setInviteStatus(orgId: string, id: string, status: string): Promise<Invite | null> {\n    const [row] = await this.db\n      .update(invites)\n      .set({ status: toStatus(status) })\n      .where(and(eq(invites.orgId, orgId), eq(invites.id, id)))\n      .returning();\n    return row ? toInvite(row) : null;\n  }\n\n  async setInviteRole(\n    orgId: string,\n    id: string,\n    roleKey: string,\n    invitedBy: string,\n  ): Promise<Invite | null> {\n    const [row] = await this.db\n      .update(invites)\n      .set({ roleKey, invitedBy })\n      .where(and(eq(invites.orgId, orgId), eq(invites.id, id), eq(invites.status, \"pending\")))\n      .returning();\n    return row ? toInvite(row) : null;\n  }\n\n  async findInviteByTokenHash(tokenHash: string): Promise<Invite | null> {\n    const [row] = await this.db\n      .select()\n      .from(invites)\n      .where(eq(invites.tokenHash, tokenHash))\n      .limit(1);\n    return row ? toInvite(row) : null;\n  }\n\n  async findPendingInvite(orgId: string, email: string): Promise<Invite | null> {\n    const [row] = await this.db\n      .select()\n      .from(invites)\n      .where(\n        and(\n          eq(invites.orgId, orgId),\n          sql`lower(${invites.email}) = lower(${email})`,\n          eq(invites.status, \"pending\"),\n        ),\n      )\n      .limit(1);\n    return row ? toInvite(row) : null;\n  }\n\n  async setInviteToken(\n    orgId: string,\n    id: string,\n    tokenHash: string,\n    expiresAt: Date,\n    invitedBy: string,\n  ): Promise<Invite | null> {\n    const [row] = await this.db\n      .update(invites)\n      .set({ tokenHash, expiresAt, invitedBy })\n      .where(and(eq(invites.orgId, orgId), eq(invites.id, id), eq(invites.status, \"pending\")))\n      .returning();\n    return row ? toInvite(row) : null;\n  }\n\n  async findOrgUser(orgId: string, userId: string): Promise<OrgUser | null> {\n    const [row] = await this.db\n      .select()\n      .from(orgUsers)\n      .where(and(eq(orgUsers.orgId, orgId), eq(orgUsers.userId, userId)))\n      .limit(1);\n    return row ?? null;\n  }\n\n  async findOrgUsersByUser(userId: string): Promise<OrgUser[]> {\n    const rows = await this.db\n      .select()\n      .from(orgUsers)\n      .where(eq(orgUsers.userId, userId))\n      .orderBy(orgUsers.createdAt);\n    return rows;\n  }\n\n  async findOrgUserById(orgId: string, id: string): Promise<OrgUser | null> {\n    const [row] = await this.db\n      .select()\n      .from(orgUsers)\n      .where(and(eq(orgUsers.orgId, orgId), eq(orgUsers.id, id)))\n      .limit(1);\n    return row ?? null;\n  }\n\n  async findOrgUsersByIds(orgId: string, ids: string[]): Promise<OrgUser[]> {\n    if (ids.length === 0) {\n      return [];\n    }\n    const rows = await this.db\n      .select()\n      .from(orgUsers)\n      .where(and(eq(orgUsers.orgId, orgId), inArray(orgUsers.id, ids)));\n    return rows;\n  }\n\n  async createOrgUser(input: CreateOrgUserInput): Promise<OrgUser> {\n    try {\n      const [row] = await this.db\n        .insert(orgUsers)\n        .values({\n          orgId: input.orgId,\n          userId: input.userId,\n          status: input.status ?? \"active\",\n        })\n        .returning();\n      if (!row) {\n        throw new Error(\"failed to insert org user\");\n      }\n      return row;\n    } catch (err) {\n      if (isUniqueViolation(err)) {\n        throw new ConflictError(\"That account already belongs to this organization\");\n      }\n      throw err;\n    }\n  }\n\n  async updateOrgUser(\n    orgId: string,\n    id: string,\n    patch: UpdateOrgUserInput,\n  ): Promise<OrgUser | null> {\n    const [row] = await this.db\n      .update(orgUsers)\n      .set({\n        ...(patch.status !== undefined && { status: patch.status }),\n      })\n      .where(and(eq(orgUsers.orgId, orgId), eq(orgUsers.id, id)))\n      .returning();\n    return row ?? null;\n  }\n\n  async deleteOrgUser(orgId: string, id: string): Promise<OrgUser | null> {\n    try {\n      const [row] = await this.db\n        .delete(orgUsers)\n        .where(and(eq(orgUsers.orgId, orgId), eq(orgUsers.id, id)))\n        .returning();\n      return row ?? null;\n    } catch (err) {\n      if (pgErrorFields(err)?.code === \"23503\") {\n        throw Object.assign(\n          new ConflictError(\n            \"This person has written posts, comments or messages and cannot be deleted\",\n          ),\n          { cause: err },\n        );\n      }\n      throw err;\n    }\n  }\n}\ntranslateDbErrors(DrizzleOrganizationsRepository);\n"],"mappings":"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"}

package/dist/repositories/outbox.d.ts

@@ -5,6 +5,10 @@ import { Logger, NewDomainEvent, OutboxAppender, OutboxMessage, OutboxStore } fr
 /** A message that fails this many dispatches is parked: fetchBatch stops
  *  claiming it, leaving the row (with its last_error) for inspection. */
 declare const OUTBOX_MAX_ATTEMPTS = 10;
+/** How long a fetched message stays claimed by the relay that fetched it. Another
+ *  relay fetches it again only after this, so a relay that dies mid-batch delays
+ *  its messages by at most this long. */
+declare const OUTBOX_CLAIM_MS = 60000;
 declare class DrizzleOutboxAppender implements OutboxAppender {
   private readonly tx;
   private readonly logger;
@@ -20,5 +24,5 @@ declare class DrizzleOutboxStore implements OutboxStore {
   markFailed(id: string, error: string, nextAttemptAt: Date): Promise<void>;
 }
 //#endregion
-export { DrizzleOutboxAppender, DrizzleOutboxStore, OUTBOX_MAX_ATTEMPTS };
+export { DrizzleOutboxAppender, DrizzleOutboxStore, OUTBOX_CLAIM_MS, OUTBOX_MAX_ATTEMPTS };
 //# sourceMappingURL=outbox.d.ts.map

package/dist/repositories/outbox.js

@@ -1,11 +1,15 @@
 import { eventOutbox } from "../schema/outbox.js";
 import { translateDbErrors } from "./pg-errors.js";
-import { and, asc, eq, isNull, lt, lte, sql } from "drizzle-orm";
 import { noopLogger } from "@headless-lms/core/shared/logger";
+import { and, asc, eq, inArray, isNull, lt, lte, sql } from "drizzle-orm";
 //#region src/repositories/outbox.ts
 /** A message that fails this many dispatches is parked: fetchBatch stops
 *  claiming it, leaving the row (with its last_error) for inspection. */
 const OUTBOX_MAX_ATTEMPTS = 10;
+/** How long a fetched message stays claimed by the relay that fetched it. Another
+*  relay fetches it again only after this, so a relay that dies mid-batch delays
+*  its messages by at most this long. */
+const OUTBOX_CLAIM_MS = 6e4;
 var DrizzleOutboxAppender = class {
 	tx;
 	logger;
@@ -30,7 +34,12 @@ var DrizzleOutboxStore = class {
 		this.logger = logger;
 	}
 	async fetchBatch(limit) {
-		return (await this.db.transaction((tx) => tx.select().from(eventOutbox).where(and(isNull(eventOutbox.processedAt), lte(eventOutbox.nextAttemptAt, /* @__PURE__ */ new Date()), lt(eventOutbox.attempts, 10))).orderBy(asc(eventOutbox.id)).limit(limit).for("update", { skipLocked: true }))).map((row) => ({
+		const now = /* @__PURE__ */ new Date();
+		return (await this.db.transaction(async (tx) => {
+			const due = await tx.select().from(eventOutbox).where(and(isNull(eventOutbox.processedAt), lte(eventOutbox.nextAttemptAt, now), lt(eventOutbox.attempts, 10))).orderBy(asc(eventOutbox.id)).limit(limit).for("update", { skipLocked: true });
+			if (due.length > 0) await tx.update(eventOutbox).set({ nextAttemptAt: new Date(now.getTime() + OUTBOX_CLAIM_MS) }).where(inArray(eventOutbox.id, due.map((row) => row.id)));
+			return due;
+		})).map((row) => ({
 			id: row.id,
 			attempts: row.attempts,
 			payload: {
@@ -54,6 +63,6 @@ var DrizzleOutboxStore = class {
 translateDbErrors(DrizzleOutboxAppender);
 translateDbErrors(DrizzleOutboxStore);
 //#endregion
-export { DrizzleOutboxAppender, DrizzleOutboxStore, OUTBOX_MAX_ATTEMPTS };
+export { DrizzleOutboxAppender, DrizzleOutboxStore, OUTBOX_CLAIM_MS, OUTBOX_MAX_ATTEMPTS };
 
 //# sourceMappingURL=outbox.js.map