@headless-lms/adapter-db 0.2.0 → 0.3.0

package/dist/repositories/identity.js.map

@@ -1 +1 @@
-{"version":3,"file":"identity.js","names":[],"sources":["../../src/repositories/identity.ts"],"sourcesContent":["// identity — Drizzle repository (implements the core outbound port).\n//\n// The person only. A person's link to an organization lives in the\n// organizations context (`org_users`), not here.\nimport { eq, sql } from \"drizzle-orm\";\nimport type { NodePgDatabase } from \"drizzle-orm/node-postgres\";\nimport type { IdentityRepository } from \"@headless-lms/core/identity\";\nimport type { CreateUserInput, Logger, UpdateUserInput, User } from \"@headless-lms/core/types\";\nimport { users } from \"../schema/identity.js\";\nimport { noopLogger } from \"@headless-lms/core/shared/logger\";\nimport { translateDbErrors } from \"./pg-errors.js\";\n\nexport class DrizzleIdentityRepository implements IdentityRepository {\n  constructor(\n    private readonly db: NodePgDatabase,\n    private readonly logger: Logger = noopLogger,\n  ) {}\n\n  async insertUser(input: CreateUserInput): Promise<User> {\n    const [row] = await this.db\n      .insert(users)\n      .values({\n        id: input.id,\n        externalId: input.externalId ?? null,\n        email: input.email,\n        firstName: input.firstName ?? null,\n        lastName: input.lastName ?? null,\n      })\n      .returning();\n    if (!row) {\n      throw new Error(\"failed to insert user\");\n    }\n    return row;\n  }\n\n  async updateUser(id: string, input: UpdateUserInput): Promise<User | null> {\n    // An empty patch would be an UPDATE with no SET — read the row back instead.\n    if (Object.keys(input).length === 0) {\n      return this.findUserById(id);\n    }\n    const [row] = await this.db.update(users).set(input).where(eq(users.id, id)).returning();\n    return row ?? null;\n  }\n\n  async findUserById(id: string): Promise<User | null> {\n    const [row] = await this.db.select().from(users).where(eq(users.id, id)).limit(1);\n    return row ?? null;\n  }\n\n  async findUserByExternalId(externalId: string): Promise<User | null> {\n    const [row] = await this.db\n      .select()\n      .from(users)\n      .where(eq(users.externalId, externalId))\n      .limit(1);\n    return row ?? null;\n  }\n\n  // Case-insensitive: the address comes from whatever an admin typed into an\n  // invite, the row from whatever the auth provider stored.\n  async findUserByEmail(email: string): Promise<User | null> {\n    const [row] = await this.db\n      .select()\n      .from(users)\n      .where(sql`lower(${users.email}) = lower(${email})`)\n      .limit(1);\n    return row ?? null;\n  }\n}\ntranslateDbErrors(DrizzleIdentityRepository);\n"],"mappings":";;;;;AAYA,IAAa,4BAAb,MAAqE;CAEhD;CACA;CAFnB,YACE,IACA,SAAkC,YAClC;EAFiB,KAAA,KAAA;EACA,KAAA,SAAA;CAChB;CAEH,MAAM,WAAW,OAAuC;EACtD,MAAM,CAAC,OAAO,MAAM,KAAK,GACtB,OAAO,KAAK,CAAC,CACb,OAAO;GACN,IAAI,MAAM;GACV,YAAY,MAAM,cAAc;GAChC,OAAO,MAAM;GACb,WAAW,MAAM,aAAa;GAC9B,UAAU,MAAM,YAAY;EAC9B,CAAC,CAAC,CACD,UAAU;EACb,IAAI,CAAC,KACH,MAAM,IAAI,MAAM,uBAAuB;EAEzC,OAAO;CACT;CAEA,MAAM,WAAW,IAAY,OAA8C;EAEzE,IAAI,OAAO,KAAK,KAAK,CAAC,CAAC,WAAW,GAChC,OAAO,KAAK,aAAa,EAAE;EAE7B,MAAM,CAAC,OAAO,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,UAAU;EACvF,OAAO,OAAO;CAChB;CAEA,MAAM,aAAa,IAAkC;EACnD,MAAM,CAAC,OAAO,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;EAChF,OAAO,OAAO;CAChB;CAEA,MAAM,qBAAqB,YAA0C;EACnE,MAAM,CAAC,OAAO,MAAM,KAAK,GACtB,OAAO,CAAC,CACR,KAAK,KAAK,CAAC,CACX,MAAM,GAAG,MAAM,YAAY,UAAU,CAAC,CAAC,CACvC,MAAM,CAAC;EACV,OAAO,OAAO;CAChB;CAIA,MAAM,gBAAgB,OAAqC;EACzD,MAAM,CAAC,OAAO,MAAM,KAAK,GACtB,OAAO,CAAC,CACR,KAAK,KAAK,CAAC,CACX,MAAM,GAAG,SAAS,MAAM,MAAM,YAAY,MAAM,EAAE,CAAC,CACnD,MAAM,CAAC;EACV,OAAO,OAAO;CAChB;AACF;AACA,kBAAkB,yBAAyB"}
+{"version":3,"file":"identity.js","names":[],"sources":["../../src/repositories/identity.ts"],"sourcesContent":["// identity — Drizzle repository (implements the core outbound port).\n//\n// The person only. A person's link to an organization lives in the\n// organizations context (`org_users`), not here.\nimport { eq, sql } from \"drizzle-orm\";\nimport type { NodePgDatabase } from \"drizzle-orm/node-postgres\";\nimport type { IdentityRepository, ProfilePatch } from \"@headless-lms/core/identity\";\nimport type {\n  CreateUserInput,\n  Logger,\n  UpdateUserInput,\n  User,\n  UserProfile,\n} from \"@headless-lms/core/types\";\nimport { userProfiles, users } from \"../schema/identity.js\";\nimport { noopLogger } from \"@headless-lms/core/shared/logger\";\nimport { translateDbErrors } from \"./pg-errors.js\";\n\nexport class DrizzleIdentityRepository implements IdentityRepository {\n  constructor(\n    private readonly db: NodePgDatabase,\n    private readonly logger: Logger = noopLogger,\n  ) {}\n\n  async insertUser(input: CreateUserInput): Promise<User> {\n    const [row] = await this.db\n      .insert(users)\n      .values({\n        id: input.id,\n        externalId: input.externalId ?? null,\n        email: input.email,\n        firstName: input.firstName ?? null,\n        lastName: input.lastName ?? null,\n      })\n      .returning();\n    if (!row) {\n      throw new Error(\"failed to insert user\");\n    }\n    return row;\n  }\n\n  async updateUser(id: string, input: UpdateUserInput): Promise<User | null> {\n    // An empty patch would be an UPDATE with no SET — read the row back instead.\n    if (Object.keys(input).length === 0) {\n      return this.findUserById(id);\n    }\n    const [row] = await this.db.update(users).set(input).where(eq(users.id, id)).returning();\n    return row ?? null;\n  }\n\n  async findUserById(id: string): Promise<User | null> {\n    const [row] = await this.db.select().from(users).where(eq(users.id, id)).limit(1);\n    return row ?? null;\n  }\n\n  async findUserByExternalId(externalId: string): Promise<User | null> {\n    const [row] = await this.db\n      .select()\n      .from(users)\n      .where(eq(users.externalId, externalId))\n      .limit(1);\n    return row ?? null;\n  }\n\n  // Case-insensitive: the address comes from whatever an admin typed into an\n  // invite, the row from whatever the auth provider stored.\n  async findUserByEmail(email: string): Promise<User | null> {\n    const [row] = await this.db\n      .select()\n      .from(users)\n      .where(sql`lower(${users.email}) = lower(${email})`)\n      .limit(1);\n    return row ?? null;\n  }\n\n  async findProfile(userId: string): Promise<UserProfile | null> {\n    const [row] = await this.db\n      .select()\n      .from(userProfiles)\n      .where(eq(userProfiles.userId, userId))\n      .limit(1);\n    return row ?? null;\n  }\n\n  async upsertProfile(userId: string, patch: ProfilePatch): Promise<UserProfile> {\n    const existing = await this.findProfile(userId);\n    if (!existing) {\n      const [row] = await this.db\n        .insert(userProfiles)\n        .values({\n          userId,\n          displayName: patch.displayName ?? null,\n          headline: patch.headline ?? null,\n          bio: patch.bio ?? null,\n          imageAssetOrgId: patch.imageAssetOrgId ?? null,\n          imageAssetId: patch.imageAssetId ?? null,\n          extra: patch.extra ?? {},\n        })\n        .returning();\n      if (!row) {\n        throw new Error(\"failed to insert profile\");\n      }\n      return row;\n    }\n    const set: Record<string, unknown> = { updatedAt: new Date() };\n    if (patch.displayName !== undefined) {\n      set.displayName = patch.displayName;\n    }\n    if (patch.headline !== undefined) {\n      set.headline = patch.headline;\n    }\n    if (patch.bio !== undefined) {\n      set.bio = patch.bio;\n    }\n    if (patch.imageAssetOrgId !== undefined) {\n      set.imageAssetOrgId = patch.imageAssetOrgId;\n      set.imageAssetId = patch.imageAssetId;\n    }\n    if (patch.extra !== undefined) {\n      set.extra = patch.extra;\n    }\n    const [row] = await this.db\n      .update(userProfiles)\n      .set(set)\n      .where(eq(userProfiles.userId, userId))\n      .returning();\n    if (!row) {\n      throw new Error(\"failed to update profile\");\n    }\n    return row;\n  }\n}\ntranslateDbErrors(DrizzleIdentityRepository);\n"],"mappings":";;;;;AAkBA,IAAa,4BAAb,MAAqE;CAEhD;CACA;CAFnB,YACE,IACA,SAAkC,YAClC;EAFiB,KAAA,KAAA;EACA,KAAA,SAAA;CAChB;CAEH,MAAM,WAAW,OAAuC;EACtD,MAAM,CAAC,OAAO,MAAM,KAAK,GACtB,OAAO,KAAK,CAAC,CACb,OAAO;GACN,IAAI,MAAM;GACV,YAAY,MAAM,cAAc;GAChC,OAAO,MAAM;GACb,WAAW,MAAM,aAAa;GAC9B,UAAU,MAAM,YAAY;EAC9B,CAAC,CAAC,CACD,UAAU;EACb,IAAI,CAAC,KACH,MAAM,IAAI,MAAM,uBAAuB;EAEzC,OAAO;CACT;CAEA,MAAM,WAAW,IAAY,OAA8C;EAEzE,IAAI,OAAO,KAAK,KAAK,CAAC,CAAC,WAAW,GAChC,OAAO,KAAK,aAAa,EAAE;EAE7B,MAAM,CAAC,OAAO,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,UAAU;EACvF,OAAO,OAAO;CAChB;CAEA,MAAM,aAAa,IAAkC;EACnD,MAAM,CAAC,OAAO,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;EAChF,OAAO,OAAO;CAChB;CAEA,MAAM,qBAAqB,YAA0C;EACnE,MAAM,CAAC,OAAO,MAAM,KAAK,GACtB,OAAO,CAAC,CACR,KAAK,KAAK,CAAC,CACX,MAAM,GAAG,MAAM,YAAY,UAAU,CAAC,CAAC,CACvC,MAAM,CAAC;EACV,OAAO,OAAO;CAChB;CAIA,MAAM,gBAAgB,OAAqC;EACzD,MAAM,CAAC,OAAO,MAAM,KAAK,GACtB,OAAO,CAAC,CACR,KAAK,KAAK,CAAC,CACX,MAAM,GAAG,SAAS,MAAM,MAAM,YAAY,MAAM,EAAE,CAAC,CACnD,MAAM,CAAC;EACV,OAAO,OAAO;CAChB;CAEA,MAAM,YAAY,QAA6C;EAC7D,MAAM,CAAC,OAAO,MAAM,KAAK,GACtB,OAAO,CAAC,CACR,KAAK,YAAY,CAAC,CAClB,MAAM,GAAG,aAAa,QAAQ,MAAM,CAAC,CAAC,CACtC,MAAM,CAAC;EACV,OAAO,OAAO;CAChB;CAEA,MAAM,cAAc,QAAgB,OAA2C;EAE7E,IAAI,CAAC,MADkB,KAAK,YAAY,MAAM,GAC/B;GACb,MAAM,CAAC,OAAO,MAAM,KAAK,GACtB,OAAO,YAAY,CAAC,CACpB,OAAO;IACN;IACA,aAAa,MAAM,eAAe;IAClC,UAAU,MAAM,YAAY;IAC5B,KAAK,MAAM,OAAO;IAClB,iBAAiB,MAAM,mBAAmB;IAC1C,cAAc,MAAM,gBAAgB;IACpC,OAAO,MAAM,SAAS,CAAC;GACzB,CAAC,CAAC,CACD,UAAU;GACb,IAAI,CAAC,KACH,MAAM,IAAI,MAAM,0BAA0B;GAE5C,OAAO;EACT;EACA,MAAM,MAA+B,EAAE,2BAAW,IAAI,KAAK,EAAE;EAC7D,IAAI,MAAM,gBAAgB,KAAA,GACxB,IAAI,cAAc,MAAM;EAE1B,IAAI,MAAM,aAAa,KAAA,GACrB,IAAI,WAAW,MAAM;EAEvB,IAAI,MAAM,QAAQ,KAAA,GAChB,IAAI,MAAM,MAAM;EAElB,IAAI,MAAM,oBAAoB,KAAA,GAAW;GACvC,IAAI,kBAAkB,MAAM;GAC5B,IAAI,eAAe,MAAM;EAC3B;EACA,IAAI,MAAM,UAAU,KAAA,GAClB,IAAI,QAAQ,MAAM;EAEpB,MAAM,CAAC,OAAO,MAAM,KAAK,GACtB,OAAO,YAAY,CAAC,CACpB,IAAI,GAAG,CAAC,CACR,MAAM,GAAG,aAAa,QAAQ,MAAM,CAAC,CAAC,CACtC,UAAU;EACb,IAAI,CAAC,KACH,MAAM,IAAI,MAAM,0BAA0B;EAE5C,OAAO;CACT;AACF;AACA,kBAAkB,yBAAyB"}

package/dist/repositories/member.d.ts

@@ -0,0 +1,16 @@
+import { NodePgDatabase } from "drizzle-orm/node-postgres";
+import { Logger } from "@headless-lms/core/shared/ports";
+import { Page } from "@headless-lms/core/types";
+import { DirectoryQuery, DirectoryRow, MemberReportRepository } from "@headless-lms/core/reporting/member";
+//#region src/repositories/member.d.ts
+declare class DrizzleMemberRepository implements MemberReportRepository {
+  private readonly db;
+  private readonly logger;
+  constructor(db: NodePgDatabase, logger?: Logger);
+  directory(orgId: string, communityId: string, query: DirectoryQuery): Promise<Page<DirectoryRow>>;
+  people(orgId: string, orgUserIds: string[]): Promise<DirectoryRow[]>;
+  spaceMemberCounts(orgId: string, communityId: string): Promise<Record<string, number>>;
+}
+//#endregion
+export { DrizzleMemberRepository };
+//# sourceMappingURL=member.d.ts.map

package/dist/repositories/member.js

@@ -0,0 +1,63 @@
+import { spaces } from "../schema/content.js";
+import { userProfiles, users } from "../schema/identity.js";
+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 { noopLogger } from "@headless-lms/core/shared/logger";
+//#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,
+		imageAssetId: sql`case when ${userProfiles.imageAssetOrgId} = ${orgId} then ${userProfiles.imageAssetId} end`
+	};
+}
+var DrizzleMemberRepository = class {
+	db;
+	logger;
+	constructor(db, logger = noopLogger) {
+		this.db = db;
+		this.logger = logger;
+	}
+	async directory(orgId, communityId, query) {
+		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 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 {
+			rows,
+			total,
+			page: query.page,
+			pageSize: query.pageSize
+		};
+	}
+	async people(orgId, orgUserIds) {
+		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) {
+		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));
+		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`
+		}).from(spaces).leftJoin(seated, eq(seated.spaceId, spaces.id)).where(and(eq(spaces.orgId, orgId), eq(spaces.communityId, communityId)));
+		return Object.fromEntries(rows.map((row) => [row.spaceId, Number(row.count)]));
+	}
+};
+translateDbErrors(DrizzleMemberRepository);
+//#endregion
+export { DrizzleMemberRepository };
+
+//# sourceMappingURL=member.js.map

package/dist/repositories/member.js.map

@@ -0,0 +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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"}

package/dist/repositories/members.js

@@ -5,9 +5,9 @@ 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, isStaffRole } from "@headless-lms/core/organizations";
+import { STUDENT_ROLE, isRole } from "@headless-lms/core/organizations";
 //#region src/repositories/members.ts
-const roleOf = (t) => isStaffRole(t) ? t : "instructor";
+const roleOf = (t) => isRole(t) && t !== STUDENT_ROLE ? t : "instructor";
 function toMember(r) {
 	return {
 		id: r.id,

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  isStaffRole,\n  STUDENT_ROLE,\n  type Member,\n  type MemberRecord,\n  type MembersQuery,\n  type MembersRepository,\n  type Page,\n  type StaffRole,\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\n// The member surface is staff-only; a student org user never reaches here\n// (the queries below exclude it), so an unrecognized role falls back to the\n// least-privileged staff role rather than widening to the full Role union.\nconst roleOf = (t: string): StaffRole => (isStaffRole(t) ? 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":["// 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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"}

package/dist/repositories/notifications.d.ts

@@ -0,0 +1,23 @@
+import { NodePgDatabase } from "drizzle-orm/node-postgres";
+import { Notification, NotificationPreference } from "@headless-lms/core/types";
+import { NotificationsQuery, NotificationsRepository } from "@headless-lms/core/identity";
+//#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>;
+}
+//#endregion
+export { DrizzleNotificationsRepository };
+//# sourceMappingURL=notifications.d.ts.map

package/dist/repositories/notifications.js

@@ -0,0 +1,70 @@
+import { notificationPreferences, notifications } from "../schema/identity.js";
+import "../schema/index.js";
+import { translateDbErrors } from "./pg-errors.js";
+import { and, desc, eq, inArray, isNull, sql } from "drizzle-orm";
+//#region src/repositories/notifications.ts
+var DrizzleNotificationsRepository = class {
+	db;
+	constructor(db) {
+		this.db = db;
+	}
+	async insert(orgId, rows) {
+		if (rows.length === 0) return;
+		await this.db.insert(notifications).values(rows.map((row) => ({
+			...row,
+			orgId
+		})));
+	}
+	async page(orgId, userId, query) {
+		const mine = and(eq(notifications.orgId, orgId), eq(notifications.userId, userId));
+		const [rows, counts] = await Promise.all([this.db.select().from(notifications).where(mine).orderBy(desc(notifications.createdAt), desc(notifications.id)).limit(query.pageSize).offset((query.page - 1) * query.pageSize), this.db.select({
+			total: sql`count(*)::int`,
+			unread: sql`(count(*) filter (where ${notifications.readAt} is null))::int`
+		}).from(notifications).where(mine)]);
+		return {
+			rows,
+			total: Number(counts[0]?.total ?? 0),
+			unreadCount: Number(counts[0]?.unread ?? 0)
+		};
+	}
+	async markRead(orgId, userId, notificationId, at) {
+		const [row] = await this.db.update(notifications).set({ readAt: sql`coalesce(${notifications.readAt}, ${at.toISOString()}::timestamptz)` }).where(and(eq(notifications.orgId, orgId), eq(notifications.userId, userId), eq(notifications.id, notificationId))).returning();
+		return row ?? null;
+	}
+	async markAllRead(orgId, userId, at) {
+		return (await this.db.update(notifications).set({ readAt: at }).where(and(eq(notifications.orgId, orgId), eq(notifications.userId, userId), isNull(notifications.readAt))).returning({ id: notifications.id })).length;
+	}
+	async preferences(orgId, userIds) {
+		if (userIds.length === 0) return [];
+		return this.db.select({
+			userId: notificationPreferences.userId,
+			kind: notificationPreferences.kind,
+			inApp: notificationPreferences.inApp,
+			email: notificationPreferences.email
+		}).from(notificationPreferences).where(and(eq(notificationPreferences.orgId, orgId), inArray(notificationPreferences.userId, userIds)));
+	}
+	async upsertPreferences(orgId, userId, preferences) {
+		if (preferences.length === 0) return;
+		await this.db.insert(notificationPreferences).values(preferences.map((pref) => ({
+			orgId,
+			userId,
+			...pref
+		}))).onConflictDoUpdate({
+			target: [
+				notificationPreferences.orgId,
+				notificationPreferences.userId,
+				notificationPreferences.kind
+			],
+			set: {
+				inApp: sql`excluded.in_app`,
+				email: sql`excluded.email`,
+				updatedAt: sql`now()`
+			}
+		});
+	}
+};
+translateDbErrors(DrizzleNotificationsRepository);
+//#endregion
+export { DrizzleNotificationsRepository };
+
+//# sourceMappingURL=notifications.js.map

package/dist/repositories/notifications.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"notifications.js","names":[],"sources":["../../src/repositories/notifications.ts"],"sourcesContent":["import { and, desc, eq, inArray, isNull, sql } from \"drizzle-orm\";\nimport type { NodePgDatabase } from \"drizzle-orm/node-postgres\";\nimport type { NotificationsQuery, NotificationsRepository } from \"@headless-lms/core/identity\";\nimport type { Notification, NotificationPreference } from \"@headless-lms/core/types\";\nimport { notificationPreferences, notifications } from \"../schema/index.js\";\nimport { translateDbErrors } from \"./pg-errors.js\";\n\nexport class DrizzleNotificationsRepository implements NotificationsRepository {\n  constructor(private readonly db: NodePgDatabase) {}\n\n  async insert(orgId: string, rows: Notification[]): Promise<void> {\n    if (rows.length === 0) {\n      return;\n    }\n    await this.db.insert(notifications).values(rows.map((row) => ({ ...row, orgId })));\n  }\n\n  async page(\n    orgId: string,\n    userId: string,\n    query: NotificationsQuery,\n  ): Promise<{ rows: Notification[]; total: number; unreadCount: number }> {\n    const mine = and(eq(notifications.orgId, orgId), eq(notifications.userId, userId));\n    const [rows, counts] = await Promise.all([\n      this.db\n        .select()\n        .from(notifications)\n        .where(mine)\n        .orderBy(desc(notifications.createdAt), desc(notifications.id))\n        .limit(query.pageSize)\n        .offset((query.page - 1) * query.pageSize),\n      this.db\n        .select({\n          total: sql<number>`count(*)::int`,\n          unread: sql<number>`(count(*) filter (where ${notifications.readAt} is null))::int`,\n        })\n        .from(notifications)\n        .where(mine),\n    ]);\n    return {\n      rows,\n      total: Number(counts[0]?.total ?? 0),\n      unreadCount: Number(counts[0]?.unread ?? 0),\n    };\n  }\n\n  async markRead(\n    orgId: string,\n    userId: string,\n    notificationId: string,\n    at: Date,\n  ): Promise<Notification | null> {\n    const [row] = await this.db\n      .update(notifications)\n      .set({ readAt: sql`coalesce(${notifications.readAt}, ${at.toISOString()}::timestamptz)` })\n      .where(\n        and(\n          eq(notifications.orgId, orgId),\n          eq(notifications.userId, userId),\n          eq(notifications.id, notificationId),\n        ),\n      )\n      .returning();\n    return row ?? null;\n  }\n\n  async markAllRead(orgId: string, userId: string, at: Date): Promise<number> {\n    const rows = await this.db\n      .update(notifications)\n      .set({ readAt: at })\n      .where(\n        and(\n          eq(notifications.orgId, orgId),\n          eq(notifications.userId, userId),\n          isNull(notifications.readAt),\n        ),\n      )\n      .returning({ id: notifications.id });\n    return rows.length;\n  }\n\n  async preferences(\n    orgId: string,\n    userIds: string[],\n  ): Promise<(NotificationPreference & { userId: string })[]> {\n    if (userIds.length === 0) {\n      return [];\n    }\n    return this.db\n      .select({\n        userId: notificationPreferences.userId,\n        kind: notificationPreferences.kind,\n        inApp: notificationPreferences.inApp,\n        email: notificationPreferences.email,\n      })\n      .from(notificationPreferences)\n      .where(\n        and(\n          eq(notificationPreferences.orgId, orgId),\n          inArray(notificationPreferences.userId, userIds),\n        ),\n      );\n  }\n\n  async upsertPreferences(\n    orgId: string,\n    userId: string,\n    preferences: NotificationPreference[],\n  ): Promise<void> {\n    if (preferences.length === 0) {\n      return;\n    }\n    await this.db\n      .insert(notificationPreferences)\n      .values(preferences.map((pref) => ({ orgId, userId, ...pref })))\n      .onConflictDoUpdate({\n        target: [\n          notificationPreferences.orgId,\n          notificationPreferences.userId,\n          notificationPreferences.kind,\n        ],\n        set: {\n          inApp: sql`excluded.in_app`,\n          email: sql`excluded.email`,\n          updatedAt: sql`now()`,\n        },\n      });\n  }\n}\n\ntranslateDbErrors(DrizzleNotificationsRepository);\n"],"mappings":";;;;;AAOA,IAAa,iCAAb,MAA+E;CAChD;CAA7B,YAAY,IAAqC;EAApB,KAAA,KAAA;CAAqB;CAElD,MAAM,OAAO,OAAe,MAAqC;EAC/D,IAAI,KAAK,WAAW,GAClB;EAEF,MAAM,KAAK,GAAG,OAAO,aAAa,CAAC,CAAC,OAAO,KAAK,KAAK,SAAS;GAAE,GAAG;GAAK;EAAM,EAAE,CAAC;CACnF;CAEA,MAAM,KACJ,OACA,QACA,OACuE;EACvE,MAAM,OAAO,IAAI,GAAG,cAAc,OAAO,KAAK,GAAG,GAAG,cAAc,QAAQ,MAAM,CAAC;EACjF,MAAM,CAAC,MAAM,UAAU,MAAM,QAAQ,IAAI,CACvC,KAAK,GACF,OAAO,CAAC,CACR,KAAK,aAAa,CAAC,CACnB,MAAM,IAAI,CAAC,CACX,QAAQ,KAAK,cAAc,SAAS,GAAG,KAAK,cAAc,EAAE,CAAC,CAAC,CAC9D,MAAM,MAAM,QAAQ,CAAC,CACrB,QAAQ,MAAM,OAAO,KAAK,MAAM,QAAQ,GAC3C,KAAK,GACF,OAAO;GACN,OAAO,GAAW;GAClB,QAAQ,GAAW,2BAA2B,cAAc,OAAO;EACrE,CAAC,CAAC,CACD,KAAK,aAAa,CAAC,CACnB,MAAM,IAAI,CACf,CAAC;EACD,OAAO;GACL;GACA,OAAO,OAAO,OAAO,EAAE,EAAE,SAAS,CAAC;GACnC,aAAa,OAAO,OAAO,EAAE,EAAE,UAAU,CAAC;EAC5C;CACF;CAEA,MAAM,SACJ,OACA,QACA,gBACA,IAC8B;EAC9B,MAAM,CAAC,OAAO,MAAM,KAAK,GACtB,OAAO,aAAa,CAAC,CACrB,IAAI,EAAE,QAAQ,GAAG,YAAY,cAAc,OAAO,IAAI,GAAG,YAAY,EAAE,gBAAgB,CAAC,CAAC,CACzF,MACC,IACE,GAAG,cAAc,OAAO,KAAK,GAC7B,GAAG,cAAc,QAAQ,MAAM,GAC/B,GAAG,cAAc,IAAI,cAAc,CACrC,CACF,CAAC,CACA,UAAU;EACb,OAAO,OAAO;CAChB;CAEA,MAAM,YAAY,OAAe,QAAgB,IAA2B;EAY1E,QAAO,MAXY,KAAK,GACrB,OAAO,aAAa,CAAC,CACrB,IAAI,EAAE,QAAQ,GAAG,CAAC,CAAC,CACnB,MACC,IACE,GAAG,cAAc,OAAO,KAAK,GAC7B,GAAG,cAAc,QAAQ,MAAM,GAC/B,OAAO,cAAc,MAAM,CAC7B,CACF,CAAC,CACA,UAAU,EAAE,IAAI,cAAc,GAAG,CAAC,EAAA,CACzB;CACd;CAEA,MAAM,YACJ,OACA,SAC0D;EAC1D,IAAI,QAAQ,WAAW,GACrB,OAAO,CAAC;EAEV,OAAO,KAAK,GACT,OAAO;GACN,QAAQ,wBAAwB;GAChC,MAAM,wBAAwB;GAC9B,OAAO,wBAAwB;GAC/B,OAAO,wBAAwB;EACjC,CAAC,CAAC,CACD,KAAK,uBAAuB,CAAC,CAC7B,MACC,IACE,GAAG,wBAAwB,OAAO,KAAK,GACvC,QAAQ,wBAAwB,QAAQ,OAAO,CACjD,CACF;CACJ;CAEA,MAAM,kBACJ,OACA,QACA,aACe;EACf,IAAI,YAAY,WAAW,GACzB;EAEF,MAAM,KAAK,GACR,OAAO,uBAAuB,CAAC,CAC/B,OAAO,YAAY,KAAK,UAAU;GAAE;GAAO;GAAQ,GAAG;EAAK,EAAE,CAAC,CAAC,CAC/D,mBAAmB;GAClB,QAAQ;IACN,wBAAwB;IACxB,wBAAwB;IACxB,wBAAwB;GAC1B;GACA,KAAK;IACH,OAAO,GAAG;IACV,OAAO,GAAG;IACV,WAAW,GAAG;GAChB;EACF,CAAC;CACL;AACF;AAEA,kBAAkB,8BAA8B"}

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

@@ -87,6 +87,219 @@ declare const orgUserProfileColumns: {
     generated: undefined;
   }, {}, {}>;
 };
+declare const authorProfileColumns: {
+  role: import("drizzle-orm/pg-core").PgColumn<{
+    name: "role";
+    tableName: "org_users";
+    dataType: "string";
+    columnType: "PgText";
+    data: "student" | "owner" | "admin" | "instructor" | "moderator";
+    driverParam: string;
+    notNull: true;
+    hasDefault: false;
+    isPrimaryKey: false;
+    isAutoincrement: false;
+    hasRuntimeDefault: false;
+    enumValues: ["owner", "admin", "instructor", "moderator", "student"];
+    baseColumn: never;
+    identity: undefined;
+    generated: undefined;
+  }, {}, {}>;
+  displayName: import("drizzle-orm/pg-core").PgColumn<{
+    name: "display_name";
+    tableName: "user_profiles";
+    dataType: "string";
+    columnType: "PgText";
+    data: string;
+    driverParam: string;
+    notNull: false;
+    hasDefault: false;
+    isPrimaryKey: false;
+    isAutoincrement: false;
+    hasRuntimeDefault: false;
+    enumValues: [string, ...string[]];
+    baseColumn: never;
+    identity: undefined;
+    generated: undefined;
+  }, {}, {}>;
+  headline: import("drizzle-orm/pg-core").PgColumn<{
+    name: "headline";
+    tableName: "user_profiles";
+    dataType: "string";
+    columnType: "PgText";
+    data: string;
+    driverParam: string;
+    notNull: false;
+    hasDefault: false;
+    isPrimaryKey: false;
+    isAutoincrement: false;
+    hasRuntimeDefault: false;
+    enumValues: [string, ...string[]];
+    baseColumn: never;
+    identity: undefined;
+    generated: undefined;
+  }, {}, {}>;
+  imageAssetOrgId: import("drizzle-orm/pg-core").PgColumn<{
+    name: "image_asset_org_id";
+    tableName: "user_profiles";
+    dataType: "string";
+    columnType: "PgText";
+    data: string;
+    driverParam: string;
+    notNull: false;
+    hasDefault: false;
+    isPrimaryKey: false;
+    isAutoincrement: false;
+    hasRuntimeDefault: false;
+    enumValues: [string, ...string[]];
+    baseColumn: never;
+    identity: undefined;
+    generated: undefined;
+  }, {}, {}>;
+  imageAssetId: import("drizzle-orm/pg-core").PgColumn<{
+    name: "image_asset_id";
+    tableName: "user_profiles";
+    dataType: "string";
+    columnType: "PgText";
+    data: string;
+    driverParam: string;
+    notNull: false;
+    hasDefault: false;
+    isPrimaryKey: false;
+    isAutoincrement: false;
+    hasRuntimeDefault: false;
+    enumValues: [string, ...string[]];
+    baseColumn: never;
+    identity: undefined;
+    generated: undefined;
+  }, {}, {}>;
+  id: import("drizzle-orm/pg-core").PgColumn<{
+    name: "id";
+    tableName: "org_users";
+    dataType: "string";
+    columnType: "PgText";
+    data: string;
+    driverParam: string;
+    notNull: true;
+    hasDefault: true;
+    isPrimaryKey: false;
+    isAutoincrement: false;
+    hasRuntimeDefault: true;
+    enumValues: [string, ...string[]];
+    baseColumn: never;
+    identity: undefined;
+    generated: undefined;
+  }, {}, {}>;
+  firstName: import("drizzle-orm/pg-core").PgColumn<{
+    name: "first_name";
+    tableName: "users";
+    dataType: "string";
+    columnType: "PgText";
+    data: string;
+    driverParam: string;
+    notNull: false;
+    hasDefault: false;
+    isPrimaryKey: false;
+    isAutoincrement: false;
+    hasRuntimeDefault: false;
+    enumValues: [string, ...string[]];
+    baseColumn: never;
+    identity: undefined;
+    generated: undefined;
+  }, {}, {}>;
+  lastName: import("drizzle-orm/pg-core").PgColumn<{
+    name: "last_name";
+    tableName: "users";
+    dataType: "string";
+    columnType: "PgText";
+    data: string;
+    driverParam: string;
+    notNull: false;
+    hasDefault: false;
+    isPrimaryKey: false;
+    isAutoincrement: false;
+    hasRuntimeDefault: false;
+    enumValues: [string, ...string[]];
+    baseColumn: never;
+    identity: undefined;
+    generated: undefined;
+  }, {}, {}>;
+  email: import("drizzle-orm/pg-core").PgColumn<{
+    name: "email";
+    tableName: "users";
+    dataType: "string";
+    columnType: "PgText";
+    data: string;
+    driverParam: string;
+    notNull: true;
+    hasDefault: false;
+    isPrimaryKey: false;
+    isAutoincrement: false;
+    hasRuntimeDefault: false;
+    enumValues: [string, ...string[]];
+    baseColumn: never;
+    identity: undefined;
+    generated: undefined;
+  }, {}, {}>;
+  image: import("drizzle-orm/pg-core").PgColumn<{
+    name: "image";
+    tableName: "ba_user";
+    dataType: "string";
+    columnType: "PgText";
+    data: string;
+    driverParam: string;
+    notNull: false;
+    hasDefault: false;
+    isPrimaryKey: false;
+    isAutoincrement: false;
+    hasRuntimeDefault: false;
+    enumValues: [string, ...string[]];
+    baseColumn: never;
+    identity: undefined;
+    generated: undefined;
+  }, {}, {}>;
+};
+declare const studentFirstName: import("drizzle-orm").SQL<string | null>;
+declare const studentLastName: import("drizzle-orm").SQL<string | null>;
+declare const studentProfileColumns: {
+  id: import("drizzle-orm/pg-core").PgColumn<{
+    name: "id";
+    tableName: "org_users";
+    dataType: "string";
+    columnType: "PgText";
+    data: string;
+    driverParam: string;
+    notNull: true;
+    hasDefault: true;
+    isPrimaryKey: false;
+    isAutoincrement: false;
+    hasRuntimeDefault: true;
+    enumValues: [string, ...string[]];
+    baseColumn: never;
+    identity: undefined;
+    generated: undefined;
+  }, {}, {}>;
+  firstName: import("drizzle-orm").SQL<string | null>;
+  lastName: import("drizzle-orm").SQL<string | null>;
+  email: import("drizzle-orm/pg-core").PgColumn<{
+    name: "email";
+    tableName: "users";
+    dataType: "string";
+    columnType: "PgText";
+    data: string;
+    driverParam: string;
+    notNull: true;
+    hasDefault: false;
+    isPrimaryKey: false;
+    isAutoincrement: false;
+    hasRuntimeDefault: false;
+    enumValues: [string, ...string[]];
+    baseColumn: never;
+    identity: undefined;
+    generated: undefined;
+  }, {}, {}>;
+  image: import("drizzle-orm").SQL<string | null>;
+};
 //#endregion
-export { orgUserProfileColumns };
+export { authorProfileColumns, orgUserProfileColumns, studentFirstName, studentLastName, studentProfileColumns };
 //# sourceMappingURL=org-user-profile.d.ts.map

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

@@ -1,6 +1,7 @@
-import { users } from "../schema/identity.js";
+import { userProfiles, users } from "../schema/identity.js";
 import { orgUsers } from "../schema/organizations.js";
 import { user } from "../schema/better-auth.js";
+import { sql } from "drizzle-orm";
 //#region src/repositories/org-user-profile.ts
 /** Spread into a `.select({ ... })` to get the profile columns. */
 const orgUserProfileColumns = {
@@ -10,7 +11,27 @@ const orgUserProfileColumns = {
 	email: users.email,
 	image: user.image
 };
+const authorProfileColumns = {
+	...orgUserProfileColumns,
+	role: orgUsers.role,
+	displayName: userProfiles.displayName,
+	headline: userProfiles.headline,
+	imageAssetOrgId: userProfiles.imageAssetOrgId,
+	imageAssetId: userProfiles.imageAssetId
+};
+const profileVisible = sql`(${orgUsers.status} <> 'invited' or (${users.externalId} is null and not exists (
+  select 1 from org_users other where other.user_id = ${users.id} and other.org_id <> ${orgUsers.orgId}
+)))`;
+const studentFirstName = sql`case when ${profileVisible} then ${users.firstName} end`;
+const studentLastName = sql`case when ${profileVisible} then ${users.lastName} end`;
+const studentProfileColumns = {
+	id: orgUsers.id,
+	firstName: studentFirstName,
+	lastName: studentLastName,
+	email: users.email,
+	image: sql`case when ${profileVisible} then ${user.image} end`
+};
 //#endregion
-export { orgUserProfileColumns };
+export { authorProfileColumns, orgUserProfileColumns, studentFirstName, studentLastName, studentProfileColumns };
 
 //# sourceMappingURL=org-user-profile.js.map

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

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

package/dist/repositories/organizations.d.ts

@@ -1,5 +1,5 @@
 import { NodePgDatabase } from "drizzle-orm/node-postgres";
-import { CreateOrgUserInput, Invite, NewInviteRow, NewOrganizationRow, OrgUser, Organization, OrganizationsRepository, UpdateOrgUserInput, UpdateOrganizationInput } from "@headless-lms/core/organizations";
+import { CreateOrgUserInput, Invite, NewInviteRow, NewOrganizationRow, OrgUser, Organization, OrganizationsRepository, Role, UpdateOrgUserInput, UpdateOrganizationInput } from "@headless-lms/core/organizations";
 import { Logger } from "@headless-lms/core/shared/ports";
 //#region src/repositories/organizations.d.ts
 declare class DrizzleOrganizationsRepository implements OrganizationsRepository {
@@ -20,10 +20,11 @@ declare class DrizzleOrganizationsRepository implements OrganizationsRepository
   findOrgUser(orgId: string, userId: string): Promise<OrgUser | null>;
   findOrgUsersByUser(userId: string): Promise<OrgUser[]>;
   findOrgUserById(orgId: string, id: string): Promise<OrgUser | null>;
+  findOrgUsersByIds(orgId: string, ids: string[]): Promise<OrgUser[]>;
+  findOrgUserIdsByRole(orgId: string, roles: Role[]): Promise<string[]>;
   createOrgUser(input: CreateOrgUserInput): Promise<OrgUser>;
   updateOrgUser(orgId: string, id: string, patch: UpdateOrgUserInput): Promise<OrgUser | null>;
   findStudentOrgUsers(userId: string): Promise<OrgUser[]>;
-  cancelPendingInvite(orgId: string, email: string): Promise<Invite | null>;
   deleteOrgUser(orgId: string, id: string): Promise<OrgUser | null>;
 }
 //#endregion

package/dist/repositories/organizations.js

@@ -1,6 +1,6 @@
 import { invites, orgUsers, organizations } from "../schema/organizations.js";
-import { isUniqueViolation, translateDbErrors } from "./pg-errors.js";
-import { and, eq, sql } from "drizzle-orm";
+import { isUniqueViolation, pgErrorFields, translateDbErrors } from "./pg-errors.js";
+import { and, eq, inArray, sql } from "drizzle-orm";
 import { ConflictError } from "@headless-lms/core/shared/errors";
 import { noopLogger } from "@headless-lms/core/shared/logger";
 import { parseRole } from "@headless-lms/core/organizations";
@@ -129,6 +129,17 @@ var DrizzleOrganizationsRepository = class {
 			role: parseRole(row.role)
 		} : null;
 	}
+	async findOrgUsersByIds(orgId, ids) {
+		if (ids.length === 0) return [];
+		return (await this.db.select().from(orgUsers).where(and(eq(orgUsers.orgId, orgId), inArray(orgUsers.id, ids)))).map((row) => ({
+			...row,
+			role: parseRole(row.role)
+		}));
+	}
+	async findOrgUserIdsByRole(orgId, roles) {
+		if (roles.length === 0) return [];
+		return (await this.db.select({ id: orgUsers.id }).from(orgUsers).where(and(eq(orgUsers.orgId, orgId), eq(orgUsers.status, "active"), inArray(orgUsers.role, roles))).orderBy(orgUsers.id)).map((row) => row.id);
+	}
 	async createOrgUser(input) {
 		try {
 			const [row] = await this.db.insert(orgUsers).values({
@@ -163,13 +174,14 @@ var DrizzleOrganizationsRepository = class {
 			role: parseRole(row.role)
 		}));
 	}
-	async cancelPendingInvite(orgId, email) {
-		const [row] = await this.db.update(invites).set({ status: "canceled" }).where(and(eq(invites.orgId, orgId), sql`lower(${invites.email}) = lower(${email})`, eq(invites.status, "pending"))).returning();
-		return row ? toInvite(row) : null;
-	}
 	async deleteOrgUser(orgId, id) {
-		const [row] = await this.db.delete(orgUsers).where(and(eq(orgUsers.orgId, orgId), eq(orgUsers.id, id))).returning();
-		return row ?? null;
+		try {
+			const [row] = await this.db.delete(orgUsers).where(and(eq(orgUsers.orgId, orgId), eq(orgUsers.id, id))).returning();
+			return row ?? null;
+		} catch (err) {
+			if (pgErrorFields(err)?.code === "23503") throw Object.assign(new ConflictError("This person has written posts, comments or messages and cannot be deleted"), { cause: err });
+			throw err;
+		}
 	}
 };
 translateDbErrors(DrizzleOrganizationsRepository);