@headless-lms/adapter-db 0.2.0 → 0.4.0

package/dist/repositories/discussion.js

@@ -1,12 +1,13 @@
-import { users } from "../schema/identity.js";
-import { orgUsers } from "../schema/organizations.js";
 import { activities } from "../schema/content.js";
-import { commentReactions, commentReports, comments } from "../schema/discussion.js";
+import { userProfiles, users } from "../schema/identity.js";
+import { orgUsers } from "../schema/organizations.js";
+import { commentFlags, commentReactions, comments, posts } from "../schema/discussion.js";
 import "../schema/index.js";
 import { translateDbErrors } from "./pg-errors.js";
 import { user } from "../schema/better-auth.js";
-import { orgUserProfileColumns } from "./org-user-profile.js";
-import { and, asc, desc, eq, ilike, inArray, isNull, sql } from "drizzle-orm";
+import { authorProfileColumns } from "./org-user-profile.js";
+import { insertedRow } from "./inserted-row.js";
+import { and, asc, desc, eq, ilike, inArray, isNull, ne, or, sql } from "drizzle-orm";
 import { noopLogger } from "@headless-lms/core/shared/logger";
 //#region src/repositories/discussion.ts
 /** The title lives in the activity's opaque settings blob; the moderation card
@@ -25,6 +26,8 @@ function toComment(row) {
 		id: row.id,
 		orgId: row.orgId,
 		activityId: row.activityId,
+		postId: row.postId,
+		communityId: row.communityId,
 		parentId: row.parentId ?? null,
 		orgUserId: row.orgUserId,
 		body: row.body,
@@ -46,6 +49,8 @@ var DrizzleDiscussionRepository = class {
 			id: comment.id,
 			orgId,
 			activityId: comment.activityId,
+			postId: comment.postId,
+			communityId: comment.communityId,
 			parentId: comment.parentId,
 			orgUserId: comment.orgUserId,
 			body: comment.body,
@@ -60,6 +65,9 @@ var DrizzleDiscussionRepository = class {
 		const [row] = await this.db.select().from(comments).where(and(eq(comments.orgId, orgId), eq(comments.id, id))).limit(1);
 		return row ? toComment(row) : null;
 	}
+	async commenterIds(orgId, target) {
+		return (await this.db.selectDistinct({ orgUserId: comments.orgUserId }).from(comments).where(and(eq(comments.orgId, orgId), "postId" in target ? eq(comments.postId, target.postId) : eq(comments.activityId, target.activityId), eq(comments.status, "published"))).orderBy(asc(comments.orgUserId))).map((row) => row.orgUserId);
+	}
 	async updateComment(orgId, id, patch) {
 		const [row] = await this.db.update(comments).set({
 			..."body" in patch ? { body: patch.body } : {},
@@ -71,6 +79,25 @@ var DrizzleDiscussionRepository = class {
 	async listByActivity(orgId, activityId) {
 		return (await this.db.select().from(comments).where(and(eq(comments.orgId, orgId), eq(comments.activityId, activityId))).orderBy(comments.createdAt)).map(toComment);
 	}
+	async listThreadsByPost(orgId, postId, query) {
+		const rootReadable = query.seesHeld ? void 0 : or(ne(comments.status, "pending"), eq(comments.orgUserId, query.viewerId));
+		const replyReadable = query.seesHeld ? sql`` : sql` and (rep.status = 'published' or rep.org_user_id = ${query.viewerId})`;
+		const where = and(eq(comments.orgId, orgId), eq(comments.postId, postId), isNull(comments.parentId), rootReadable, or(ne(comments.status, "removed"), sql`exists (
+          select 1 from comments rep
+          where rep.org_id = ${comments.orgId}
+            and rep.parent_id = ${comments.id}
+            and rep.status <> 'removed'${replyReadable}
+        )`));
+		const roots = await this.db.select().from(comments).where(where).orderBy(asc(comments.createdAt), asc(comments.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(comments).where(where);
+		const replies = roots.length === 0 ? [] : await this.db.select().from(comments).where(and(eq(comments.orgId, orgId), inArray(comments.parentId, roots.map((root) => root.id)))).orderBy(asc(comments.createdAt), asc(comments.id));
+		return {
+			rows: [...roots, ...replies].map(toComment),
+			total,
+			page: query.page,
+			pageSize: query.pageSize
+		};
+	}
 	async reactionsOf(orgId, commentIds, viewerId) {
 		if (commentIds.length === 0) return {};
 		const rows = await this.db.select({
@@ -90,9 +117,9 @@ var DrizzleDiscussionRepository = class {
 	async setReaction(orgId, commentId, orgUserId, emoji) {
 		if (emoji === null) {
 			await this.db.delete(commentReactions).where(and(eq(commentReactions.orgId, orgId), eq(commentReactions.commentId, commentId), eq(commentReactions.orgUserId, orgUserId)));
-			return;
+			return false;
 		}
-		await this.db.insert(commentReactions).values({
+		const [row] = await this.db.insert(commentReactions).values({
 			orgId,
 			commentId,
 			orgUserId,
@@ -104,14 +131,12 @@ var DrizzleDiscussionRepository = class {
 				commentReactions.orgUserId
 			],
 			set: { emoji }
-		});
+		}).returning({ inserted: insertedRow });
+		return row?.inserted === true;
 	}
 	async authorsOf(orgId, orgUserIds) {
 		if (orgUserIds.length === 0) return {};
-		const rows = await this.db.select({
-			...orgUserProfileColumns,
-			role: orgUsers.role
-		}).from(orgUsers).innerJoin(users, eq(users.id, orgUsers.userId)).leftJoin(user, eq(user.id, users.externalId)).where(and(eq(orgUsers.orgId, orgId), inArray(orgUsers.id, orgUserIds)));
+		const rows = await this.db.select(authorProfileColumns).from(orgUsers).innerJoin(users, eq(users.id, orgUsers.userId)).leftJoin(user, eq(user.id, users.externalId)).leftJoin(userProfiles, eq(userProfiles.userId, orgUsers.userId)).where(and(eq(orgUsers.orgId, orgId), inArray(orgUsers.id, orgUserIds)));
 		const byId = {};
 		for (const row of rows) byId[row.id] = {
 			id: row.id,
@@ -119,28 +144,63 @@ var DrizzleDiscussionRepository = class {
 			lastName: row.lastName,
 			email: row.email,
 			image: row.image ?? null,
-			role: row.role
+			role: row.role,
+			displayName: row.displayName ?? null,
+			headline: row.headline ?? null,
+			imageAssetOrgId: row.imageAssetOrgId ?? null,
+			imageAssetId: row.imageAssetId ?? null
 		};
 		return byId;
 	}
 	async insertReport(orgId, report) {
-		const [row] = await this.db.insert(commentReports).values({
+		const [row] = await this.db.insert(commentFlags).values({
 			id: report.id,
 			orgId,
 			commentId: report.commentId,
 			orgUserId: report.orgUserId,
 			reason: report.reason,
 			resolvedAt: report.resolvedAt ? new Date(report.resolvedAt) : null,
+			resolution: report.resolution,
+			resolvedBy: report.resolvedBy,
 			createdAt: new Date(report.createdAt)
 		}).onConflictDoNothing().returning();
 		return row ?? null;
 	}
+	async listOpenFlagsForSpace(orgId, spaceId, limit) {
+		return (await this.db.select({
+			flag: commentFlags,
+			comment: {
+				id: comments.id,
+				postId: posts.id,
+				body: comments.body,
+				orgUserId: comments.orgUserId,
+				status: comments.status
+			}
+		}).from(commentFlags).innerJoin(comments, and(eq(comments.orgId, commentFlags.orgId), eq(comments.id, commentFlags.commentId))).innerJoin(posts, and(eq(posts.orgId, comments.orgId), eq(posts.id, comments.postId))).where(and(eq(commentFlags.orgId, orgId), eq(posts.spaceId, spaceId), isNull(commentFlags.resolvedAt))).orderBy(asc(commentFlags.createdAt), asc(commentFlags.id)).limit(limit)).map((row) => ({
+			...row.flag,
+			comment: row.comment
+		}));
+	}
+	async publishedCommentCounts(orgId, postIds) {
+		if (postIds.length === 0) return {};
+		const rows = await this.db.select({
+			postId: comments.postId,
+			count: sql`cast(count(*) as int)`
+		}).from(comments).where(and(eq(comments.orgId, orgId), inArray(comments.postId, postIds), eq(comments.status, "published"))).groupBy(comments.postId);
+		const byPost = {};
+		for (const row of rows) if (row.postId !== null) byPost[row.postId] = row.count;
+		return byPost;
+	}
 	async listOpenReports(orgId, commentIds) {
 		if (commentIds.length === 0) return [];
-		return await this.db.select().from(commentReports).where(and(eq(commentReports.orgId, orgId), inArray(commentReports.commentId, commentIds), isNull(commentReports.resolvedAt))).orderBy(commentReports.createdAt);
+		return await this.db.select().from(commentFlags).where(and(eq(commentFlags.orgId, orgId), inArray(commentFlags.commentId, commentIds), isNull(commentFlags.resolvedAt))).orderBy(commentFlags.createdAt);
 	}
-	async resolveReportsFor(orgId, commentId, resolvedAt) {
-		await this.db.update(commentReports).set({ resolvedAt }).where(and(eq(commentReports.orgId, orgId), eq(commentReports.commentId, commentId), isNull(commentReports.resolvedAt)));
+	async resolveReportsFor(orgId, commentId, resolved) {
+		await this.db.update(commentFlags).set({
+			resolvedAt: resolved.resolvedAt,
+			resolvedBy: resolved.resolvedBy,
+			resolution: resolved.resolution
+		}).where(and(eq(commentFlags.orgId, orgId), eq(commentFlags.commentId, commentId), isNull(commentFlags.resolvedAt)));
 	}
 	/** The list's one join: comments to their activity, which carries both the
 	*  course (denormalised, so the module never enters the query) and the title.
@@ -166,7 +226,7 @@ var DrizzleDiscussionRepository = class {
 		if (query.orgUserId) conditions.push(eq(comments.orgUserId, query.orgUserId));
 		if (query.reported !== void 0) {
 			const hasOpenReport = sql`exists (
-        select 1 from ${commentReports} r
+        select 1 from ${commentFlags} r
         where r.org_id = ${comments.orgId}
           and r.comment_id = ${comments.id}
           and r.resolved_at is null

package/dist/repositories/discussion.js.map

@@ -1 +1 @@
-{"version":3,"file":"discussion.js","names":[],"sources":["../../src/repositories/discussion.ts"],"sourcesContent":["import { and, asc, desc, eq, ilike, inArray, isNull, sql, type SQL } from \"drizzle-orm\";\nimport type { NodePgDatabase } from \"drizzle-orm/node-postgres\";\nimport type {\n  AuthorRecord,\n  CommentReactions,\n  CommentWithContext,\n  DiscussionRepository,\n} from \"@headless-lms/core/discussion\";\nimport type {\n  Comment,\n  CommentReport,\n  ListCommentsQuery,\n  Logger,\n  Page,\n  ReactionEmoji,\n  Role,\n} from \"@headless-lms/core/types\";\nimport { commentReactions, commentReports, comments } from \"../schema/index.js\";\nimport { activities } from \"../schema/content.js\";\nimport { orgUsers } from \"../schema/organizations.js\";\nimport { users } from \"../schema/identity.js\";\nimport { user } from \"../schema/better-auth.js\";\nimport { orgUserProfileColumns } from \"./org-user-profile.js\";\nimport { noopLogger } from \"@headless-lms/core/shared/logger\";\nimport { translateDbErrors } from \"./pg-errors.js\";\n\ntype CommentRow = typeof comments.$inferSelect;\n\n/** The title lives in the activity's opaque settings blob; the moderation card\n *  needs it to say \"Lesson 3\" rather than an id. */\nconst activityTitleExpr = sql<string>`coalesce(${activities.settings} ->> 'title', '')`;\n\n/** Sortable columns of the staff comment list, by the client-facing field name.\n *  `activityTitle` sorts on the same expression the row is served from. */\nconst sortColumns = {\n  createdAt: comments.createdAt,\n  updatedAt: comments.updatedAt,\n  status: comments.status,\n  activityTitle: activityTitleExpr,\n} as const;\n\nfunction toComment(row: CommentRow): Comment {\n  return {\n    id: row.id,\n    orgId: row.orgId,\n    activityId: row.activityId,\n    parentId: row.parentId ?? null,\n    orgUserId: row.orgUserId,\n    body: row.body,\n    status: row.status,\n    removedBy: row.removedBy ?? null,\n    createdAt: row.createdAt,\n    updatedAt: row.updatedAt,\n  };\n}\n\nexport class DrizzleDiscussionRepository implements DiscussionRepository {\n  constructor(\n    private readonly db: NodePgDatabase,\n    private readonly logger: Logger = noopLogger,\n  ) {}\n\n  async insertComment(orgId: string, comment: Comment): Promise<Comment> {\n    const [row] = await this.db\n      .insert(comments)\n      .values({\n        id: comment.id,\n        orgId,\n        activityId: comment.activityId,\n        parentId: comment.parentId,\n        orgUserId: comment.orgUserId,\n        body: comment.body,\n        status: comment.status,\n        removedBy: comment.removedBy,\n        createdAt: new Date(comment.createdAt),\n        updatedAt: new Date(comment.updatedAt),\n      })\n      .returning();\n    return toComment(row!);\n  }\n\n  async findComment(orgId: string, id: string): Promise<Comment | null> {\n    const [row] = await this.db\n      .select()\n      .from(comments)\n      .where(and(eq(comments.orgId, orgId), eq(comments.id, id)))\n      .limit(1);\n    return row ? toComment(row) : null;\n  }\n\n  async updateComment(\n    orgId: string,\n    id: string,\n    patch: Partial<Pick<Comment, \"body\" | \"status\" | \"removedBy\" | \"updatedAt\">>,\n  ): Promise<Comment | null> {\n    const [row] = await this.db\n      .update(comments)\n      .set({\n        ...(\"body\" in patch ? { body: patch.body } : {}),\n        ...(\"status\" in patch ? { status: patch.status } : {}),\n        ...(\"removedBy\" in patch ? { removedBy: patch.removedBy ?? null } : {}),\n      })\n      .where(and(eq(comments.orgId, orgId), eq(comments.id, id)))\n      .returning();\n    return row ? toComment(row) : null;\n  }\n\n  async listByActivity(orgId: string, activityId: string): Promise<Comment[]> {\n    const rows = await this.db\n      .select()\n      .from(comments)\n      .where(and(eq(comments.orgId, orgId), eq(comments.activityId, activityId)))\n      .orderBy(comments.createdAt);\n    return rows.map(toComment);\n  }\n\n  async reactionsOf(\n    orgId: string,\n    commentIds: string[],\n    viewerId: string,\n  ): Promise<Record<string, CommentReactions>> {\n    if (commentIds.length === 0) {\n      return {};\n    }\n    const rows = await this.db\n      .select({\n        commentId: commentReactions.commentId,\n        emoji: commentReactions.emoji,\n        count: sql<number>`cast(count(*) as int)`,\n        mine: sql<boolean>`bool_or(${commentReactions.orgUserId} = ${viewerId})`,\n      })\n      .from(commentReactions)\n      .where(\n        and(eq(commentReactions.orgId, orgId), inArray(commentReactions.commentId, commentIds)),\n      )\n      .groupBy(commentReactions.commentId, commentReactions.emoji);\n\n    const byComment: Record<string, CommentReactions> = {};\n    for (const row of rows) {\n      const entry = (byComment[row.commentId] ??= { reactions: {} });\n      entry.reactions[row.emoji] = row.count;\n      if (row.mine) {\n        entry.viewerReaction = row.emoji;\n      }\n    }\n    return byComment;\n  }\n\n  async setReaction(\n    orgId: string,\n    commentId: string,\n    orgUserId: string,\n    emoji: ReactionEmoji | null,\n  ): Promise<void> {\n    if (emoji === null) {\n      await this.db\n        .delete(commentReactions)\n        .where(\n          and(\n            eq(commentReactions.orgId, orgId),\n            eq(commentReactions.commentId, commentId),\n            eq(commentReactions.orgUserId, orgUserId),\n          ),\n        );\n      return;\n    }\n    await this.db\n      .insert(commentReactions)\n      .values({ orgId, commentId, orgUserId, emoji })\n      .onConflictDoUpdate({\n        target: [commentReactions.orgId, commentReactions.commentId, commentReactions.orgUserId],\n        set: { emoji },\n      });\n  }\n\n  async authorsOf(orgId: string, orgUserIds: string[]): Promise<Record<string, AuthorRecord>> {\n    if (orgUserIds.length === 0) {\n      return {};\n    }\n    const rows = await this.db\n      .select({ ...orgUserProfileColumns, role: orgUsers.role })\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), inArray(orgUsers.id, orgUserIds)));\n\n    const byId: Record<string, AuthorRecord> = {};\n    for (const row of rows) {\n      byId[row.id] = {\n        id: row.id,\n        firstName: row.firstName,\n        lastName: row.lastName,\n        email: row.email,\n        image: row.image ?? null,\n        role: row.role as Role,\n      };\n    }\n    return byId;\n  }\n\n  async insertReport(orgId: string, report: CommentReport): Promise<CommentReport | null> {\n    const [row] = await this.db\n      .insert(commentReports)\n      .values({\n        id: report.id,\n        orgId,\n        commentId: report.commentId,\n        orgUserId: report.orgUserId,\n        reason: report.reason,\n        resolvedAt: report.resolvedAt ? new Date(report.resolvedAt) : null,\n        createdAt: new Date(report.createdAt),\n      })\n      .onConflictDoNothing()\n      .returning();\n    return row ?? null;\n  }\n\n  async listOpenReports(orgId: string, commentIds: string[]): Promise<CommentReport[]> {\n    if (commentIds.length === 0) {\n      return [];\n    }\n    const rows = await this.db\n      .select()\n      .from(commentReports)\n      .where(\n        and(\n          eq(commentReports.orgId, orgId),\n          inArray(commentReports.commentId, commentIds),\n          isNull(commentReports.resolvedAt),\n        ),\n      )\n      .orderBy(commentReports.createdAt);\n    return rows;\n  }\n\n  async resolveReportsFor(orgId: string, commentId: string, resolvedAt: Date): Promise<void> {\n    await this.db\n      .update(commentReports)\n      .set({ resolvedAt })\n      .where(\n        and(\n          eq(commentReports.orgId, orgId),\n          eq(commentReports.commentId, commentId),\n          isNull(commentReports.resolvedAt),\n        ),\n      );\n  }\n\n  /** The list's one join: comments to their activity, which carries both the\n   *  course (denormalised, so the module never enters the query) and the title.\n   *  The course filter and the row's activity title come out of that same pass,\n   *  so neither costs an extra query. */\n  private listRows(where: SQL | undefined) {\n    return this.db\n      .select({\n        comment: comments,\n        courseId: activities.courseId,\n        activityTitle: activityTitleExpr,\n      })\n      .from(comments)\n      .innerJoin(\n        activities,\n        and(eq(activities.orgId, comments.orgId), eq(activities.id, comments.activityId)),\n      )\n      .where(where);\n  }\n\n  /** The same join and filters, counted. Separate from `listRows` because the\n   *  total must ignore limit/offset. */\n  private listTotal(where: SQL | undefined) {\n    return this.db\n      .select({ total: sql<number>`cast(count(*) as int)` })\n      .from(comments)\n      .innerJoin(\n        activities,\n        and(eq(activities.orgId, comments.orgId), eq(activities.id, comments.activityId)),\n      )\n      .where(where);\n  }\n\n  async listComments(orgId: string, query: ListCommentsQuery): Promise<Page<CommentWithContext>> {\n    const conditions: SQL[] = [eq(comments.orgId, orgId)];\n    if (query.status) {\n      conditions.push(eq(comments.status, query.status));\n    }\n    if (query.courseId) {\n      conditions.push(eq(activities.courseId, query.courseId));\n    }\n    if (query.activityId) {\n      conditions.push(eq(comments.activityId, query.activityId));\n    }\n    if (query.orgUserId) {\n      conditions.push(eq(comments.orgUserId, query.orgUserId));\n    }\n    if (query.reported !== undefined) {\n      // Correlated EXISTS rather than a join to comment_reports: a comment with\n      // three open reports must stay one row.\n      const hasOpenReport = sql`exists (\n        select 1 from ${commentReports} r\n        where r.org_id = ${comments.orgId}\n          and r.comment_id = ${comments.id}\n          and r.resolved_at is null\n      )`;\n      conditions.push(query.reported ? hasOpenReport : sql`not ${hasOpenReport}`);\n    }\n    if (query.search) {\n      conditions.push(ilike(comments.body, `%${query.search}%`));\n    }\n    const where = and(...conditions);\n\n    // Sort: `-field` for descending; default to newest first, which is the\n    // order a moderator works in.\n    let orderBy: SQL;\n    if (query.sort) {\n      const isDesc = query.sort.startsWith(\"-\");\n      const field = (isDesc ? query.sort.slice(1) : query.sort) as keyof typeof sortColumns;\n      const col = sortColumns[field] ?? comments.createdAt;\n      orderBy = isDesc ? desc(col) : asc(col);\n    } else {\n      orderBy = desc(comments.createdAt);\n    }\n\n    const rows = await this.listRows(where)\n      .orderBy(orderBy)\n      .limit(query.pageSize)\n      .offset((query.page - 1) * query.pageSize);\n\n    const [{ total } = { total: 0 }] = await this.listTotal(where);\n\n    return {\n      rows: rows.map((r) => ({\n        comment: toComment(r.comment),\n        courseId: r.courseId,\n        activityTitle: r.activityTitle,\n      })),\n      total,\n      page: query.page,\n      pageSize: query.pageSize,\n    };\n  }\n}\ntranslateDbErrors(DrizzleDiscussionRepository);\n"],"mappings":"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"}
+{"version":3,"file":"discussion.js","names":[],"sources":["../../src/repositories/discussion.ts"],"sourcesContent":["import { and, asc, desc, eq, ilike, inArray, isNull, ne, or, sql, type SQL } from \"drizzle-orm\";\nimport type { NodePgDatabase } from \"drizzle-orm/node-postgres\";\nimport type {\n  AuthorRecord,\n  CommentReactions,\n  CommentWithContext,\n  DiscussionRepository,\n  PostThreadsQuery,\n} from \"@headless-lms/core/discussion\";\nimport type {\n  Comment,\n  CommentReport,\n  FlaggedComment,\n  ListCommentsQuery,\n  Logger,\n  Page,\n  ReactionEmoji,\n  Role,\n} from \"@headless-lms/core/types\";\nimport { commentFlags, commentReactions, comments, posts } from \"../schema/index.js\";\nimport { activities } from \"../schema/content.js\";\nimport { orgUsers } from \"../schema/organizations.js\";\nimport { userProfiles, users } from \"../schema/identity.js\";\nimport { user } from \"../schema/better-auth.js\";\nimport { authorProfileColumns } from \"./org-user-profile.js\";\nimport { noopLogger } from \"@headless-lms/core/shared/logger\";\nimport { translateDbErrors } from \"./pg-errors.js\";\nimport { insertedRow } from \"./inserted-row.js\";\n\ntype CommentRow = typeof comments.$inferSelect;\n\n/** The title lives in the activity's opaque settings blob; the moderation card\n *  needs it to say \"Lesson 3\" rather than an id. */\nconst activityTitleExpr = sql<string>`coalesce(${activities.settings} ->> 'title', '')`;\n\n/** Sortable columns of the staff comment list, by the client-facing field name.\n *  `activityTitle` sorts on the same expression the row is served from. */\nconst sortColumns = {\n  createdAt: comments.createdAt,\n  updatedAt: comments.updatedAt,\n  status: comments.status,\n  activityTitle: activityTitleExpr,\n} as const;\n\nfunction toComment(row: CommentRow): Comment {\n  return {\n    id: row.id,\n    orgId: row.orgId,\n    activityId: row.activityId,\n    postId: row.postId,\n    communityId: row.communityId,\n    parentId: row.parentId ?? null,\n    orgUserId: row.orgUserId,\n    body: row.body,\n    status: row.status,\n    removedBy: row.removedBy ?? null,\n    createdAt: row.createdAt,\n    updatedAt: row.updatedAt,\n  };\n}\n\nexport class DrizzleDiscussionRepository implements DiscussionRepository {\n  constructor(\n    private readonly db: NodePgDatabase,\n    private readonly logger: Logger = noopLogger,\n  ) {}\n\n  async insertComment(orgId: string, comment: Comment): Promise<Comment> {\n    const [row] = await this.db\n      .insert(comments)\n      .values({\n        id: comment.id,\n        orgId,\n        activityId: comment.activityId,\n        postId: comment.postId,\n        communityId: comment.communityId,\n        parentId: comment.parentId,\n        orgUserId: comment.orgUserId,\n        body: comment.body,\n        status: comment.status,\n        removedBy: comment.removedBy,\n        createdAt: new Date(comment.createdAt),\n        updatedAt: new Date(comment.updatedAt),\n      })\n      .returning();\n    return toComment(row!);\n  }\n\n  async findComment(orgId: string, id: string): Promise<Comment | null> {\n    const [row] = await this.db\n      .select()\n      .from(comments)\n      .where(and(eq(comments.orgId, orgId), eq(comments.id, id)))\n      .limit(1);\n    return row ? toComment(row) : null;\n  }\n\n  async commenterIds(\n    orgId: string,\n    target: { postId: string } | { activityId: string },\n  ): Promise<string[]> {\n    const rows = await this.db\n      .selectDistinct({ orgUserId: comments.orgUserId })\n      .from(comments)\n      .where(\n        and(\n          eq(comments.orgId, orgId),\n          \"postId\" in target\n            ? eq(comments.postId, target.postId)\n            : eq(comments.activityId, target.activityId),\n          eq(comments.status, \"published\"),\n        ),\n      )\n      .orderBy(asc(comments.orgUserId));\n    return rows.map((row) => row.orgUserId);\n  }\n\n  async updateComment(\n    orgId: string,\n    id: string,\n    patch: Partial<Pick<Comment, \"body\" | \"status\" | \"removedBy\" | \"updatedAt\">>,\n  ): Promise<Comment | null> {\n    const [row] = await this.db\n      .update(comments)\n      .set({\n        ...(\"body\" in patch ? { body: patch.body } : {}),\n        ...(\"status\" in patch ? { status: patch.status } : {}),\n        ...(\"removedBy\" in patch ? { removedBy: patch.removedBy ?? null } : {}),\n      })\n      .where(and(eq(comments.orgId, orgId), eq(comments.id, id)))\n      .returning();\n    return row ? toComment(row) : null;\n  }\n\n  async listByActivity(orgId: string, activityId: string): Promise<Comment[]> {\n    const rows = await this.db\n      .select()\n      .from(comments)\n      .where(and(eq(comments.orgId, orgId), eq(comments.activityId, activityId)))\n      .orderBy(comments.createdAt);\n    return rows.map(toComment);\n  }\n\n  async listThreadsByPost(\n    orgId: string,\n    postId: string,\n    query: PostThreadsQuery,\n  ): Promise<Page<Comment>> {\n    const rootReadable = query.seesHeld\n      ? undefined\n      : or(ne(comments.status, \"pending\"), eq(comments.orgUserId, query.viewerId));\n    const replyReadable = query.seesHeld\n      ? sql``\n      : sql` and (rep.status = 'published' or rep.org_user_id = ${query.viewerId})`;\n    const where = and(\n      eq(comments.orgId, orgId),\n      eq(comments.postId, postId),\n      isNull(comments.parentId),\n      rootReadable,\n      or(\n        ne(comments.status, \"removed\"),\n        sql`exists (\n          select 1 from comments rep\n          where rep.org_id = ${comments.orgId}\n            and rep.parent_id = ${comments.id}\n            and rep.status <> 'removed'${replyReadable}\n        )`,\n      ),\n    );\n    const roots = await this.db\n      .select()\n      .from(comments)\n      .where(where)\n      .orderBy(asc(comments.createdAt), asc(comments.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(comments)\n      .where(where);\n    const replies =\n      roots.length === 0\n        ? []\n        : await this.db\n            .select()\n            .from(comments)\n            .where(\n              and(\n                eq(comments.orgId, orgId),\n                inArray(\n                  comments.parentId,\n                  roots.map((root) => root.id),\n                ),\n              ),\n            )\n            .orderBy(asc(comments.createdAt), asc(comments.id));\n    return {\n      rows: [...roots, ...replies].map(toComment),\n      total,\n      page: query.page,\n      pageSize: query.pageSize,\n    };\n  }\n\n  async reactionsOf(\n    orgId: string,\n    commentIds: string[],\n    viewerId: string,\n  ): Promise<Record<string, CommentReactions>> {\n    if (commentIds.length === 0) {\n      return {};\n    }\n    const rows = await this.db\n      .select({\n        commentId: commentReactions.commentId,\n        emoji: commentReactions.emoji,\n        count: sql<number>`cast(count(*) as int)`,\n        mine: sql<boolean>`bool_or(${commentReactions.orgUserId} = ${viewerId})`,\n      })\n      .from(commentReactions)\n      .where(\n        and(eq(commentReactions.orgId, orgId), inArray(commentReactions.commentId, commentIds)),\n      )\n      .groupBy(commentReactions.commentId, commentReactions.emoji);\n\n    const byComment: Record<string, CommentReactions> = {};\n    for (const row of rows) {\n      const entry = (byComment[row.commentId] ??= { reactions: {} });\n      entry.reactions[row.emoji] = row.count;\n      if (row.mine) {\n        entry.viewerReaction = row.emoji;\n      }\n    }\n    return byComment;\n  }\n\n  async setReaction(\n    orgId: string,\n    commentId: string,\n    orgUserId: string,\n    emoji: ReactionEmoji | null,\n  ): Promise<boolean> {\n    if (emoji === null) {\n      await this.db\n        .delete(commentReactions)\n        .where(\n          and(\n            eq(commentReactions.orgId, orgId),\n            eq(commentReactions.commentId, commentId),\n            eq(commentReactions.orgUserId, orgUserId),\n          ),\n        );\n      return false;\n    }\n    const [row] = await this.db\n      .insert(commentReactions)\n      .values({ orgId, commentId, orgUserId, emoji })\n      .onConflictDoUpdate({\n        target: [commentReactions.orgId, commentReactions.commentId, commentReactions.orgUserId],\n        set: { emoji },\n      })\n      .returning({ inserted: insertedRow });\n    return row?.inserted === true;\n  }\n\n  async authorsOf(orgId: string, orgUserIds: string[]): Promise<Record<string, AuthorRecord>> {\n    if (orgUserIds.length === 0) {\n      return {};\n    }\n    const rows = await this.db\n      .select(authorProfileColumns)\n      .from(orgUsers)\n      .innerJoin(users, eq(users.id, orgUsers.userId))\n      .leftJoin(user, eq(user.id, users.externalId))\n      .leftJoin(userProfiles, eq(userProfiles.userId, orgUsers.userId))\n      .where(and(eq(orgUsers.orgId, orgId), inArray(orgUsers.id, orgUserIds)));\n\n    const byId: Record<string, AuthorRecord> = {};\n    for (const row of rows) {\n      byId[row.id] = {\n        id: row.id,\n        firstName: row.firstName,\n        lastName: row.lastName,\n        email: row.email,\n        image: row.image ?? null,\n        role: row.role as Role,\n        displayName: row.displayName ?? null,\n        headline: row.headline ?? null,\n        imageAssetOrgId: row.imageAssetOrgId ?? null,\n        imageAssetId: row.imageAssetId ?? null,\n      };\n    }\n    return byId;\n  }\n\n  async insertReport(orgId: string, report: CommentReport): Promise<CommentReport | null> {\n    const [row] = await this.db\n      .insert(commentFlags)\n      .values({\n        id: report.id,\n        orgId,\n        commentId: report.commentId,\n        orgUserId: report.orgUserId,\n        reason: report.reason,\n        resolvedAt: report.resolvedAt ? new Date(report.resolvedAt) : null,\n        resolution: report.resolution,\n        resolvedBy: report.resolvedBy,\n        createdAt: new Date(report.createdAt),\n      })\n      .onConflictDoNothing()\n      .returning();\n    return row ?? null;\n  }\n\n  async listOpenFlagsForSpace(\n    orgId: string,\n    spaceId: string,\n    limit: number,\n  ): Promise<FlaggedComment[]> {\n    const rows = await this.db\n      .select({\n        flag: commentFlags,\n        comment: {\n          id: comments.id,\n          postId: posts.id,\n          body: comments.body,\n          orgUserId: comments.orgUserId,\n          status: comments.status,\n        },\n      })\n      .from(commentFlags)\n      .innerJoin(\n        comments,\n        and(eq(comments.orgId, commentFlags.orgId), eq(comments.id, commentFlags.commentId)),\n      )\n      .innerJoin(posts, and(eq(posts.orgId, comments.orgId), eq(posts.id, comments.postId)))\n      .where(\n        and(\n          eq(commentFlags.orgId, orgId),\n          eq(posts.spaceId, spaceId),\n          isNull(commentFlags.resolvedAt),\n        ),\n      )\n      .orderBy(asc(commentFlags.createdAt), asc(commentFlags.id))\n      .limit(limit);\n    return rows.map((row) => ({ ...row.flag, comment: row.comment }));\n  }\n\n  async publishedCommentCounts(orgId: string, postIds: string[]): Promise<Record<string, number>> {\n    if (postIds.length === 0) {\n      return {};\n    }\n    const rows = await this.db\n      .select({ postId: comments.postId, count: sql<number>`cast(count(*) as int)` })\n      .from(comments)\n      .where(\n        and(\n          eq(comments.orgId, orgId),\n          inArray(comments.postId, postIds),\n          eq(comments.status, \"published\"),\n        ),\n      )\n      .groupBy(comments.postId);\n    const byPost: Record<string, number> = {};\n    for (const row of rows) {\n      if (row.postId !== null) {\n        byPost[row.postId] = row.count;\n      }\n    }\n    return byPost;\n  }\n\n  async listOpenReports(orgId: string, commentIds: string[]): Promise<CommentReport[]> {\n    if (commentIds.length === 0) {\n      return [];\n    }\n    const rows = await this.db\n      .select()\n      .from(commentFlags)\n      .where(\n        and(\n          eq(commentFlags.orgId, orgId),\n          inArray(commentFlags.commentId, commentIds),\n          isNull(commentFlags.resolvedAt),\n        ),\n      )\n      .orderBy(commentFlags.createdAt);\n    return rows;\n  }\n\n  async resolveReportsFor(\n    orgId: string,\n    commentId: string,\n    resolved: {\n      resolvedAt: Date;\n      resolvedBy: string;\n      resolution: \"dismissed\" | \"removed\";\n    },\n  ): Promise<void> {\n    await this.db\n      .update(commentFlags)\n      .set({\n        resolvedAt: resolved.resolvedAt,\n        resolvedBy: resolved.resolvedBy,\n        resolution: resolved.resolution,\n      })\n      .where(\n        and(\n          eq(commentFlags.orgId, orgId),\n          eq(commentFlags.commentId, commentId),\n          isNull(commentFlags.resolvedAt),\n        ),\n      );\n  }\n\n  /** The list's one join: comments to their activity, which carries both the\n   *  course (denormalised, so the module never enters the query) and the title.\n   *  The course filter and the row's activity title come out of that same pass,\n   *  so neither costs an extra query. */\n  private listRows(where: SQL | undefined) {\n    return this.db\n      .select({\n        comment: comments,\n        courseId: activities.courseId,\n        activityTitle: activityTitleExpr,\n      })\n      .from(comments)\n      .innerJoin(\n        activities,\n        and(eq(activities.orgId, comments.orgId), eq(activities.id, comments.activityId)),\n      )\n      .where(where);\n  }\n\n  /** The same join and filters, counted. Separate from `listRows` because the\n   *  total must ignore limit/offset. */\n  private listTotal(where: SQL | undefined) {\n    return this.db\n      .select({ total: sql<number>`cast(count(*) as int)` })\n      .from(comments)\n      .innerJoin(\n        activities,\n        and(eq(activities.orgId, comments.orgId), eq(activities.id, comments.activityId)),\n      )\n      .where(where);\n  }\n\n  async listComments(orgId: string, query: ListCommentsQuery): Promise<Page<CommentWithContext>> {\n    const conditions: SQL[] = [eq(comments.orgId, orgId)];\n    if (query.status) {\n      conditions.push(eq(comments.status, query.status));\n    }\n    if (query.courseId) {\n      conditions.push(eq(activities.courseId, query.courseId));\n    }\n    if (query.activityId) {\n      conditions.push(eq(comments.activityId, query.activityId));\n    }\n    if (query.orgUserId) {\n      conditions.push(eq(comments.orgUserId, query.orgUserId));\n    }\n    if (query.reported !== undefined) {\n      // Correlated EXISTS rather than a join to comment_flags: a comment with\n      // three open reports must stay one row.\n      const hasOpenReport = sql`exists (\n        select 1 from ${commentFlags} r\n        where r.org_id = ${comments.orgId}\n          and r.comment_id = ${comments.id}\n          and r.resolved_at is null\n      )`;\n      conditions.push(query.reported ? hasOpenReport : sql`not ${hasOpenReport}`);\n    }\n    if (query.search) {\n      conditions.push(ilike(comments.body, `%${query.search}%`));\n    }\n    const where = and(...conditions);\n\n    // Sort: `-field` for descending; default to newest first, which is the\n    // order a moderator works in.\n    let orderBy: SQL;\n    if (query.sort) {\n      const isDesc = query.sort.startsWith(\"-\");\n      const field = (isDesc ? query.sort.slice(1) : query.sort) as keyof typeof sortColumns;\n      const col = sortColumns[field] ?? comments.createdAt;\n      orderBy = isDesc ? desc(col) : asc(col);\n    } else {\n      orderBy = desc(comments.createdAt);\n    }\n\n    const rows = await this.listRows(where)\n      .orderBy(orderBy)\n      .limit(query.pageSize)\n      .offset((query.page - 1) * query.pageSize);\n\n    const [{ total } = { total: 0 }] = await this.listTotal(where);\n\n    return {\n      rows: rows.map((r) => ({\n        comment: toComment(r.comment),\n        courseId: r.courseId,\n        activityTitle: r.activityTitle,\n      })),\n      total,\n      page: query.page,\n      pageSize: query.pageSize,\n    };\n  }\n}\ntranslateDbErrors(DrizzleDiscussionRepository);\n"],"mappings":"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"}

package/dist/repositories/entitlements.d.ts

@@ -1,6 +1,6 @@
 import { DbExecutor } from "../client.js";
-import { Entitlement, EntitlementsQuery, GrantEntitlementInput, Logger, Page } from "@headless-lms/core/types";
-import { EntitlementsRepository } from "@headless-lms/core/entitlements";
+import { ContentType, Entitlement, EntitlementsQuery, GrantEntitlementInput, Logger, Page, SpaceMember, SpaceMemberStatus } from "@headless-lms/core/types";
+import { AccessFacts, EndingGrant, EndingGrantKey, EntitlementNotice, EntitlementsRepository, GrantKey, GrantTarget, InsertSpaceMemberInput, SpaceMembersQuery } from "@headless-lms/core/entitlements";
 //#region src/repositories/entitlements.d.ts
 declare class DrizzleEntitlementsRepository implements EntitlementsRepository {
   private readonly db;
@@ -15,14 +15,36 @@ declare class DrizzleEntitlementsRepository implements EntitlementsRepository {
    *  constraint), so the upsert is inferred on whichever of the two partial
    *  uniques the target uses. */
   insert(orgId: string, input: GrantEntitlementInput): Promise<Entitlement>;
+  insertIfAbsent(orgId: string, input: GrantEntitlementInput): Promise<Entitlement | null>;
+  lockGrant(orgId: string, key: GrantKey): Promise<Entitlement | null>;
+  setExpiresAt(orgId: string, id: string, expiresAt: Date | null): Promise<Entitlement | null>;
   setStatus(orgId: string, id: string, status: "active" | "revoked"): Promise<Entitlement | null>;
-  /** Existence check scoped to the course case: same status predicate as
-   *  `list` (revoked never counts; an elapsed expiry reads as expired, not
-   *  active). The course is reachable two ways — granted directly, or granted
-   *  through a bundle that holds it — and either way the row is joined to
-   *  content_items and constrained to type = 'course', so a grant on some other
-   *  content type can never be mistaken for course access. */
-  hasCourseAccess(orgId: string, orgUserId: string, courseId: string): Promise<boolean>;
+  hasAccess(orgId: string, orgUserId: string, contentId: string): Promise<boolean>;
+  listAccessibleContent(orgId: string, orgUserId: string, type?: ContentType): Promise<string[]>;
+  hasCommunityAccess(orgId: string, orgUserId: string, communityId: string): Promise<boolean>;
+  private holds;
+  communitiesOpenedBy(orgId: string, grant: GrantTarget): Promise<string[]>;
+  accessAmong(orgId: string, communityId: string, spaceId: string | null, orgUserIds: string[]): Promise<AccessFacts[]>;
+  findSpaceMember(orgId: string, spaceId: string, orgUserId: string): Promise<SpaceMember | null>;
+  listSpaceMembersFor(orgId: string, orgUserId: string, communityId: string): Promise<SpaceMember[]>;
+  lockSpaceMember(orgId: string, spaceId: string, orgUserId: string): Promise<SpaceMember | null>;
+  listSpaceMembers(orgId: string, spaceId: string, query: SpaceMembersQuery): Promise<Page<SpaceMember>>;
+  insertSpaceMember(orgId: string, input: InsertSpaceMemberInput): Promise<SpaceMember>;
+  updateSpaceMemberStatus(orgId: string, id: string, status: SpaceMemberStatus): Promise<SpaceMember | null>;
+  deleteSpaceMember(orgId: string, id: string): Promise<void>;
+  countActiveSpaceMembers(orgId: string, spaceId: string): Promise<number>;
+  activeSpaceIds(orgId: string, orgUserId: string, communityId: string): Promise<string[]>;
+  listGrantsExpiredBy(orgId: string, now: Date, limit: number, afterId?: string): Promise<Entitlement[]>;
+  listGrantsEndingBetween(orgId: string, after: Date, until: Date, limit: number, afterKey?: EndingGrantKey): Promise<EndingGrant[]>;
+  orgIdsWithDueNotices(now: Date, until: Date): Promise<string[]>;
+  claimNotice(orgId: string, notice: EntitlementNotice, now: Date): Promise<boolean>;
+  private expiredUnnoticed;
+  private endingUnnoticed;
+  communityModeratorIds(orgId: string, communityId: string): Promise<string[]>;
+  communityMemberIds(orgId: string, communityId: string): Promise<string[]>;
+  communityIdsOpenedFor(orgId: string, orgUserId: string): Promise<string[]>;
+  contentHolderIds(orgId: string, contentId: string): Promise<string[]>;
+  openCommunityIds(orgId: string, orgUserId: string): Promise<string[]>;
 }
 //#endregion
 export { DrizzleEntitlementsRepository };

package/dist/repositories/entitlements.js

@@ -1,19 +1,38 @@
+import { bundles, communities, contentItems, courses, downloads } from "../schema/content.js";
 import { users } from "../schema/identity.js";
 import { orgUsers } from "../schema/organizations.js";
-import { bundleItems, bundles, contentItems, courses, downloads } from "../schema/content.js";
-import { entitlements } from "../schema/entitlements.js";
+import { contentAccess, entitlementEndingSoonNotices, entitlementExpiryNotices, entitlements, spaceMembers } from "../schema/entitlements.js";
 import "../schema/index.js";
 import { translateDbErrors } from "./pg-errors.js";
-import { and, asc, desc, eq, ilike, or, sql } from "drizzle-orm";
-import { alias } from "drizzle-orm/pg-core";
+import { communityMember, grantExpired, grantIsActive, grantOpens, holdsCommunity } from "./grant-covers.js";
+import { and, asc, desc, eq, gt, ilike, inArray, or, sql } from "drizzle-orm";
 import { noopLogger } from "@headless-lms/core/shared/logger";
+import { ROLES, canModerate } from "@headless-lms/core/organizations";
 //#region src/repositories/entitlements.ts
+const MODERATING_ROLES = ROLES.filter((role) => canModerate(role));
 const derivedStatus = sql`case
   when ${entitlements.status} = 'revoked' then 'revoked'
-  when ${entitlements.expiresAt} is not null and ${entitlements.expiresAt} < now() then 'expired'
+  when ${grantExpired(entitlements.expiresAt)} then 'expired'
   else 'active'
 end`;
-const contentTitle = sql`coalesce(${courses.title}, ${downloads.title}, ${bundles.name})`;
+function at(date) {
+	return sql`${date.toISOString()}::timestamptz`;
+}
+const expiryNoticed = sql`exists (
+  select 1 from ${entitlementExpiryNotices}
+  where ${entitlementExpiryNotices.orgId} = ${entitlements.orgId}
+    and ${entitlementExpiryNotices.entitlementId} = ${entitlements.id}
+    and ${entitlementExpiryNotices.expiresAt} = ${entitlements.expiresAt}
+)`;
+const endingSoonNoticed = sql`exists (
+  select 1 from ${entitlementEndingSoonNotices}
+  where ${entitlementEndingSoonNotices.orgId} = ${entitlements.orgId}
+    and ${entitlementEndingSoonNotices.entitlementId} = ${entitlements.id}
+    and ${entitlementEndingSoonNotices.communityId} = ${communities.id}
+    and ${entitlementEndingSoonNotices.expiresAt} = ${entitlements.expiresAt}
+)`;
+const opensPublishedCommunity = and(eq(communities.orgId, entitlements.orgId), eq(communities.status, "published"), grantOpens(entitlements, sql`${communities.id}`, "community"));
+const contentTitle = sql`coalesce(${courses.title}, ${downloads.title}, ${communities.title}, ${bundles.name})`;
 const sortColumns = {
 	firstName: users.firstName,
 	lastName: users.lastName,
@@ -63,7 +82,7 @@ var DrizzleEntitlementsRepository = class {
 	*  LEFT JOIN per concrete content table (title), or bundles (name). Both target
 	*  joins are LEFT — a row carries one of the two, never both. */
 	joined(where) {
-		return this.db.select(selection).from(entitlements).innerJoin(orgUsers, and(eq(orgUsers.orgId, entitlements.orgId), eq(orgUsers.id, entitlements.orgUserId))).innerJoin(users, eq(users.id, orgUsers.userId)).leftJoin(contentItems, and(eq(contentItems.orgId, entitlements.orgId), eq(contentItems.id, entitlements.contentId))).leftJoin(bundles, and(eq(bundles.orgId, entitlements.orgId), eq(bundles.id, entitlements.bundleId))).leftJoin(courses, and(eq(courses.orgId, entitlements.orgId), eq(courses.id, entitlements.contentId))).leftJoin(downloads, and(eq(downloads.orgId, entitlements.orgId), eq(downloads.id, entitlements.contentId))).where(where);
+		return this.db.select(selection).from(entitlements).innerJoin(orgUsers, and(eq(orgUsers.orgId, entitlements.orgId), eq(orgUsers.id, entitlements.orgUserId))).innerJoin(users, eq(users.id, orgUsers.userId)).leftJoin(contentItems, and(eq(contentItems.orgId, entitlements.orgId), eq(contentItems.id, entitlements.contentId))).leftJoin(bundles, and(eq(bundles.orgId, entitlements.orgId), eq(bundles.id, entitlements.bundleId))).leftJoin(courses, and(eq(courses.orgId, entitlements.orgId), eq(courses.id, entitlements.contentId))).leftJoin(downloads, and(eq(downloads.orgId, entitlements.orgId), eq(downloads.id, entitlements.contentId))).leftJoin(communities, and(eq(communities.orgId, entitlements.orgId), eq(communities.id, entitlements.contentId))).where(where);
 	}
 	async list(orgId, query) {
 		const conditions = [eq(entitlements.orgId, orgId)];
@@ -87,7 +106,7 @@ var DrizzleEntitlementsRepository = class {
 		} else orderBy = desc(entitlements.grantedAt);
 		const offset = (query.page - 1) * query.pageSize;
 		const rows = await this.joined(where).orderBy(orderBy).limit(query.pageSize).offset(offset);
-		const [{ total } = { total: 0 }] = await this.db.select({ total: sql`cast(count(*) as int)` }).from(entitlements).innerJoin(orgUsers, and(eq(orgUsers.orgId, entitlements.orgId), eq(orgUsers.id, entitlements.orgUserId))).innerJoin(users, eq(users.id, orgUsers.userId)).leftJoin(contentItems, and(eq(contentItems.orgId, entitlements.orgId), eq(contentItems.id, entitlements.contentId))).leftJoin(bundles, and(eq(bundles.orgId, entitlements.orgId), eq(bundles.id, entitlements.bundleId))).leftJoin(courses, and(eq(courses.orgId, entitlements.orgId), eq(courses.id, entitlements.contentId))).leftJoin(downloads, and(eq(downloads.orgId, entitlements.orgId), eq(downloads.id, entitlements.contentId))).where(where);
+		const [{ total } = { total: 0 }] = await this.db.select({ total: sql`cast(count(*) as int)` }).from(entitlements).innerJoin(orgUsers, and(eq(orgUsers.orgId, entitlements.orgId), eq(orgUsers.id, entitlements.orgUserId))).innerJoin(users, eq(users.id, orgUsers.userId)).leftJoin(contentItems, and(eq(contentItems.orgId, entitlements.orgId), eq(contentItems.id, entitlements.contentId))).leftJoin(bundles, and(eq(bundles.orgId, entitlements.orgId), eq(bundles.id, entitlements.bundleId))).leftJoin(courses, and(eq(courses.orgId, entitlements.orgId), eq(courses.id, entitlements.contentId))).leftJoin(downloads, and(eq(downloads.orgId, entitlements.orgId), eq(downloads.id, entitlements.contentId))).leftJoin(communities, and(eq(communities.orgId, entitlements.orgId), eq(communities.id, entitlements.contentId))).where(where);
 		return {
 			rows: rows.map(toEntitlement),
 			total,
@@ -131,22 +150,199 @@ var DrizzleEntitlementsRepository = class {
 		if (!row) throw new Error("failed to insert entitlement");
 		return toEntitlement(row);
 	}
+	async insertIfAbsent(orgId, input) {
+		const bundleId = input.bundleId ?? null;
+		const contentId = input.contentId ?? null;
+		const target = bundleId ? [
+			entitlements.orgId,
+			entitlements.orgUserId,
+			entitlements.bundleId
+		] : [
+			entitlements.orgId,
+			entitlements.orgUserId,
+			entitlements.contentId
+		];
+		const [row] = await this.db.insert(entitlements).values({
+			orgId,
+			orgUserId: input.orgUserId,
+			bundleId,
+			contentId,
+			status: "active",
+			source: "manual",
+			grantedAt: /* @__PURE__ */ new Date(),
+			expiresAt: input.expiresAt
+		}).onConflictDoNothing({ target }).returning(selection);
+		return row ? toEntitlement(row) : null;
+	}
+	async lockGrant(orgId, key) {
+		const target = key.bundleId ? eq(entitlements.bundleId, key.bundleId) : key.contentId ? eq(entitlements.contentId, key.contentId) : void 0;
+		if (!target) return null;
+		const [row] = await this.db.select(selection).from(entitlements).where(and(eq(entitlements.orgId, orgId), eq(entitlements.orgUserId, key.orgUserId), target)).for("update").limit(1);
+		return row ? toEntitlement(row) : null;
+	}
+	async setExpiresAt(orgId, id, expiresAt) {
+		const [row] = await this.db.update(entitlements).set({ expiresAt }).where(and(eq(entitlements.orgId, orgId), eq(entitlements.id, id))).returning(selection);
+		return row ? toEntitlement(row) : null;
+	}
 	async setStatus(orgId, id, status) {
 		const [row] = await this.db.update(entitlements).set({ status }).where(and(eq(entitlements.orgId, orgId), eq(entitlements.id, id))).returning(selection);
 		if (!row) return null;
 		return toEntitlement(row);
 	}
-	/** Existence check scoped to the course case: same status predicate as
-	*  `list` (revoked never counts; an elapsed expiry reads as expired, not
-	*  active). The course is reachable two ways — granted directly, or granted
-	*  through a bundle that holds it — and either way the row is joined to
-	*  content_items and constrained to type = 'course', so a grant on some other
-	*  content type can never be mistaken for course access. */
-	async hasCourseAccess(orgId, orgUserId, courseId) {
-		const bundledItems = alias(contentItems, "bundled_content_items");
-		return (await this.db.select({ id: entitlements.id }).from(entitlements).leftJoin(contentItems, and(eq(contentItems.orgId, entitlements.orgId), eq(contentItems.id, entitlements.contentId))).leftJoin(bundleItems, and(eq(bundleItems.orgId, entitlements.orgId), eq(bundleItems.bundleId, entitlements.bundleId))).leftJoin(bundledItems, and(eq(bundledItems.orgId, bundleItems.orgId), eq(bundledItems.id, bundleItems.contentId))).where(and(eq(entitlements.orgId, orgId), eq(entitlements.orgUserId, orgUserId), or(and(eq(entitlements.contentId, courseId), eq(contentItems.type, "course")), and(eq(bundleItems.contentId, courseId), eq(bundledItems.type, "course"))), sql`${derivedStatus} = 'active'`)).limit(1)).length > 0;
+	async hasAccess(orgId, orgUserId, contentId) {
+		return (await this.db.select({ id: contentAccess.entitlementId }).from(contentAccess).where(and(eq(contentAccess.orgId, orgId), eq(contentAccess.orgUserId, orgUserId), eq(contentAccess.contentId, contentId))).limit(1)).length > 0;
+	}
+	async listAccessibleContent(orgId, orgUserId, type) {
+		return (await this.db.selectDistinct({ contentId: contentAccess.contentId }).from(contentAccess).innerJoin(contentItems, and(eq(contentItems.orgId, contentAccess.orgId), eq(contentItems.id, contentAccess.contentId))).where(and(eq(contentAccess.orgId, orgId), eq(contentAccess.orgUserId, orgUserId), type ? eq(contentItems.type, type) : void 0))).map((r) => r.contentId);
+	}
+	hasCommunityAccess(orgId, orgUserId, communityId) {
+		return this.holds(holdsCommunity(sql`${orgId}`, sql`${orgUserId}`, sql`${communityId}`));
+	}
+	async holds(predicate) {
+		const result = await this.db.execute(sql`select ${predicate} as covered`);
+		return (Array.isArray(result) ? result : result.rows)[0]?.covered === true;
+	}
+	async communitiesOpenedBy(orgId, grant) {
+		if (!grant.contentId && !grant.bundleId) return [];
+		const target = {
+			orgId: sql`${orgId}`,
+			contentId: sql`${grant.contentId ?? null}::text`,
+			bundleId: sql`${grant.bundleId ?? null}::text`
+		};
+		return (await this.db.select({ id: communities.id }).from(communities).where(and(eq(communities.orgId, orgId), eq(communities.status, "published"), grantOpens(target, sql`${communities.id}`, "community"))).orderBy(asc(communities.id))).map((row) => row.id);
+	}
+	async accessAmong(orgId, communityId, spaceId, orgUserIds) {
+		if (orgUserIds.length === 0) return [];
+		const activeInSpace = spaceId ? sql`exists (
+          select 1 from space_members sm
+          where sm.org_id = ${sql`${orgUsers.orgId}`}
+            and sm.space_id = ${spaceId}
+            and sm.org_user_id = ${sql`${orgUsers.id}`}
+            and sm.status = 'active'
+        )` : sql`false`;
+		return (await this.db.select({
+			orgUserId: orgUsers.id,
+			role: orgUsers.role,
+			member: sql`${communityMember(sql`${orgUsers.orgId}`, sql`${orgUsers.id}`, sql`${orgUsers.role}`, sql`${communityId}`)}`,
+			activeInSpace
+		}).from(orgUsers).where(and(eq(orgUsers.orgId, orgId), inArray(orgUsers.id, orgUserIds)))).map((row) => ({
+			orgUserId: row.orgUserId,
+			role: row.role,
+			member: row.member === true,
+			activeInSpace: row.activeInSpace === true
+		}));
+	}
+	async findSpaceMember(orgId, spaceId, orgUserId) {
+		const [row] = await this.db.select().from(spaceMembers).where(and(eq(spaceMembers.orgId, orgId), eq(spaceMembers.spaceId, spaceId), eq(spaceMembers.orgUserId, orgUserId))).limit(1);
+		return row ? toSpaceMember(row) : null;
+	}
+	async listSpaceMembersFor(orgId, orgUserId, communityId) {
+		return (await this.db.select().from(spaceMembers).where(and(eq(spaceMembers.orgId, orgId), eq(spaceMembers.orgUserId, orgUserId), eq(spaceMembers.communityId, communityId)))).map(toSpaceMember);
+	}
+	async lockSpaceMember(orgId, spaceId, orgUserId) {
+		const [row] = await this.db.select().from(spaceMembers).where(and(eq(spaceMembers.orgId, orgId), eq(spaceMembers.spaceId, spaceId), eq(spaceMembers.orgUserId, orgUserId))).for("update").limit(1);
+		return row ? toSpaceMember(row) : null;
+	}
+	async listSpaceMembers(orgId, spaceId, query) {
+		const where = and(eq(spaceMembers.orgId, orgId), eq(spaceMembers.spaceId, spaceId), query.statuses ? inArray(spaceMembers.status, query.statuses) : void 0);
+		const rows = await this.db.select().from(spaceMembers).where(where).orderBy(asc(spaceMembers.createdAt), asc(spaceMembers.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(spaceMembers).where(where);
+		return {
+			rows: rows.map(toSpaceMember),
+			total,
+			page: query.page,
+			pageSize: query.pageSize
+		};
+	}
+	async insertSpaceMember(orgId, input) {
+		const [row] = await this.db.insert(spaceMembers).values({
+			orgId,
+			communityId: input.communityId,
+			spaceId: input.spaceId,
+			orgUserId: input.orgUserId,
+			status: input.status,
+			source: input.source
+		}).returning();
+		if (!row) throw new Error("failed to insert space member");
+		return toSpaceMember(row);
+	}
+	async updateSpaceMemberStatus(orgId, id, status) {
+		const [row] = await this.db.update(spaceMembers).set({ status }).where(and(eq(spaceMembers.orgId, orgId), eq(spaceMembers.id, id))).returning();
+		return row ? toSpaceMember(row) : null;
+	}
+	async deleteSpaceMember(orgId, id) {
+		await this.db.delete(spaceMembers).where(and(eq(spaceMembers.orgId, orgId), eq(spaceMembers.id, id)));
+	}
+	async countActiveSpaceMembers(orgId, spaceId) {
+		const [row] = await this.db.select({ total: sql`cast(count(*) as int)` }).from(spaceMembers).where(and(eq(spaceMembers.orgId, orgId), eq(spaceMembers.spaceId, spaceId), eq(spaceMembers.status, "active"), holdsCommunity(sql`${spaceMembers.orgId}`, sql`${spaceMembers.orgUserId}`, sql`${spaceMembers.communityId}`)));
+		return row?.total ?? 0;
+	}
+	async activeSpaceIds(orgId, orgUserId, communityId) {
+		return (await this.db.select({ spaceId: spaceMembers.spaceId }).from(spaceMembers).where(and(eq(spaceMembers.orgId, orgId), eq(spaceMembers.orgUserId, orgUserId), eq(spaceMembers.communityId, communityId), eq(spaceMembers.status, "active")))).map((row) => row.spaceId);
+	}
+	async listGrantsExpiredBy(orgId, now, limit, afterId) {
+		return (await this.db.select(selection).from(entitlements).where(and(this.expiredUnnoticed(orgId, now), afterId === void 0 ? void 0 : gt(entitlements.id, afterId))).orderBy(asc(entitlements.id)).limit(limit)).map(toEntitlement);
+	}
+	async listGrantsEndingBetween(orgId, after, until, limit, afterKey) {
+		return (await this.db.select({
+			...selection,
+			communityId: communities.id
+		}).from(entitlements).innerJoin(communities, opensPublishedCommunity).where(and(this.endingUnnoticed(orgId, after, until), afterKey ? sql`(${entitlements.id}, ${communities.id}) > (${afterKey.entitlementId}, ${afterKey.communityId})` : void 0)).orderBy(asc(entitlements.id), asc(communities.id)).limit(limit)).map(({ communityId, ...grant }) => ({
+			grant: toEntitlement(grant),
+			communityId
+		}));
+	}
+	async orgIdsWithDueNotices(now, until) {
+		const expired = this.db.selectDistinct({ orgId: entitlements.orgId }).from(entitlements).where(this.expiredUnnoticed(null, now));
+		const ending = this.db.selectDistinct({ orgId: entitlements.orgId }).from(entitlements).innerJoin(communities, opensPublishedCommunity).where(this.endingUnnoticed(null, now, until));
+		return (await expired.union(ending)).map((row) => row.orgId).sort();
+	}
+	async claimNotice(orgId, notice, now) {
+		const statement = notice.kind === "expired" ? sql`insert into ${entitlementExpiryNotices} ("org_id", "entitlement_id", "expires_at", "notified_at")
+            values (${orgId}, ${notice.entitlementId}, ${at(notice.expiresAt)}, ${at(now)})
+            on conflict do nothing
+            returning "entitlement_id"` : sql`insert into ${entitlementEndingSoonNotices} ("org_id", "entitlement_id", "community_id", "expires_at", "notified_at")
+            values (${orgId}, ${notice.entitlementId}, ${notice.communityId}, ${at(notice.expiresAt)}, ${at(now)})
+            on conflict do nothing
+            returning "entitlement_id"`;
+		const result = await this.db.execute(statement);
+		return (Array.isArray(result) ? result : result.rows).length > 0;
+	}
+	expiredUnnoticed(orgId, now) {
+		return and(orgId === null ? void 0 : eq(entitlements.orgId, orgId), eq(entitlements.status, "active"), grantExpired(entitlements.expiresAt, at(now)), sql`not ${expiryNoticed}`);
+	}
+	endingUnnoticed(orgId, after, until) {
+		return and(orgId === null ? void 0 : eq(entitlements.orgId, orgId), grantIsActive(entitlements, at(after)), grantExpired(entitlements.expiresAt, at(until)), sql`not ${endingSoonNoticed}`);
+	}
+	async communityModeratorIds(orgId, communityId) {
+		return (await this.db.select({ id: orgUsers.id }).from(orgUsers).where(and(eq(orgUsers.orgId, orgId), inArray(orgUsers.role, MODERATING_ROLES), communityMember(sql`${orgUsers.orgId}`, sql`${orgUsers.id}`, sql`${orgUsers.role}`, sql`${communityId}`))).orderBy(asc(orgUsers.id))).map((row) => row.id);
+	}
+	async communityMemberIds(orgId, communityId) {
+		return (await this.db.select({ id: orgUsers.id }).from(orgUsers).where(and(eq(orgUsers.orgId, orgId), communityMember(sql`${orgUsers.orgId}`, sql`${orgUsers.id}`, sql`${orgUsers.role}`, sql`${communityId}`))).orderBy(asc(orgUsers.id))).map((row) => row.id);
+	}
+	async communityIdsOpenedFor(orgId, orgUserId) {
+		return (await this.db.selectDistinct({ id: communities.id }).from(communities).where(and(eq(communities.orgId, orgId), holdsCommunity(sql`${communities.orgId}`, sql`${orgUserId}`, sql`${communities.id}`))).orderBy(asc(communities.id))).map((row) => row.id);
+	}
+	async contentHolderIds(orgId, contentId) {
+		return (await this.db.selectDistinct({ orgUserId: contentAccess.orgUserId }).from(contentAccess).where(and(eq(contentAccess.orgId, orgId), eq(contentAccess.contentId, contentId))).orderBy(asc(contentAccess.orgUserId))).map((row) => row.orgUserId);
+	}
+	async openCommunityIds(orgId, orgUserId) {
+		return (await this.db.select({ id: communities.id }).from(communities).innerJoin(orgUsers, and(eq(orgUsers.orgId, communities.orgId), eq(orgUsers.id, orgUserId))).where(and(eq(communities.orgId, orgId), communityMember(sql`${communities.orgId}`, sql`${orgUsers.id}`, sql`${orgUsers.role}`, sql`${communities.id}`))).orderBy(asc(communities.id))).map((row) => row.id);
 	}
 };
+function toSpaceMember(row) {
+	return {
+		orgId: row.orgId,
+		id: row.id,
+		communityId: row.communityId,
+		spaceId: row.spaceId,
+		orgUserId: row.orgUserId,
+		status: row.status,
+		source: row.source,
+		createdAt: row.createdAt,
+		updatedAt: row.updatedAt
+	};
+}
 translateDbErrors(DrizzleEntitlementsRepository);
 //#endregion
 export { DrizzleEntitlementsRepository };