@headless-lms/adapter-db 0.3.0 → 0.5.0

package/dist/repositories/member.js

@@ -4,15 +4,15 @@ import { orgUsers } from "../schema/organizations.js";
 import { contentAccess, spaceMembers } from "../schema/entitlements.js";
 import "../schema/index.js";
 import { translateDbErrors } from "./pg-errors.js";
-import { communityMember, communityPublished } from "./grant-covers.js";
-import { and, asc, eq, ilike, inArray, sql } from "drizzle-orm";
+import { communityMember, communityPublished, oneOf } from "./grant-covers.js";
+import { directEventGrantIds, eventAttendeePage, eventFacesFor, memberEventIds } from "./event-reports.js";
 import { noopLogger } from "@headless-lms/core/shared/logger";
+import { and, asc, eq, ilike, inArray, sql } from "drizzle-orm";
 //#region src/repositories/member.ts
 function personColumns(orgId) {
 	return {
 		orgUserId: orgUsers.id,
 		userId: orgUsers.userId,
-		role: orgUsers.role,
 		displayName: sql`coalesce(nullif(trim(${userProfiles.displayName}), ''), nullif(trim(concat_ws(' ', ${users.firstName}, ${users.lastName})), ''))`,
 		headline: userProfiles.headline,
 		bio: userProfiles.bio,
@@ -26,10 +26,10 @@ var DrizzleMemberRepository = class {
 		this.db = db;
 		this.logger = logger;
 	}
-	async directory(orgId, communityId, query) {
+	async directory(orgId, communityId, query, readerIds) {
 		const columns = personColumns(orgId);
 		const q = query.search?.trim();
-		const where = and(eq(orgUsers.orgId, orgId), communityMember(sql`${orgUsers.orgId}`, sql`${orgUsers.id}`, sql`${orgUsers.role}`, sql`${communityId}`), q ? ilike(columns.displayName, `%${q}%`) : void 0);
+		const where = and(eq(orgUsers.orgId, orgId), communityMember(sql`${orgUsers.orgId}`, sql`${orgUsers.id}`, sql`${communityId}`, readerIds), q ? ilike(columns.displayName, `%${q}%`) : void 0);
 		const rows = await this.db.select(columns).from(orgUsers).leftJoin(userProfiles, eq(userProfiles.userId, orgUsers.userId)).leftJoin(users, eq(users.id, orgUsers.userId)).where(where).orderBy(asc(userProfiles.displayName), asc(orgUsers.id)).limit(query.pageSize).offset((query.page - 1) * query.pageSize);
 		const [{ total } = { total: 0 }] = await this.db.select({ total: sql`cast(count(*) as int)` }).from(orgUsers).leftJoin(userProfiles, eq(userProfiles.userId, orgUsers.userId)).leftJoin(users, eq(users.id, orgUsers.userId)).where(where);
 		return {
@@ -43,12 +43,24 @@ var DrizzleMemberRepository = class {
 		if (orgUserIds.length === 0) return [];
 		return this.db.select(personColumns(orgId)).from(orgUsers).leftJoin(userProfiles, eq(userProfiles.userId, orgUsers.userId)).leftJoin(users, eq(users.id, orgUsers.userId)).where(and(eq(orgUsers.orgId, orgId), inArray(orgUsers.id, orgUserIds)));
 	}
-	async spaceMemberCounts(orgId, communityId) {
+	eventAttendees(orgId, eventId, page) {
+		return eventAttendeePage(this.db, orgId, eventId, page);
+	}
+	eventFaces(orgId, eventIds, limit) {
+		return eventFacesFor(this.db, orgId, eventIds, limit);
+	}
+	directEventGrants(orgId, orgUserId, eventIds) {
+		return directEventGrantIds(this.db, orgId, orgUserId, eventIds);
+	}
+	events(orgId, query, reader, now) {
+		return memberEventIds(this.db, orgId, query, reader, now);
+	}
+	async spaceMemberCounts(orgId, communityId, excluding) {
 		const holders = this.db.$with("holders").as(this.db.selectDistinct({ orgUserId: contentAccess.orgUserId }).from(contentAccess).where(and(eq(contentAccess.orgId, orgId), eq(contentAccess.contentId, communityId), communityPublished(sql`${orgId}`, sql`${communityId}`))));
 		const seated = this.db.$with("seated").as(this.db.select({
 			spaceId: spaceMembers.spaceId,
 			count: sql`cast(count(*) as int)`.as("count")
-		}).from(spaceMembers).innerJoin(holders, eq(holders.orgUserId, spaceMembers.orgUserId)).where(and(eq(spaceMembers.orgId, orgId), eq(spaceMembers.communityId, communityId), eq(spaceMembers.status, "active"))).groupBy(spaceMembers.spaceId));
+		}).from(spaceMembers).innerJoin(holders, eq(holders.orgUserId, spaceMembers.orgUserId)).where(and(eq(spaceMembers.orgId, orgId), eq(spaceMembers.communityId, communityId), eq(spaceMembers.status, "active"), excluding.length > 0 ? sql`not ${oneOf(sql`${spaceMembers.orgUserId}`, excluding)}` : void 0)).groupBy(spaceMembers.spaceId));
 		const rows = await this.db.with(holders, seated).select({
 			spaceId: spaces.id,
 			count: sql`case when ${spaces.accessRule} = 'all_members' then (select cast(count(*) as int) from ${holders}) else coalesce(${sql.identifier("seated")}.${sql.identifier("count")}, 0) end`

package/dist/repositories/member.js.map

@@ -1 +1 @@
-{"version":3,"file":"member.js","names":[],"sources":["../../src/repositories/member.ts"],"sourcesContent":["// member — Drizzle read repo (implements the reporting/member outbound port).\nimport { and, asc, eq, ilike, inArray, sql } from \"drizzle-orm\";\nimport type { NodePgDatabase } from \"drizzle-orm/node-postgres\";\nimport type {\n  DirectoryQuery,\n  DirectoryRow,\n  MemberReportRepository,\n} from \"@headless-lms/core/reporting/member\";\nimport type { Page } from \"@headless-lms/core/types\";\nimport {\n  contentAccess,\n  orgUsers,\n  spaceMembers,\n  spaces,\n  userProfiles,\n  users,\n} from \"../schema/index.js\";\nimport type { Logger } from \"@headless-lms/core/shared/ports\";\nimport { noopLogger } from \"@headless-lms/core/shared/logger\";\nimport { translateDbErrors } from \"./pg-errors.js\";\nimport { communityMember, communityPublished } from \"./grant-covers.js\";\n\nfunction personColumns(orgId: string) {\n  return {\n    orgUserId: orgUsers.id,\n    userId: orgUsers.userId,\n    role: orgUsers.role,\n    displayName: sql<\n      string | null\n    >`coalesce(nullif(trim(${userProfiles.displayName}), ''), nullif(trim(concat_ws(' ', ${users.firstName}, ${users.lastName})), ''))`,\n    headline: userProfiles.headline,\n    bio: userProfiles.bio,\n    imageAssetId: sql<\n      string | null\n    >`case when ${userProfiles.imageAssetOrgId} = ${orgId} then ${userProfiles.imageAssetId} end`,\n  };\n}\n\nexport class DrizzleMemberRepository implements MemberReportRepository {\n  constructor(\n    private readonly db: NodePgDatabase,\n    private readonly logger: Logger = noopLogger,\n  ) {}\n\n  async directory(\n    orgId: string,\n    communityId: string,\n    query: DirectoryQuery,\n  ): Promise<Page<DirectoryRow>> {\n    const columns = personColumns(orgId);\n    const q = query.search?.trim();\n    const where = and(\n      eq(orgUsers.orgId, orgId),\n      communityMember(\n        sql`${orgUsers.orgId}`,\n        sql`${orgUsers.id}`,\n        sql`${orgUsers.role}`,\n        sql`${communityId}`,\n      ),\n      q ? ilike(columns.displayName, `%${q}%`) : undefined,\n    );\n    const rows = await this.db\n      .select(columns)\n      .from(orgUsers)\n      .leftJoin(userProfiles, eq(userProfiles.userId, orgUsers.userId))\n      .leftJoin(users, eq(users.id, orgUsers.userId))\n      .where(where)\n      .orderBy(asc(userProfiles.displayName), asc(orgUsers.id))\n      .limit(query.pageSize)\n      .offset((query.page - 1) * query.pageSize);\n    const [{ total } = { total: 0 }] = await this.db\n      .select({ total: sql<number>`cast(count(*) as int)` })\n      .from(orgUsers)\n      .leftJoin(userProfiles, eq(userProfiles.userId, orgUsers.userId))\n      .leftJoin(users, eq(users.id, orgUsers.userId))\n      .where(where);\n    return { rows, total, page: query.page, pageSize: query.pageSize };\n  }\n\n  async people(orgId: string, orgUserIds: string[]): Promise<DirectoryRow[]> {\n    if (orgUserIds.length === 0) {\n      return [];\n    }\n    return this.db\n      .select(personColumns(orgId))\n      .from(orgUsers)\n      .leftJoin(userProfiles, eq(userProfiles.userId, orgUsers.userId))\n      .leftJoin(users, eq(users.id, orgUsers.userId))\n      .where(and(eq(orgUsers.orgId, orgId), inArray(orgUsers.id, orgUserIds)));\n  }\n\n  async spaceMemberCounts(orgId: string, communityId: string): Promise<Record<string, number>> {\n    const holders = this.db.$with(\"holders\").as(\n      this.db\n        .selectDistinct({ orgUserId: contentAccess.orgUserId })\n        .from(contentAccess)\n        .where(\n          and(\n            eq(contentAccess.orgId, orgId),\n            eq(contentAccess.contentId, communityId),\n            communityPublished(sql`${orgId}`, sql`${communityId}`),\n          ),\n        ),\n    );\n    const seated = this.db.$with(\"seated\").as(\n      this.db\n        .select({\n          spaceId: spaceMembers.spaceId,\n          count: sql<number>`cast(count(*) as int)`.as(\"count\"),\n        })\n        .from(spaceMembers)\n        .innerJoin(holders, eq(holders.orgUserId, spaceMembers.orgUserId))\n        .where(\n          and(\n            eq(spaceMembers.orgId, orgId),\n            eq(spaceMembers.communityId, communityId),\n            eq(spaceMembers.status, \"active\"),\n          ),\n        )\n        .groupBy(spaceMembers.spaceId),\n    );\n    const rows = await this.db\n      .with(holders, seated)\n      .select({\n        spaceId: spaces.id,\n        count: sql<number>`case when ${spaces.accessRule} = 'all_members' then (select cast(count(*) as int) from ${holders}) else coalesce(${sql.identifier(\"seated\")}.${sql.identifier(\"count\")}, 0) end`,\n      })\n      .from(spaces)\n      .leftJoin(seated, eq(seated.spaceId, spaces.id))\n      .where(and(eq(spaces.orgId, orgId), eq(spaces.communityId, communityId)));\n    return Object.fromEntries(rows.map((row) => [row.spaceId, Number(row.count)]));\n  }\n}\ntranslateDbErrors(DrizzleMemberRepository);\n"],"mappings":"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"}
+{"version":3,"file":"member.js","names":[],"sources":["../../src/repositories/member.ts"],"sourcesContent":["// member — Drizzle read repo (implements the reporting/member outbound port).\nimport { and, asc, eq, ilike, inArray, sql } from \"drizzle-orm\";\nimport type { NodePgDatabase } from \"drizzle-orm/node-postgres\";\nimport type {\n  DirectoryQuery,\n  DirectoryRow,\n  EventAttendeeRow,\n  EventReader,\n  MemberReportRepository,\n} from \"@headless-lms/core/reporting/member\";\nimport type { MemberEventsQuery, Page } from \"@headless-lms/core/types\";\nimport type { EventFaces } from \"@headless-lms/core/reporting/events\";\nimport {\n  contentAccess,\n  orgUsers,\n  spaceMembers,\n  spaces,\n  userProfiles,\n  users,\n} from \"../schema/index.js\";\nimport type { Logger } from \"@headless-lms/core/shared/ports\";\nimport { noopLogger } from \"@headless-lms/core/shared/logger\";\nimport { translateDbErrors } from \"./pg-errors.js\";\nimport { communityMember, communityPublished, oneOf } from \"./grant-covers.js\";\nimport {\n  directEventGrantIds,\n  eventAttendeePage,\n  eventFacesFor,\n  memberEventIds,\n} from \"./event-reports.js\";\n\nfunction personColumns(orgId: string) {\n  return {\n    orgUserId: orgUsers.id,\n    userId: orgUsers.userId,\n    displayName: sql<\n      string | null\n    >`coalesce(nullif(trim(${userProfiles.displayName}), ''), nullif(trim(concat_ws(' ', ${users.firstName}, ${users.lastName})), ''))`,\n    headline: userProfiles.headline,\n    bio: userProfiles.bio,\n    imageAssetId: sql<\n      string | null\n    >`case when ${userProfiles.imageAssetOrgId} = ${orgId} then ${userProfiles.imageAssetId} end`,\n  };\n}\n\nexport class DrizzleMemberRepository implements MemberReportRepository {\n  constructor(\n    private readonly db: NodePgDatabase,\n    private readonly logger: Logger = noopLogger,\n  ) {}\n\n  async directory(\n    orgId: string,\n    communityId: string,\n    query: DirectoryQuery,\n    readerIds: string[],\n  ): Promise<Page<DirectoryRow>> {\n    const columns = personColumns(orgId);\n    const q = query.search?.trim();\n    const where = and(\n      eq(orgUsers.orgId, orgId),\n      communityMember(sql`${orgUsers.orgId}`, sql`${orgUsers.id}`, sql`${communityId}`, readerIds),\n      q ? ilike(columns.displayName, `%${q}%`) : undefined,\n    );\n    const rows = await this.db\n      .select(columns)\n      .from(orgUsers)\n      .leftJoin(userProfiles, eq(userProfiles.userId, orgUsers.userId))\n      .leftJoin(users, eq(users.id, orgUsers.userId))\n      .where(where)\n      .orderBy(asc(userProfiles.displayName), asc(orgUsers.id))\n      .limit(query.pageSize)\n      .offset((query.page - 1) * query.pageSize);\n    const [{ total } = { total: 0 }] = await this.db\n      .select({ total: sql<number>`cast(count(*) as int)` })\n      .from(orgUsers)\n      .leftJoin(userProfiles, eq(userProfiles.userId, orgUsers.userId))\n      .leftJoin(users, eq(users.id, orgUsers.userId))\n      .where(where);\n    return { rows, total, page: query.page, pageSize: query.pageSize };\n  }\n\n  async people(orgId: string, orgUserIds: string[]): Promise<DirectoryRow[]> {\n    if (orgUserIds.length === 0) {\n      return [];\n    }\n    return this.db\n      .select(personColumns(orgId))\n      .from(orgUsers)\n      .leftJoin(userProfiles, eq(userProfiles.userId, orgUsers.userId))\n      .leftJoin(users, eq(users.id, orgUsers.userId))\n      .where(and(eq(orgUsers.orgId, orgId), inArray(orgUsers.id, orgUserIds)));\n  }\n\n  eventAttendees(\n    orgId: string,\n    eventId: string,\n    page: { page: number; pageSize: number },\n  ): Promise<Page<EventAttendeeRow>> {\n    return eventAttendeePage(this.db, orgId, eventId, page);\n  }\n\n  eventFaces(\n    orgId: string,\n    eventIds: string[],\n    limit: number,\n  ): Promise<Record<string, EventFaces>> {\n    return eventFacesFor(this.db, orgId, eventIds, limit);\n  }\n\n  directEventGrants(orgId: string, orgUserId: string, eventIds: string[]): Promise<string[]> {\n    return directEventGrantIds(this.db, orgId, orgUserId, eventIds);\n  }\n\n  events(\n    orgId: string,\n    query: MemberEventsQuery,\n    reader: EventReader,\n    now: Date,\n  ): Promise<Page<string>> {\n    return memberEventIds(this.db, orgId, query, reader, now);\n  }\n\n  async spaceMemberCounts(\n    orgId: string,\n    communityId: string,\n    excluding: string[],\n  ): Promise<Record<string, number>> {\n    const holders = this.db.$with(\"holders\").as(\n      this.db\n        .selectDistinct({ orgUserId: contentAccess.orgUserId })\n        .from(contentAccess)\n        .where(\n          and(\n            eq(contentAccess.orgId, orgId),\n            eq(contentAccess.contentId, communityId),\n            communityPublished(sql`${orgId}`, sql`${communityId}`),\n          ),\n        ),\n    );\n    const seated = this.db.$with(\"seated\").as(\n      this.db\n        .select({\n          spaceId: spaceMembers.spaceId,\n          count: sql<number>`cast(count(*) as int)`.as(\"count\"),\n        })\n        .from(spaceMembers)\n        .innerJoin(holders, eq(holders.orgUserId, spaceMembers.orgUserId))\n        .where(\n          and(\n            eq(spaceMembers.orgId, orgId),\n            eq(spaceMembers.communityId, communityId),\n            eq(spaceMembers.status, \"active\"),\n            excluding.length > 0\n              ? sql`not ${oneOf(sql`${spaceMembers.orgUserId}`, excluding)}`\n              : undefined,\n          ),\n        )\n        .groupBy(spaceMembers.spaceId),\n    );\n    const rows = await this.db\n      .with(holders, seated)\n      .select({\n        spaceId: spaces.id,\n        count: sql<number>`case when ${spaces.accessRule} = 'all_members' then (select cast(count(*) as int) from ${holders}) else coalesce(${sql.identifier(\"seated\")}.${sql.identifier(\"count\")}, 0) end`,\n      })\n      .from(spaces)\n      .leftJoin(seated, eq(seated.spaceId, spaces.id))\n      .where(and(eq(spaces.orgId, orgId), eq(spaces.communityId, communityId)));\n    return Object.fromEntries(rows.map((row) => [row.spaceId, Number(row.count)]));\n  }\n}\ntranslateDbErrors(DrizzleMemberRepository);\n"],"mappings":"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"}

package/dist/repositories/members.d.ts

@@ -1,15 +1,12 @@
 import { NodePgDatabase } from "drizzle-orm/node-postgres";
-import { Member, MemberRecord, MembersQuery, MembersRepository, Page } from "@headless-lms/core/organizations";
+import { MembersRepository, TeamRow } from "@headless-lms/core/organizations";
 import { Logger } from "@headless-lms/core/shared/ports";
 //#region src/repositories/members.d.ts
 declare class DrizzleMembersRepository implements MembersRepository {
   private readonly db;
   private readonly logger;
   constructor(db: NodePgDatabase, logger?: Logger);
-  private loadAll;
-  list(orgId: string, query: MembersQuery): Promise<Page<Member>>;
-  findByEmail(orgId: string, email: string): Promise<MemberRecord | null>;
-  findById(orgId: string, id: string): Promise<MemberRecord | null>;
+  teamRows(orgId: string, memberRoleKey: string): Promise<TeamRow[]>;
 }
 //#endregion
 export { DrizzleMembersRepository };

package/dist/repositories/members.js

@@ -1,26 +1,12 @@
 import { users } from "../schema/identity.js";
 import { invites, orgUsers } from "../schema/organizations.js";
+import { roleAssignments } from "../schema/roles.js";
 import { translateDbErrors } from "./pg-errors.js";
 import { user } from "../schema/better-auth.js";
 import { orgUserProfileColumns } from "./org-user-profile.js";
-import { and, eq, ne } from "drizzle-orm";
 import { noopLogger } from "@headless-lms/core/shared/logger";
-import { STUDENT_ROLE, isRole } from "@headless-lms/core/organizations";
+import { and, eq, inArray, isNotNull, or, sql } from "drizzle-orm";
 //#region src/repositories/members.ts
-const roleOf = (t) => isRole(t) && t !== STUDENT_ROLE ? t : "instructor";
-function toMember(r) {
-	return {
-		id: r.id,
-		firstName: r.firstName,
-		lastName: r.lastName,
-		email: r.email,
-		image: r.image,
-		role: r.role,
-		status: r.status,
-		joinedAt: r.joinedAt,
-		invitedAt: r.invitedAt
-	};
-}
 var DrizzleMembersRepository = class {
 	db;
 	logger;
@@ -28,87 +14,46 @@ var DrizzleMembersRepository = class {
 		this.db = db;
 		this.logger = logger;
 	}
-	async loadAll(orgId) {
-		const memberRows = await this.db.select({
-			...orgUserProfileColumns,
-			role: orgUsers.role,
-			joinedAt: orgUsers.createdAt,
-			userExternalId: users.externalId
-		}).from(orgUsers).innerJoin(users, eq(users.id, orgUsers.userId)).leftJoin(user, eq(user.id, users.externalId)).where(and(eq(orgUsers.orgId, orgId), ne(orgUsers.role, STUDENT_ROLE)));
-		const inviteRows = await this.db.select({
-			id: invites.id,
+	async teamRows(orgId, memberRoleKey) {
+		const pendingInvite = this.db.select({
 			email: invites.email,
-			role: invites.role,
+			roleKey: invites.roleKey,
 			invitedAt: invites.createdAt
-		}).from(invites).where(and(eq(invites.orgId, orgId), eq(invites.status, "pending"), ne(invites.role, STUDENT_ROLE)));
-		const members = memberRows.map((m) => ({
-			id: m.id,
-			firstName: m.firstName,
-			lastName: m.lastName,
-			email: m.email,
-			image: m.image ?? null,
-			role: roleOf(m.role),
-			status: "active",
-			joinedAt: m.joinedAt.toISOString(),
-			invitedAt: null,
-			kind: "member",
-			userExternalId: m.userExternalId,
-			inviteId: null
-		}));
-		const invited = inviteRows.map((i) => ({
-			id: i.id,
-			firstName: null,
-			lastName: null,
-			email: i.email,
-			image: null,
-			role: roleOf(i.role),
-			status: "invited",
-			joinedAt: null,
-			invitedAt: i.invitedAt.toISOString(),
-			kind: "invite",
-			userExternalId: null,
-			inviteId: i.id
-		}));
-		return [...members, ...invited];
-	}
-	async list(orgId, query) {
-		let rows = await this.loadAll(orgId);
-		if (query.role) rows = rows.filter((r) => r.role === query.role);
-		if (query.status) rows = rows.filter((r) => r.status === query.status);
-		const q = query.search?.trim().toLowerCase();
-		if (q) rows = rows.filter((r) => [
-			r.firstName,
-			r.lastName,
-			r.email
-		].some((v) => v?.toLowerCase().includes(q)));
-		const sort = query.sort;
-		const desc = sort?.startsWith("-") ?? false;
-		const key = desc ? sort.slice(1) : sort;
-		const byName = (a, b) => a === b ? 0 : a === null ? 1 : b === null ? -1 : a.localeCompare(b);
-		rows.sort((a, b) => {
-			if (key === "email") return desc ? -a.email.localeCompare(b.email) : a.email.localeCompare(b.email);
-			if (key === "role") return desc ? -a.role.localeCompare(b.role) : a.role.localeCompare(b.role);
-			if (key === "lastName") {
-				const cmp = byName(a.lastName, b.lastName) || byName(a.firstName, b.firstName);
-				return desc ? -cmp : cmp;
-			}
-			const cmp = byName(a.firstName, b.firstName) || byName(a.lastName, b.lastName);
-			return desc ? -cmp : cmp;
+		}).from(invites).where(and(eq(invites.orgId, orgId), eq(invites.status, "pending"))).as("pending_invite");
+		const rows = await this.db.select({
+			...orgUserProfileColumns,
+			status: orgUsers.status,
+			joinedAt: orgUsers.createdAt,
+			inviteRoleKey: pendingInvite.roleKey,
+			invitedAt: pendingInvite.invitedAt
+		}).from(orgUsers).innerJoin(users, eq(users.id, orgUsers.userId)).leftJoin(user, eq(user.id, users.externalId)).leftJoin(pendingInvite, sql`lower(${pendingInvite.email}) = lower(${users.email})`).where(and(eq(orgUsers.orgId, orgId), or(sql`exists (select 1 from ${roleAssignments} ra where ra.org_id = ${orgUsers.orgId} and ra.org_user_id = ${orgUsers.id})`, and(eq(orgUsers.status, "invited"), isNotNull(pendingInvite.roleKey), sql`${pendingInvite.roleKey} <> ${memberRoleKey}`))));
+		if (rows.length === 0) return [];
+		const assignments = await this.db.select({
+			orgUserId: roleAssignments.orgUserId,
+			roleKey: roleAssignments.roleKey,
+			contentId: roleAssignments.contentId,
+			contentType: roleAssignments.contentType
+		}).from(roleAssignments).where(and(eq(roleAssignments.orgId, orgId), inArray(roleAssignments.orgUserId, rows.map((row) => row.id))));
+		return rows.map((row) => {
+			const own = assignments.filter((a) => a.orgUserId === row.id);
+			return {
+				id: row.id,
+				firstName: row.firstName,
+				lastName: row.lastName,
+				email: row.email,
+				image: row.image ?? null,
+				status: row.status,
+				joinedAt: row.joinedAt,
+				invitedAt: row.invitedAt ?? null,
+				orgRoleKey: own.find((a) => a.contentId === null)?.roleKey ?? null,
+				inviteRoleKey: row.inviteRoleKey ?? null,
+				items: own.filter((a) => a.contentId !== null && a.contentType !== null).map((a) => ({
+					contentId: a.contentId,
+					contentType: a.contentType,
+					roleKey: a.roleKey
+				}))
+			};
 		});
-		const total = rows.length;
-		const start = (query.page - 1) * query.pageSize;
-		return {
-			rows: rows.slice(start, start + query.pageSize).map(toMember),
-			total,
-			page: query.page,
-			pageSize: query.pageSize
-		};
-	}
-	async findByEmail(orgId, email) {
-		return (await this.loadAll(orgId)).find((r) => r.email.toLowerCase() === email.toLowerCase()) ?? null;
-	}
-	async findById(orgId, id) {
-		return (await this.loadAll(orgId)).find((r) => r.id === id) ?? null;
 	}
 };
 translateDbErrors(DrizzleMembersRepository);

package/dist/repositories/members.js.map

@@ -1 +1 @@
-{"version":3,"file":"members.js","names":[],"sources":["../../src/repositories/members.ts"],"sourcesContent":["// organizations members — Drizzle read repository. Reads the domain mirror of the\n// org's members (orgUsers) and pending invites, joined to the identity user for\n// display. Writes go through the auth provider (see adapters/auth/org-admin.ts).\nimport { and, eq, ne } from \"drizzle-orm\";\nimport type { NodePgDatabase } from \"drizzle-orm/node-postgres\";\nimport {\n  isRole,\n  STUDENT_ROLE,\n  type Member,\n  type MemberRecord,\n  type MembersQuery,\n  type MembersRepository,\n  type Page,\n  type TeamRole,\n} from \"@headless-lms/core/organizations\";\nimport { orgUsers, invites } from \"../schema/organizations.js\";\nimport { users } from \"../schema/identity.js\";\nimport { user } from \"../schema/better-auth.js\";\nimport type { Logger } from \"@headless-lms/core/shared/ports\";\nimport { noopLogger } from \"@headless-lms/core/shared/logger\";\nimport { orgUserProfileColumns } from \"./org-user-profile.js\";\nimport { translateDbErrors } from \"./pg-errors.js\";\n\nconst roleOf = (t: string): TeamRole => (isRole(t) && t !== STUDENT_ROLE ? t : \"instructor\");\n\nfunction toMember(r: MemberRecord): Member {\n  return {\n    id: r.id,\n    firstName: r.firstName,\n    lastName: r.lastName,\n    email: r.email,\n    image: r.image,\n    role: r.role,\n    status: r.status,\n    joinedAt: r.joinedAt,\n    invitedAt: r.invitedAt,\n  };\n}\n\nexport class DrizzleMembersRepository implements MembersRepository {\n  constructor(\n    private readonly db: NodePgDatabase,\n    private readonly logger: Logger = noopLogger,\n  ) {}\n\n  private async loadAll(orgId: string): Promise<MemberRecord[]> {\n    // Learners share this table now, so the role filter is what keeps them off\n    // the staff list. Name/email come from the identity user the row links to.\n    const memberRows = await this.db\n      .select({\n        ...orgUserProfileColumns,\n        role: orgUsers.role,\n        joinedAt: orgUsers.createdAt,\n        userExternalId: users.externalId,\n      })\n      .from(orgUsers)\n      .innerJoin(users, eq(users.id, orgUsers.userId))\n      .leftJoin(user, eq(user.id, users.externalId))\n      .where(and(eq(orgUsers.orgId, orgId), ne(orgUsers.role, STUDENT_ROLE)));\n\n    // Student invites live in the same table but belong to the students\n    // surface, not the members list.\n    const inviteRows = await this.db\n      .select({\n        id: invites.id,\n        email: invites.email,\n        role: invites.role,\n        invitedAt: invites.createdAt,\n      })\n      .from(invites)\n      .where(\n        and(\n          eq(invites.orgId, orgId),\n          eq(invites.status, \"pending\"),\n          ne(invites.role, STUDENT_ROLE),\n        ),\n      );\n\n    const members: MemberRecord[] = memberRows.map((m) => ({\n      id: m.id,\n      firstName: m.firstName,\n      lastName: m.lastName,\n      email: m.email,\n      image: m.image ?? null,\n      role: roleOf(m.role),\n      status: \"active\",\n      joinedAt: m.joinedAt.toISOString(),\n      invitedAt: null,\n      kind: \"member\",\n      userExternalId: m.userExternalId,\n      inviteId: null,\n    }));\n    // A pending invite is an address and nothing else — the invites table\n    // carries no names, so there is nobody to name until they accept.\n    const invited: MemberRecord[] = inviteRows.map((i) => ({\n      id: i.id,\n      firstName: null,\n      lastName: null,\n      email: i.email,\n      image: null,\n      role: roleOf(i.role),\n      status: \"invited\",\n      joinedAt: null,\n      invitedAt: i.invitedAt.toISOString(),\n      kind: \"invite\",\n      userExternalId: null,\n      inviteId: i.id,\n    }));\n    return [...members, ...invited];\n  }\n\n  async list(orgId: string, query: MembersQuery): Promise<Page<Member>> {\n    let rows = await this.loadAll(orgId);\n    if (query.role) {\n      rows = rows.filter((r) => r.role === query.role);\n    }\n    if (query.status) {\n      rows = rows.filter((r) => r.status === query.status);\n    }\n    const q = query.search?.trim().toLowerCase();\n    if (q) {\n      rows = rows.filter((r) =>\n        [r.firstName, r.lastName, r.email].some((v) => v?.toLowerCase().includes(q)),\n      );\n    }\n\n    const sort = query.sort;\n    const desc = sort?.startsWith(\"-\") ?? false;\n    const key = (desc ? sort!.slice(1) : sort) as keyof Member | undefined;\n    // Nulls last whichever way the column is sorted — an unaccepted invite has\n    // no name and belongs at the bottom, not interleaved.\n    const byName = (a: string | null, b: string | null): number =>\n      a === b ? 0 : a === null ? 1 : b === null ? -1 : a.localeCompare(b);\n    rows.sort((a, b) => {\n      if (key === \"email\") {\n        return desc ? -a.email.localeCompare(b.email) : a.email.localeCompare(b.email);\n      }\n      if (key === \"role\") {\n        return desc ? -a.role.localeCompare(b.role) : a.role.localeCompare(b.role);\n      }\n      if (key === \"lastName\") {\n        const cmp = byName(a.lastName, b.lastName) || byName(a.firstName, b.firstName);\n        return desc ? -cmp : cmp;\n      }\n      const cmp = byName(a.firstName, b.firstName) || byName(a.lastName, b.lastName);\n      return desc ? -cmp : cmp;\n    });\n\n    const total = rows.length;\n    const start = (query.page - 1) * query.pageSize;\n    return {\n      rows: rows.slice(start, start + query.pageSize).map(toMember),\n      total,\n      page: query.page,\n      pageSize: query.pageSize,\n    };\n  }\n\n  async findByEmail(orgId: string, email: string): Promise<MemberRecord | null> {\n    const all = await this.loadAll(orgId);\n    return all.find((r) => r.email.toLowerCase() === email.toLowerCase()) ?? null;\n  }\n\n  async findById(orgId: string, id: string): Promise<MemberRecord | null> {\n    const all = await this.loadAll(orgId);\n    return all.find((r) => r.id === id) ?? null;\n  }\n}\ntranslateDbErrors(DrizzleMembersRepository);\n"],"mappings":"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"}
+{"version":3,"file":"members.js","names":[],"sources":["../../src/repositories/members.ts"],"sourcesContent":["import { and, eq, inArray, isNotNull, or, sql } from \"drizzle-orm\";\nimport type { NodePgDatabase } from \"drizzle-orm/node-postgres\";\nimport type { MembersRepository, TeamRow } from \"@headless-lms/core/organizations\";\nimport type { ContentType } from \"@headless-lms/core/types\";\nimport { orgUsers, invites } from \"../schema/organizations.js\";\nimport { roleAssignments } from \"../schema/roles.js\";\nimport { users } from \"../schema/identity.js\";\nimport { user } from \"../schema/better-auth.js\";\nimport type { Logger } from \"@headless-lms/core/shared/ports\";\nimport { noopLogger } from \"@headless-lms/core/shared/logger\";\nimport { orgUserProfileColumns } from \"./org-user-profile.js\";\nimport { translateDbErrors } from \"./pg-errors.js\";\n\nexport class DrizzleMembersRepository implements MembersRepository {\n  constructor(\n    private readonly db: NodePgDatabase,\n    private readonly logger: Logger = noopLogger,\n  ) {}\n\n  async teamRows(orgId: string, memberRoleKey: string): Promise<TeamRow[]> {\n    const pendingInvite = this.db\n      .select({\n        email: invites.email,\n        roleKey: invites.roleKey,\n        invitedAt: invites.createdAt,\n      })\n      .from(invites)\n      .where(and(eq(invites.orgId, orgId), eq(invites.status, \"pending\")))\n      .as(\"pending_invite\");\n    const rows = await this.db\n      .select({\n        ...orgUserProfileColumns,\n        status: orgUsers.status,\n        joinedAt: orgUsers.createdAt,\n        inviteRoleKey: pendingInvite.roleKey,\n        invitedAt: pendingInvite.invitedAt,\n      })\n      .from(orgUsers)\n      .innerJoin(users, eq(users.id, orgUsers.userId))\n      .leftJoin(user, eq(user.id, users.externalId))\n      .leftJoin(pendingInvite, sql`lower(${pendingInvite.email}) = lower(${users.email})`)\n      .where(\n        and(\n          eq(orgUsers.orgId, orgId),\n          or(\n            sql`exists (select 1 from ${roleAssignments} ra where ra.org_id = ${orgUsers.orgId} and ra.org_user_id = ${orgUsers.id})`,\n            and(\n              eq(orgUsers.status, \"invited\"),\n              isNotNull(pendingInvite.roleKey),\n              sql`${pendingInvite.roleKey} <> ${memberRoleKey}`,\n            ),\n          ),\n        ),\n      );\n    if (rows.length === 0) {\n      return [];\n    }\n    const assignments = await this.db\n      .select({\n        orgUserId: roleAssignments.orgUserId,\n        roleKey: roleAssignments.roleKey,\n        contentId: roleAssignments.contentId,\n        contentType: roleAssignments.contentType,\n      })\n      .from(roleAssignments)\n      .where(\n        and(\n          eq(roleAssignments.orgId, orgId),\n          inArray(\n            roleAssignments.orgUserId,\n            rows.map((row) => row.id),\n          ),\n        ),\n      );\n    return rows.map((row) => {\n      const own = assignments.filter((a) => a.orgUserId === row.id);\n      return {\n        id: row.id,\n        firstName: row.firstName,\n        lastName: row.lastName,\n        email: row.email,\n        image: row.image ?? null,\n        status: row.status,\n        joinedAt: row.joinedAt,\n        invitedAt: row.invitedAt ?? null,\n        orgRoleKey: own.find((a) => a.contentId === null)?.roleKey ?? null,\n        inviteRoleKey: row.inviteRoleKey ?? null,\n        items: own\n          .filter((a) => a.contentId !== null && a.contentType !== null)\n          .map((a) => ({\n            contentId: a.contentId!,\n            contentType: a.contentType as ContentType,\n            roleKey: a.roleKey,\n          })),\n      };\n    });\n  }\n}\ntranslateDbErrors(DrizzleMembersRepository);\n"],"mappings":";;;;;;;;;AAaA,IAAa,2BAAb,MAAmE;CAE9C;CACA;CAFnB,YACE,IACA,SAAkC,YAClC;EAFiB,KAAA,KAAA;EACA,KAAA,SAAA;CAChB;CAEH,MAAM,SAAS,OAAe,eAA2C;EACvE,MAAM,gBAAgB,KAAK,GACxB,OAAO;GACN,OAAO,QAAQ;GACf,SAAS,QAAQ;GACjB,WAAW,QAAQ;EACrB,CAAC,CAAC,CACD,KAAK,OAAO,CAAC,CACb,MAAM,IAAI,GAAG,QAAQ,OAAO,KAAK,GAAG,GAAG,QAAQ,QAAQ,SAAS,CAAC,CAAC,CAAC,CACnE,GAAG,gBAAgB;EACtB,MAAM,OAAO,MAAM,KAAK,GACrB,OAAO;GACN,GAAG;GACH,QAAQ,SAAS;GACjB,UAAU,SAAS;GACnB,eAAe,cAAc;GAC7B,WAAW,cAAc;EAC3B,CAAC,CAAC,CACD,KAAK,QAAQ,CAAC,CACd,UAAU,OAAO,GAAG,MAAM,IAAI,SAAS,MAAM,CAAC,CAAC,CAC/C,SAAS,MAAM,GAAG,KAAK,IAAI,MAAM,UAAU,CAAC,CAAC,CAC7C,SAAS,eAAe,GAAG,SAAS,cAAc,MAAM,YAAY,MAAM,MAAM,EAAE,CAAC,CACnF,MACC,IACE,GAAG,SAAS,OAAO,KAAK,GACxB,GACE,GAAG,yBAAyB,gBAAgB,wBAAwB,SAAS,MAAM,wBAAwB,SAAS,GAAG,IACvH,IACE,GAAG,SAAS,QAAQ,SAAS,GAC7B,UAAU,cAAc,OAAO,GAC/B,GAAG,GAAG,cAAc,QAAQ,MAAM,eACpC,CACF,CACF,CACF;EACF,IAAI,KAAK,WAAW,GAClB,OAAO,CAAC;EAEV,MAAM,cAAc,MAAM,KAAK,GAC5B,OAAO;GACN,WAAW,gBAAgB;GAC3B,SAAS,gBAAgB;GACzB,WAAW,gBAAgB;GAC3B,aAAa,gBAAgB;EAC/B,CAAC,CAAC,CACD,KAAK,eAAe,CAAC,CACrB,MACC,IACE,GAAG,gBAAgB,OAAO,KAAK,GAC/B,QACE,gBAAgB,WAChB,KAAK,KAAK,QAAQ,IAAI,EAAE,CAC1B,CACF,CACF;EACF,OAAO,KAAK,KAAK,QAAQ;GACvB,MAAM,MAAM,YAAY,QAAQ,MAAM,EAAE,cAAc,IAAI,EAAE;GAC5D,OAAO;IACL,IAAI,IAAI;IACR,WAAW,IAAI;IACf,UAAU,IAAI;IACd,OAAO,IAAI;IACX,OAAO,IAAI,SAAS;IACpB,QAAQ,IAAI;IACZ,UAAU,IAAI;IACd,WAAW,IAAI,aAAa;IAC5B,YAAY,IAAI,MAAM,MAAM,EAAE,cAAc,IAAI,CAAC,EAAE,WAAW;IAC9D,eAAe,IAAI,iBAAiB;IACpC,OAAO,IACJ,QAAQ,MAAM,EAAE,cAAc,QAAQ,EAAE,gBAAgB,IAAI,CAAC,CAC7D,KAAK,OAAO;KACX,WAAW,EAAE;KACb,aAAa,EAAE;KACf,SAAS,EAAE;IACb,EAAE;GACN;EACF,CAAC;CACH;AACF;AACA,kBAAkB,wBAAwB"}

package/dist/repositories/mentions.d.ts

@@ -0,0 +1,17 @@
+import { NodePgDatabase } from "drizzle-orm/node-postgres";
+import { Logger, MentionItemType } from "@headless-lms/core/types";
+import { MentionsRepository } from "@headless-lms/core/discussion";
+//#region src/repositories/mentions.d.ts
+declare class DrizzleMentionsRepository implements MentionsRepository {
+  private readonly db;
+  private readonly logger;
+  constructor(db: NodePgDatabase, logger?: Logger);
+  ofItem(orgId: string, itemType: MentionItemType, itemId: string): Promise<string[]>;
+  forItems(orgId: string, itemType: MentionItemType, itemIds: string[]): Promise<Record<string, string[]>>;
+  sync(orgId: string, itemType: MentionItemType, itemId: string, orgUserIds: string[], at: Date): Promise<string[]>;
+  removeItem(orgId: string, itemType: MentionItemType, itemId: string): Promise<void>;
+  private item;
+}
+//#endregion
+export { DrizzleMentionsRepository };
+//# sourceMappingURL=mentions.d.ts.map

package/dist/repositories/mentions.js

@@ -0,0 +1,55 @@
+import { mentions } from "../schema/discussion.js";
+import "../schema/index.js";
+import { noopLogger } from "@headless-lms/core/shared/logger";
+import { and, asc, eq, inArray, notInArray } from "drizzle-orm";
+//#region src/repositories/mentions.ts
+var DrizzleMentionsRepository = class {
+	db;
+	logger;
+	constructor(db, logger = noopLogger) {
+		this.db = db;
+		this.logger = logger;
+	}
+	async ofItem(orgId, itemType, itemId) {
+		return (await this.db.select({ orgUserId: mentions.orgUserId }).from(mentions).where(this.item(orgId, itemType, itemId)).orderBy(asc(mentions.createdAt), asc(mentions.orgUserId))).map((row) => row.orgUserId);
+	}
+	async forItems(orgId, itemType, itemIds) {
+		if (itemIds.length === 0) return {};
+		const rows = await this.db.select({
+			itemId: mentions.itemId,
+			orgUserId: mentions.orgUserId
+		}).from(mentions).where(and(eq(mentions.orgId, orgId), eq(mentions.itemType, itemType), inArray(mentions.itemId, itemIds))).orderBy(asc(mentions.itemId), asc(mentions.createdAt), asc(mentions.orgUserId));
+		const byItem = {};
+		for (const row of rows) (byItem[row.itemId] ??= []).push(row.orgUserId);
+		return byItem;
+	}
+	async sync(orgId, itemType, itemId, orgUserIds, at) {
+		const item = this.item(orgId, itemType, itemId);
+		await this.db.delete(mentions).where(orgUserIds.length > 0 ? and(item, notInArray(mentions.orgUserId, orgUserIds)) : item);
+		if (orgUserIds.length === 0) return [];
+		const added = await this.db.insert(mentions).values(orgUserIds.map((orgUserId) => ({
+			orgId,
+			itemType,
+			itemId,
+			orgUserId,
+			createdAt: at
+		}))).onConflictDoNothing().returning({ orgUserId: mentions.orgUserId });
+		this.logger.debug("mentions synced", {
+			orgId,
+			itemType,
+			itemId,
+			added: added.length
+		});
+		return added.map((row) => row.orgUserId);
+	}
+	async removeItem(orgId, itemType, itemId) {
+		await this.db.delete(mentions).where(this.item(orgId, itemType, itemId));
+	}
+	item(orgId, itemType, itemId) {
+		return and(eq(mentions.orgId, orgId), eq(mentions.itemType, itemType), eq(mentions.itemId, itemId));
+	}
+};
+//#endregion
+export { DrizzleMentionsRepository };
+
+//# sourceMappingURL=mentions.js.map

package/dist/repositories/mentions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mentions.js","names":[],"sources":["../../src/repositories/mentions.ts"],"sourcesContent":["import { and, asc, eq, inArray, notInArray } from \"drizzle-orm\";\nimport type { NodePgDatabase } from \"drizzle-orm/node-postgres\";\nimport type { MentionsRepository } from \"@headless-lms/core/discussion\";\nimport type { Logger, MentionItemType } from \"@headless-lms/core/types\";\nimport { noopLogger } from \"@headless-lms/core/shared/logger\";\nimport { mentions } from \"../schema/index.js\";\n\nexport class DrizzleMentionsRepository implements MentionsRepository {\n  constructor(\n    private readonly db: NodePgDatabase,\n    private readonly logger: Logger = noopLogger,\n  ) {}\n\n  async ofItem(orgId: string, itemType: MentionItemType, itemId: string): Promise<string[]> {\n    const rows = await this.db\n      .select({ orgUserId: mentions.orgUserId })\n      .from(mentions)\n      .where(this.item(orgId, itemType, itemId))\n      .orderBy(asc(mentions.createdAt), asc(mentions.orgUserId));\n    return rows.map((row) => row.orgUserId);\n  }\n\n  async forItems(\n    orgId: string,\n    itemType: MentionItemType,\n    itemIds: string[],\n  ): Promise<Record<string, string[]>> {\n    if (itemIds.length === 0) {\n      return {};\n    }\n    const rows = await this.db\n      .select({ itemId: mentions.itemId, orgUserId: mentions.orgUserId })\n      .from(mentions)\n      .where(\n        and(\n          eq(mentions.orgId, orgId),\n          eq(mentions.itemType, itemType),\n          inArray(mentions.itemId, itemIds),\n        ),\n      )\n      .orderBy(asc(mentions.itemId), asc(mentions.createdAt), asc(mentions.orgUserId));\n    const byItem: Record<string, string[]> = {};\n    for (const row of rows) {\n      (byItem[row.itemId] ??= []).push(row.orgUserId);\n    }\n    return byItem;\n  }\n\n  async sync(\n    orgId: string,\n    itemType: MentionItemType,\n    itemId: string,\n    orgUserIds: string[],\n    at: Date,\n  ): Promise<string[]> {\n    const item = this.item(orgId, itemType, itemId);\n    await this.db\n      .delete(mentions)\n      .where(orgUserIds.length > 0 ? and(item, notInArray(mentions.orgUserId, orgUserIds)) : item);\n    if (orgUserIds.length === 0) {\n      return [];\n    }\n    const added = await this.db\n      .insert(mentions)\n      .values(\n        orgUserIds.map((orgUserId) => ({ orgId, itemType, itemId, orgUserId, createdAt: at })),\n      )\n      .onConflictDoNothing()\n      .returning({ orgUserId: mentions.orgUserId });\n    this.logger.debug(\"mentions synced\", { orgId, itemType, itemId, added: added.length });\n    return added.map((row) => row.orgUserId);\n  }\n\n  async removeItem(orgId: string, itemType: MentionItemType, itemId: string): Promise<void> {\n    await this.db.delete(mentions).where(this.item(orgId, itemType, itemId));\n  }\n\n  private item(orgId: string, itemType: MentionItemType, itemId: string) {\n    return and(\n      eq(mentions.orgId, orgId),\n      eq(mentions.itemType, itemType),\n      eq(mentions.itemId, itemId),\n    );\n  }\n}\n"],"mappings":";;;;;AAOA,IAAa,4BAAb,MAAqE;CAEhD;CACA;CAFnB,YACE,IACA,SAAkC,YAClC;EAFiB,KAAA,KAAA;EACA,KAAA,SAAA;CAChB;CAEH,MAAM,OAAO,OAAe,UAA2B,QAAmC;EAMxF,QAAO,MALY,KAAK,GACrB,OAAO,EAAE,WAAW,SAAS,UAAU,CAAC,CAAC,CACzC,KAAK,QAAQ,CAAC,CACd,MAAM,KAAK,KAAK,OAAO,UAAU,MAAM,CAAC,CAAC,CACzC,QAAQ,IAAI,SAAS,SAAS,GAAG,IAAI,SAAS,SAAS,CAAC,EAAA,CAC/C,KAAK,QAAQ,IAAI,SAAS;CACxC;CAEA,MAAM,SACJ,OACA,UACA,SACmC;EACnC,IAAI,QAAQ,WAAW,GACrB,OAAO,CAAC;EAEV,MAAM,OAAO,MAAM,KAAK,GACrB,OAAO;GAAE,QAAQ,SAAS;GAAQ,WAAW,SAAS;EAAU,CAAC,CAAC,CAClE,KAAK,QAAQ,CAAC,CACd,MACC,IACE,GAAG,SAAS,OAAO,KAAK,GACxB,GAAG,SAAS,UAAU,QAAQ,GAC9B,QAAQ,SAAS,QAAQ,OAAO,CAClC,CACF,CAAC,CACA,QAAQ,IAAI,SAAS,MAAM,GAAG,IAAI,SAAS,SAAS,GAAG,IAAI,SAAS,SAAS,CAAC;EACjF,MAAM,SAAmC,CAAC;EAC1C,KAAK,MAAM,OAAO,MAChB,CAAC,OAAO,IAAI,YAAY,CAAC,EAAA,CAAG,KAAK,IAAI,SAAS;EAEhD,OAAO;CACT;CAEA,MAAM,KACJ,OACA,UACA,QACA,YACA,IACmB;EACnB,MAAM,OAAO,KAAK,KAAK,OAAO,UAAU,MAAM;EAC9C,MAAM,KAAK,GACR,OAAO,QAAQ,CAAC,CAChB,MAAM,WAAW,SAAS,IAAI,IAAI,MAAM,WAAW,SAAS,WAAW,UAAU,CAAC,IAAI,IAAI;EAC7F,IAAI,WAAW,WAAW,GACxB,OAAO,CAAC;EAEV,MAAM,QAAQ,MAAM,KAAK,GACtB,OAAO,QAAQ,CAAC,CAChB,OACC,WAAW,KAAK,eAAe;GAAE;GAAO;GAAU;GAAQ;GAAW,WAAW;EAAG,EAAE,CACvF,CAAC,CACA,oBAAoB,CAAC,CACrB,UAAU,EAAE,WAAW,SAAS,UAAU,CAAC;EAC9C,KAAK,OAAO,MAAM,mBAAmB;GAAE;GAAO;GAAU;GAAQ,OAAO,MAAM;EAAO,CAAC;EACrF,OAAO,MAAM,KAAK,QAAQ,IAAI,SAAS;CACzC;CAEA,MAAM,WAAW,OAAe,UAA2B,QAA+B;EACxF,MAAM,KAAK,GAAG,OAAO,QAAQ,CAAC,CAAC,MAAM,KAAK,KAAK,OAAO,UAAU,MAAM,CAAC;CACzE;CAEA,KAAa,OAAe,UAA2B,QAAgB;EACrE,OAAO,IACL,GAAG,SAAS,OAAO,KAAK,GACxB,GAAG,SAAS,UAAU,QAAQ,GAC9B,GAAG,SAAS,QAAQ,MAAM,CAC5B;CACF;AACF"}

package/dist/repositories/notification-settings.d.ts

@@ -0,0 +1,19 @@
+import { NodePgDatabase } from "drizzle-orm/node-postgres";
+import { Logger, StoredSetting } from "@headless-lms/core/types";
+import { NotificationSettingsRepository, SettingKey } from "@headless-lms/core/identity";
+//#region src/repositories/notification-settings.d.ts
+declare class DrizzleNotificationSettingsRepository implements NotificationSettingsRepository {
+  private readonly db;
+  private readonly logger;
+  constructor(db: NodePgDatabase, logger?: Logger);
+  forUsers(orgId: string, userIds: string[], communityId: string | null, categories: string[] | null): Promise<(StoredSetting & {
+    userId: string;
+  })[]>;
+  apply(orgId: string, userId: string, upserts: (SettingKey & {
+    enabled: boolean;
+  })[], deletes: SettingKey[], at: Date): Promise<void>;
+  switchedOn(orgId: string, communityId: string, category: string, spaceId: string | null): Promise<string[]>;
+}
+//#endregion
+export { DrizzleNotificationSettingsRepository };
+//# sourceMappingURL=notification-settings.d.ts.map

package/dist/repositories/notification-settings.js

@@ -0,0 +1,67 @@
+import { notificationSettings } from "../schema/identity.js";
+import { orgUsers } from "../schema/organizations.js";
+import "../schema/index.js";
+import { translateDbErrors } from "./pg-errors.js";
+import { noopLogger } from "@headless-lms/core/shared/logger";
+import { and, eq, inArray, sql } from "drizzle-orm";
+import { genId } from "@headless-lms/core/shared/id";
+//#region src/repositories/notification-settings.ts
+const ns = notificationSettings;
+const communityKey = sql`coalesce(${ns.communityId}, '')`;
+const spaceKey = sql`coalesce(${ns.spaceId}, '')`;
+function matchesKey(key) {
+	return sql`(${communityKey} = ${key.communityId ?? ""} and ${spaceKey} = ${key.spaceId ?? ""} and ${ns.category} = ${key.category} and ${ns.channel} = ${key.channel})`;
+}
+var DrizzleNotificationSettingsRepository = class {
+	db;
+	logger;
+	constructor(db, logger = noopLogger) {
+		this.db = db;
+		this.logger = logger;
+	}
+	async forUsers(orgId, userIds, communityId, categories) {
+		if (userIds.length === 0) return [];
+		const conditions = [
+			eq(ns.orgId, orgId),
+			inArray(ns.userId, userIds),
+			sql`${communityKey} = ${communityId ?? ""}`
+		];
+		if (categories !== null) {
+			if (categories.length === 0) return [];
+			conditions.push(inArray(ns.category, categories));
+		}
+		return this.db.select({
+			userId: ns.userId,
+			communityId: ns.communityId,
+			spaceId: ns.spaceId,
+			category: ns.category,
+			channel: ns.channel,
+			enabled: ns.enabled
+		}).from(ns).where(and(...conditions));
+	}
+	async apply(orgId, userId, upserts, deletes, at) {
+		if (upserts.length === 0 && deletes.length === 0) return;
+		await this.db.transaction(async (tx) => {
+			if (deletes.length > 0) await tx.delete(ns).where(and(eq(ns.orgId, orgId), eq(ns.userId, userId), sql`(${sql.join(deletes.map(matchesKey), sql` or `)})`));
+			if (upserts.length > 0) {
+				const rows = upserts.map((row) => sql`(${orgId}, ${genId("notificationSetting")}, ${userId}, ${row.communityId}, ${row.spaceId}, ${row.category}, ${row.channel}, ${row.enabled}, ${at.toISOString()}::timestamptz)`);
+				await tx.execute(sql`insert into notification_settings (org_id, id, user_id, community_id, space_id, category, channel, enabled, updated_at) values ${sql.join(rows, sql`, `)} on conflict (org_id, user_id, coalesce(community_id, ''), coalesce(space_id, ''), category, channel) do update set enabled = excluded.enabled, updated_at = excluded.updated_at`);
+			}
+		});
+		this.logger.debug("notification settings applied", {
+			orgId,
+			userId,
+			upserts: upserts.length,
+			deletes: deletes.length
+		});
+	}
+	async switchedOn(orgId, communityId, category, spaceId) {
+		const levels = spaceId === null ? [""] : [spaceId, ""];
+		return (await this.db.selectDistinct({ orgUserId: orgUsers.id }).from(ns).innerJoin(orgUsers, and(eq(orgUsers.orgId, ns.orgId), eq(orgUsers.userId, ns.userId))).where(and(eq(ns.orgId, orgId), sql`${communityKey} = ${communityId}`, eq(ns.category, category), sql`${spaceKey} in (${sql.join(levels.map((level) => sql`${level}`), sql`, `)})`, sql`${ns.enabled}`))).map((row) => row.orgUserId);
+	}
+};
+translateDbErrors(DrizzleNotificationSettingsRepository);
+//#endregion
+export { DrizzleNotificationSettingsRepository };
+
+//# sourceMappingURL=notification-settings.js.map

package/dist/repositories/notification-settings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"notification-settings.js","names":[],"sources":["../../src/repositories/notification-settings.ts"],"sourcesContent":["import { and, eq, inArray, sql, type SQL } from \"drizzle-orm\";\nimport type { NodePgDatabase } from \"drizzle-orm/node-postgres\";\nimport type { NotificationSettingsRepository, SettingKey } from \"@headless-lms/core/identity\";\nimport type { Logger, StoredSetting } from \"@headless-lms/core/types\";\nimport { genId } from \"@headless-lms/core/shared/id\";\nimport { noopLogger } from \"@headless-lms/core/shared/logger\";\nimport { notificationSettings, orgUsers } from \"../schema/index.js\";\nimport { translateDbErrors } from \"./pg-errors.js\";\n\nconst ns = notificationSettings;\nconst communityKey = sql`coalesce(${ns.communityId}, '')`;\nconst spaceKey = sql`coalesce(${ns.spaceId}, '')`;\n\nfunction matchesKey(key: SettingKey): SQL {\n  return sql`(${communityKey} = ${key.communityId ?? \"\"} and ${spaceKey} = ${key.spaceId ?? \"\"} and ${ns.category} = ${key.category} and ${ns.channel} = ${key.channel})`;\n}\n\nexport class DrizzleNotificationSettingsRepository implements NotificationSettingsRepository {\n  constructor(\n    private readonly db: NodePgDatabase,\n    private readonly logger: Logger = noopLogger,\n  ) {}\n\n  async forUsers(\n    orgId: string,\n    userIds: string[],\n    communityId: string | null,\n    categories: string[] | null,\n  ): Promise<(StoredSetting & { userId: string })[]> {\n    if (userIds.length === 0) {\n      return [];\n    }\n    const conditions = [\n      eq(ns.orgId, orgId),\n      inArray(ns.userId, userIds),\n      sql`${communityKey} = ${communityId ?? \"\"}`,\n    ];\n    if (categories !== null) {\n      if (categories.length === 0) {\n        return [];\n      }\n      conditions.push(inArray(ns.category, categories));\n    }\n    return this.db\n      .select({\n        userId: ns.userId,\n        communityId: ns.communityId,\n        spaceId: ns.spaceId,\n        category: ns.category,\n        channel: ns.channel,\n        enabled: ns.enabled,\n      })\n      .from(ns)\n      .where(and(...conditions));\n  }\n\n  async apply(\n    orgId: string,\n    userId: string,\n    upserts: (SettingKey & { enabled: boolean })[],\n    deletes: SettingKey[],\n    at: Date,\n  ): Promise<void> {\n    if (upserts.length === 0 && deletes.length === 0) {\n      return;\n    }\n    await this.db.transaction(async (tx) => {\n      if (deletes.length > 0) {\n        await tx\n          .delete(ns)\n          .where(\n            and(\n              eq(ns.orgId, orgId),\n              eq(ns.userId, userId),\n              sql`(${sql.join(deletes.map(matchesKey), sql` or `)})`,\n            ),\n          );\n      }\n      if (upserts.length > 0) {\n        const rows = upserts.map(\n          (row) =>\n            sql`(${orgId}, ${genId(\"notificationSetting\")}, ${userId}, ${row.communityId}, ${row.spaceId}, ${row.category}, ${row.channel}, ${row.enabled}, ${at.toISOString()}::timestamptz)`,\n        );\n        await tx.execute(\n          sql`insert into notification_settings (org_id, id, user_id, community_id, space_id, category, channel, enabled, updated_at) values ${sql.join(rows, sql`, `)} on conflict (org_id, user_id, coalesce(community_id, ''), coalesce(space_id, ''), category, channel) do update set enabled = excluded.enabled, updated_at = excluded.updated_at`,\n        );\n      }\n    });\n    this.logger.debug(\"notification settings applied\", {\n      orgId,\n      userId,\n      upserts: upserts.length,\n      deletes: deletes.length,\n    });\n  }\n\n  async switchedOn(\n    orgId: string,\n    communityId: string,\n    category: string,\n    spaceId: string | null,\n  ): Promise<string[]> {\n    const levels = spaceId === null ? [\"\"] : [spaceId, \"\"];\n    const rows = await this.db\n      .selectDistinct({ orgUserId: orgUsers.id })\n      .from(ns)\n      .innerJoin(orgUsers, and(eq(orgUsers.orgId, ns.orgId), eq(orgUsers.userId, ns.userId)))\n      .where(\n        and(\n          eq(ns.orgId, orgId),\n          sql`${communityKey} = ${communityId}`,\n          eq(ns.category, category),\n          sql`${spaceKey} in (${sql.join(\n            levels.map((level) => sql`${level}`),\n            sql`, `,\n          )})`,\n          sql`${ns.enabled}`,\n        ),\n      );\n    return rows.map((row) => row.orgUserId);\n  }\n}\ntranslateDbErrors(DrizzleNotificationSettingsRepository);\n"],"mappings":"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"}

package/dist/repositories/notifications.d.ts

@@ -1,22 +1,29 @@
-import { NodePgDatabase } from "drizzle-orm/node-postgres";
-import { Notification, NotificationPreference } from "@headless-lms/core/types";
-import { NotificationsQuery, NotificationsRepository } from "@headless-lms/core/identity";
+import { DbExecutor } from "../client.js";
+import { Delivery, NotificationFilter, StoredNotification } from "@headless-lms/core/types";
+import { ListedNotification, NewDelivery, NewNotification, NotificationPage, NotificationsRepository, UnreadCounts } from "@headless-lms/core/automations";
 //#region src/repositories/notifications.d.ts
 declare class DrizzleNotificationsRepository implements NotificationsRepository {
   private readonly db;
-  constructor(db: NodePgDatabase);
-  insert(orgId: string, rows: Notification[]): Promise<void>;
-  page(orgId: string, userId: string, query: NotificationsQuery): Promise<{
-    rows: Notification[];
-    total: number;
-    unreadCount: number;
-  }>;
-  markRead(orgId: string, userId: string, notificationId: string, at: Date): Promise<Notification | null>;
-  markAllRead(orgId: string, userId: string, at: Date): Promise<number>;
-  preferences(orgId: string, userIds: string[]): Promise<(NotificationPreference & {
-    userId: string;
-  })[]>;
-  upsertPreferences(orgId: string, userId: string, preferences: NotificationPreference[]): Promise<void>;
+  constructor(db: DbExecutor);
+  insert(orgId: string, rows: NewNotification[], deliveries: NewDelivery[]): Promise<void>;
+  pendingDeliveriesForEvent(orgId: string, sourceEventId: string): Promise<{
+    id: string;
+  }[]>;
+  findDelivery(orgId: string, deliveryId: string): Promise<{
+    delivery: Delivery;
+    notification: StoredNotification;
+  } | null>;
+  markSent(orgId: string, deliveryId: string, at: Date): Promise<void>;
+  recordError(orgId: string, deliveryId: string, error: string): Promise<void>;
+  markFailed(orgId: string, deliveryId: string, error: string): Promise<void>;
+  page(orgId: string, userId: string, filter: NotificationFilter, page: {
+    page: number;
+    pageSize: number;
+  }): Promise<NotificationPage>;
+  find(orgId: string, userId: string, notificationId: string): Promise<ListedNotification | null>;
+  unreadCounts(orgId: string, userId: string, communityIds: string[]): Promise<UnreadCounts>;
+  markRead(orgId: string, userId: string, notificationId: string, at: Date): Promise<boolean>;
+  markAllRead(orgId: string, userId: string, filter: NotificationFilter, at: Date): Promise<number>;
 }
 //#endregion
 export { DrizzleNotificationsRepository };