@headless-lms/adapter-db 0.4.0 → 0.5.0

package/dist/repositories/event-reports.js

@@ -0,0 +1,199 @@
+import { SETTINGS_NAMESPACE } from "./content.js";
+import { oneOf } from "./grant-covers.js";
+import { sql } from "drizzle-orm";
+import { eventSettingsDefaults } from "@headless-lms/core/schemas";
+//#region src/repositories/event-reports.ts
+function attendance(orgId, eventIds) {
+	return sql`
+    select ca.content_id, ca.org_user_id,
+      max(case when e.content_id is not null then e.source end) as direct_source,
+      min(case when e.content_id is not null then ca.granted_at end) as direct_at,
+      min(ca.granted_at) as any_at
+    from content_access ca
+    join entitlements e on e.org_id = ca.org_id and e.id = ca.entitlement_id
+    where ca.org_id = ${orgId} and ${oneOf(sql`ca.content_id`, eventIds)}
+    group by ca.content_id, ca.org_user_id
+  `;
+}
+const DISPLAY_NAME = sql`coalesce(
+  nullif(trim(up.display_name), ''),
+  nullif(trim(concat_ws(' ', u.first_name, u.last_name)), '')
+)`;
+const SOURCE = sql`case
+  when a.direct_source in ('self', 'automation') then a.direct_source
+  when a.direct_source is not null then 'manual'
+  else 'bundle'
+end`;
+async function eventAttendeePage(db, orgId, eventId, page) {
+	const rows = (await db.execute(sql`
+    with a as (${attendance(orgId, [eventId])})
+    select a.org_user_id,
+      ${DISPLAY_NAME} as display_name,
+      case when up.image_asset_org_id = ${orgId} then up.image_asset_id end as image_asset_id,
+      ${SOURCE} as source,
+      coalesce(a.direct_at, a.any_at) as granted_at,
+      count(*) over () as total
+    from a
+    join org_users ou on ou.org_id = ${orgId} and ou.id = a.org_user_id
+    left join users u on u.id = ou.user_id
+    left join user_profiles up on up.user_id = ou.user_id
+    order by coalesce(a.direct_at, a.any_at), a.org_user_id
+    limit ${page.pageSize}
+    offset ${(page.page - 1) * page.pageSize}
+  `)).rows;
+	const total = rows.length > 0 || page.page === 1 ? Number(rows[0]?.total ?? 0) : await eventAttendeeCount(db, orgId, eventId);
+	return {
+		rows: rows.map((row) => ({
+			orgUserId: row.org_user_id,
+			displayName: row.display_name,
+			imageAssetId: row.image_asset_id,
+			source: row.source,
+			grantedAt: new Date(row.granted_at)
+		})),
+		total,
+		page: page.page,
+		pageSize: page.pageSize
+	};
+}
+async function eventAttendeeCount(db, orgId, eventId) {
+	const result = await db.execute(sql`
+    select count(distinct ca.org_user_id) as total
+    from content_access ca
+    where ca.org_id = ${orgId} and ca.content_id = ${eventId}
+  `);
+	return Number(result.rows[0]?.total ?? 0);
+}
+async function eventAnalyticsFigures(db, orgId, eventId, startsAt) {
+	const [sources, revoked, overTime] = await Promise.all([
+		db.execute(sql`
+      with a as (${attendance(orgId, [eventId])})
+      select ${SOURCE} as source, count(*) as count from a group by 1
+    `),
+		db.execute(sql`
+      select count(*) as count from entitlements e
+      where e.org_id = ${orgId} and e.content_id = ${eventId} and e.status = 'revoked'
+    `),
+		db.execute(sql`
+      select to_char((e.granted_at at time zone 'utc')::date, 'YYYY-MM-DD') as date,
+        count(*) as count
+      from entitlements e
+      where e.org_id = ${orgId}
+        and e.content_id = ${eventId}
+        and e.status = 'active'
+        and (e.expires_at is null or e.expires_at > now())
+        and e.granted_at < ${startsAt}
+      group by 1
+      order by 1
+    `)
+	]);
+	const bySource = {
+		self: 0,
+		manual: 0,
+		automation: 0,
+		bundle: 0
+	};
+	for (const row of sources.rows) bySource[row.source] = Number(row.count);
+	return {
+		attendees: bySource.self + bySource.manual + bySource.automation + bySource.bundle,
+		bySource,
+		revoked: Number(revoked.rows[0]?.count ?? 0),
+		grantsOverTime: overTime.rows.map((row) => ({
+			date: row.date,
+			count: Number(row.count)
+		}))
+	};
+}
+async function eventFacesFor(db, orgId, eventIds, limit) {
+	const faces = Object.fromEntries(eventIds.map((id) => [id, {
+		total: 0,
+		rows: []
+	}]));
+	if (eventIds.length === 0) return faces;
+	const result = await db.execute(sql`
+    with a as (${attendance(orgId, eventIds)}),
+    ranked as (
+      select a.content_id, a.org_user_id,
+        ${DISPLAY_NAME} as display_name,
+        case when up.image_asset_org_id = ${orgId} then up.image_asset_id end as image_asset_id,
+        row_number() over (
+          partition by a.content_id
+          order by coalesce(a.direct_at, a.any_at), a.org_user_id
+        ) as position,
+        count(*) over (partition by a.content_id) as total
+      from a
+      join org_users ou on ou.org_id = ${orgId} and ou.id = a.org_user_id
+      left join users u on u.id = ou.user_id
+      left join user_profiles up on up.user_id = ou.user_id
+    )
+    select content_id, org_user_id, display_name, image_asset_id, total
+    from ranked
+    where position <= ${limit}
+    order by content_id, position
+  `);
+	for (const row of result.rows) {
+		const entry = faces[row.content_id];
+		if (!entry) continue;
+		entry.total = Number(row.total);
+		entry.rows.push({
+			orgUserId: row.org_user_id,
+			displayName: row.display_name,
+			imageAssetId: row.image_asset_id
+		});
+	}
+	return faces;
+}
+async function directEventGrantIds(db, orgId, orgUserId, eventIds) {
+	return (await db.execute(sql`
+    select distinct e.content_id from entitlements e
+    where e.org_id = ${orgId}
+      and e.org_user_id = ${orgUserId}
+      and ${oneOf(sql`e.content_id`, eventIds)}
+      and e.status = 'active'
+      and (e.expires_at is null or e.expires_at > now())
+  `)).rows.map((row) => row.content_id);
+}
+async function memberEventIds(db, orgId, query, reader, now) {
+	const attends = sql`exists (
+    select 1 from content_access ca
+    where ca.org_id = ev.org_id and ca.content_id = ev.id and ca.org_user_id = ${reader.orgUserId}
+  )`;
+	const sees = reader.readAll ? sql`true` : sql`(
+        ${oneOf(sql`ev.id`, reader.readIds)}
+        or (ev.status = 'published' and coalesce(s.value ->> 'type', ${eventSettingsDefaults.type}) = 'public')
+        or ${attends}
+      )`;
+	const past = query.when === "past";
+	const where = sql`
+    ev.org_id = ${orgId}
+    and ev.status in ('published', 'canceled')
+    and ${sees}
+    and ${query.attending ? attends : sql`true`}
+    and ${past ? sql`ev.ends_at <= ${now}` : sql`ev.ends_at > ${now}`}
+  `;
+	const from = sql`
+    from events ev
+    left join settings s on s.org_id = ev.org_id and s.namespace = ${SETTINGS_NAMESPACE} and s.scope_id = ev.id
+  `;
+	const order = past ? sql`ev.starts_at desc, ev.id desc` : sql`ev.starts_at asc, ev.id asc`;
+	const [rows, totals] = await Promise.all([db.execute(sql`
+      select ev.id ${from} where ${where} order by ${order}
+      limit ${query.pageSize} offset ${(query.page - 1) * query.pageSize}
+    `), db.execute(sql`select count(*) as total ${from} where ${where}`)]);
+	return {
+		rows: rows.rows.map((row) => row.id),
+		total: Number(totals.rows[0]?.total ?? 0),
+		page: query.page,
+		pageSize: query.pageSize
+	};
+}
+async function upcomingEventCount(db, orgId) {
+	const result = await db.execute(sql`
+    select count(*) as total from events ev
+    where ev.org_id = ${orgId} and ev.status = 'published' and ev.ends_at > now()
+  `);
+	return Number(result.rows[0]?.total ?? 0);
+}
+//#endregion
+export { directEventGrantIds, eventAnalyticsFigures, eventAttendeePage, eventFacesFor, memberEventIds, upcomingEventCount };
+
+//# sourceMappingURL=event-reports.js.map

package/dist/repositories/event-reports.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"event-reports.js","names":[],"sources":["../../src/repositories/event-reports.ts"],"sourcesContent":["import { sql, type SQL } from \"drizzle-orm\";\nimport type { NodePgDatabase } from \"drizzle-orm/node-postgres\";\nimport type {\n  EventAnalytics,\n  EventAttendeeSource,\n  MemberEventsQuery,\n  Page,\n} from \"@headless-lms/core/types\";\nimport { eventSettingsDefaults } from \"@headless-lms/core/schemas\";\nimport type {\n  EventAttendeeRow,\n  EventFaces,\n  EventReader,\n} from \"@headless-lms/core/reporting/events\";\nimport { oneOf } from \"./grant-covers.js\";\nimport { SETTINGS_NAMESPACE } from \"./content.js\";\n\nfunction attendance(orgId: string, eventIds: string[]): SQL {\n  return sql`\n    select ca.content_id, ca.org_user_id,\n      max(case when e.content_id is not null then e.source end) as direct_source,\n      min(case when e.content_id is not null then ca.granted_at end) as direct_at,\n      min(ca.granted_at) as any_at\n    from content_access ca\n    join entitlements e on e.org_id = ca.org_id and e.id = ca.entitlement_id\n    where ca.org_id = ${orgId} and ${oneOf(sql`ca.content_id`, eventIds)}\n    group by ca.content_id, ca.org_user_id\n  `;\n}\n\nconst DISPLAY_NAME = sql`coalesce(\n  nullif(trim(up.display_name), ''),\n  nullif(trim(concat_ws(' ', u.first_name, u.last_name)), '')\n)`;\n\nconst SOURCE = sql`case\n  when a.direct_source in ('self', 'automation') then a.direct_source\n  when a.direct_source is not null then 'manual'\n  else 'bundle'\nend`;\n\nexport async function eventAttendeePage(\n  db: NodePgDatabase,\n  orgId: string,\n  eventId: string,\n  page: { page: number; pageSize: number },\n): Promise<Page<EventAttendeeRow>> {\n  const result = await db.execute(sql`\n    with a as (${attendance(orgId, [eventId])})\n    select a.org_user_id,\n      ${DISPLAY_NAME} as display_name,\n      case when up.image_asset_org_id = ${orgId} then up.image_asset_id end as image_asset_id,\n      ${SOURCE} as source,\n      coalesce(a.direct_at, a.any_at) as granted_at,\n      count(*) over () as total\n    from a\n    join org_users ou on ou.org_id = ${orgId} and ou.id = a.org_user_id\n    left join users u on u.id = ou.user_id\n    left join user_profiles up on up.user_id = ou.user_id\n    order by coalesce(a.direct_at, a.any_at), a.org_user_id\n    limit ${page.pageSize}\n    offset ${(page.page - 1) * page.pageSize}\n  `);\n  const rows = result.rows as {\n    org_user_id: string;\n    display_name: string | null;\n    image_asset_id: string | null;\n    source: EventAttendeeSource;\n    granted_at: Date | string;\n    total: string | number;\n  }[];\n  const total =\n    rows.length > 0 || page.page === 1\n      ? Number(rows[0]?.total ?? 0)\n      : await eventAttendeeCount(db, orgId, eventId);\n  return {\n    rows: rows.map((row) => ({\n      orgUserId: row.org_user_id,\n      displayName: row.display_name,\n      imageAssetId: row.image_asset_id,\n      source: row.source,\n      grantedAt: new Date(row.granted_at),\n    })),\n    total,\n    page: page.page,\n    pageSize: page.pageSize,\n  };\n}\n\nasync function eventAttendeeCount(\n  db: NodePgDatabase,\n  orgId: string,\n  eventId: string,\n): Promise<number> {\n  const result = await db.execute(sql`\n    select count(distinct ca.org_user_id) as total\n    from content_access ca\n    where ca.org_id = ${orgId} and ca.content_id = ${eventId}\n  `);\n  return Number((result.rows[0] as { total: string | number } | undefined)?.total ?? 0);\n}\n\nexport async function eventAnalyticsFigures(\n  db: NodePgDatabase,\n  orgId: string,\n  eventId: string,\n  startsAt: Date,\n): Promise<Omit<EventAnalytics, \"capacity\">> {\n  const [sources, revoked, overTime] = await Promise.all([\n    db.execute(sql`\n      with a as (${attendance(orgId, [eventId])})\n      select ${SOURCE} as source, count(*) as count from a group by 1\n    `),\n    db.execute(sql`\n      select count(*) as count from entitlements e\n      where e.org_id = ${orgId} and e.content_id = ${eventId} and e.status = 'revoked'\n    `),\n    db.execute(sql`\n      select to_char((e.granted_at at time zone 'utc')::date, 'YYYY-MM-DD') as date,\n        count(*) as count\n      from entitlements e\n      where e.org_id = ${orgId}\n        and e.content_id = ${eventId}\n        and e.status = 'active'\n        and (e.expires_at is null or e.expires_at > now())\n        and e.granted_at < ${startsAt}\n      group by 1\n      order by 1\n    `),\n  ]);\n  const bySource = { self: 0, manual: 0, automation: 0, bundle: 0 };\n  for (const row of sources.rows as { source: EventAttendeeSource; count: string | number }[]) {\n    bySource[row.source] = Number(row.count);\n  }\n  return {\n    attendees: bySource.self + bySource.manual + bySource.automation + bySource.bundle,\n    bySource,\n    revoked: Number((revoked.rows[0] as { count: string | number } | undefined)?.count ?? 0),\n    grantsOverTime: (overTime.rows as { date: string; count: string | number }[]).map((row) => ({\n      date: row.date,\n      count: Number(row.count),\n    })),\n  };\n}\n\nexport async function eventFacesFor(\n  db: NodePgDatabase,\n  orgId: string,\n  eventIds: string[],\n  limit: number,\n): Promise<Record<string, EventFaces>> {\n  const faces: Record<string, EventFaces> = Object.fromEntries(\n    eventIds.map((id) => [id, { total: 0, rows: [] }]),\n  );\n  if (eventIds.length === 0) {\n    return faces;\n  }\n  const result = await db.execute(sql`\n    with a as (${attendance(orgId, eventIds)}),\n    ranked as (\n      select a.content_id, a.org_user_id,\n        ${DISPLAY_NAME} as display_name,\n        case when up.image_asset_org_id = ${orgId} then up.image_asset_id end as image_asset_id,\n        row_number() over (\n          partition by a.content_id\n          order by coalesce(a.direct_at, a.any_at), a.org_user_id\n        ) as position,\n        count(*) over (partition by a.content_id) as total\n      from a\n      join org_users ou on ou.org_id = ${orgId} and ou.id = a.org_user_id\n      left join users u on u.id = ou.user_id\n      left join user_profiles up on up.user_id = ou.user_id\n    )\n    select content_id, org_user_id, display_name, image_asset_id, total\n    from ranked\n    where position <= ${limit}\n    order by content_id, position\n  `);\n  for (const row of result.rows as {\n    content_id: string;\n    org_user_id: string;\n    display_name: string | null;\n    image_asset_id: string | null;\n    total: string | number;\n  }[]) {\n    const entry = faces[row.content_id];\n    if (!entry) {\n      continue;\n    }\n    entry.total = Number(row.total);\n    entry.rows.push({\n      orgUserId: row.org_user_id,\n      displayName: row.display_name,\n      imageAssetId: row.image_asset_id,\n    });\n  }\n  return faces;\n}\n\nexport async function directEventGrantIds(\n  db: NodePgDatabase,\n  orgId: string,\n  orgUserId: string,\n  eventIds: string[],\n): Promise<string[]> {\n  const result = await db.execute(sql`\n    select distinct e.content_id from entitlements e\n    where e.org_id = ${orgId}\n      and e.org_user_id = ${orgUserId}\n      and ${oneOf(sql`e.content_id`, eventIds)}\n      and e.status = 'active'\n      and (e.expires_at is null or e.expires_at > now())\n  `);\n  return (result.rows as { content_id: string }[]).map((row) => row.content_id);\n}\n\nexport async function memberEventIds(\n  db: NodePgDatabase,\n  orgId: string,\n  query: MemberEventsQuery,\n  reader: EventReader,\n  now: Date,\n): Promise<Page<string>> {\n  const attends = sql`exists (\n    select 1 from content_access ca\n    where ca.org_id = ev.org_id and ca.content_id = ev.id and ca.org_user_id = ${reader.orgUserId}\n  )`;\n  const sees = reader.readAll\n    ? sql`true`\n    : sql`(\n        ${oneOf(sql`ev.id`, reader.readIds)}\n        or (ev.status = 'published' and coalesce(s.value ->> 'type', ${eventSettingsDefaults.type}) = 'public')\n        or ${attends}\n      )`;\n  const past = query.when === \"past\";\n  const where = sql`\n    ev.org_id = ${orgId}\n    and ev.status in ('published', 'canceled')\n    and ${sees}\n    and ${query.attending ? attends : sql`true`}\n    and ${past ? sql`ev.ends_at <= ${now}` : sql`ev.ends_at > ${now}`}\n  `;\n  const from = sql`\n    from events ev\n    left join settings s on s.org_id = ev.org_id and s.namespace = ${SETTINGS_NAMESPACE} and s.scope_id = ev.id\n  `;\n  const order = past ? sql`ev.starts_at desc, ev.id desc` : sql`ev.starts_at asc, ev.id asc`;\n  const [rows, totals] = await Promise.all([\n    db.execute(sql`\n      select ev.id ${from} where ${where} order by ${order}\n      limit ${query.pageSize} offset ${(query.page - 1) * query.pageSize}\n    `),\n    db.execute(sql`select count(*) as total ${from} where ${where}`),\n  ]);\n  return {\n    rows: (rows.rows as { id: string }[]).map((row) => row.id),\n    total: Number((totals.rows[0] as { total: string | number } | undefined)?.total ?? 0),\n    page: query.page,\n    pageSize: query.pageSize,\n  };\n}\n\nexport async function upcomingEventCount(db: NodePgDatabase, orgId: string): Promise<number> {\n  const result = await db.execute(sql`\n    select count(*) as total from events ev\n    where ev.org_id = ${orgId} and ev.status = 'published' and ev.ends_at > now()\n  `);\n  return Number((result.rows[0] as { total: string | number } | undefined)?.total ?? 0);\n}\n"],"mappings":"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"}

package/dist/repositories/grant-covers.d.ts

@@ -1,7 +1,7 @@
 import { entitlements } from "../schema/entitlements.js";
 import { SQL, SQLWrapper } from "drizzle-orm";
 //#region src/repositories/grant-covers.d.ts
-type GrantedContentType = "course" | "download" | "community";
+type GrantedContentType = "course" | "download" | "community" | "event";
 interface GrantColumns {
   orgId: SQLWrapper;
   contentId: SQLWrapper;
@@ -14,7 +14,8 @@ declare function grantOpens(row: GrantColumns, contentId: SQL, type: GrantedCont
 declare function activeGrantCovers(orgId: SQL, orgUserId: SQL, contentId: SQL, type: GrantedContentType): SQL;
 declare function communityPublished(orgId: SQL, communityId: SQL): SQL;
 declare function holdsCommunity(orgId: SQL, orgUserId: SQL, communityId: SQL): SQL;
-declare function communityMember(orgId: SQL, orgUserId: SQL, role: SQL, communityId: SQL): SQL;
+declare function oneOf(column: SQL, ids: readonly string[]): SQL;
+declare function communityMember(orgId: SQL, orgUserId: SQL, communityId: SQL, readerIds: readonly string[]): SQL;
 //#endregion
-export { GrantColumns, GrantedContentType, activeGrantCovers, communityMember, communityPublished, grantExpired, grantIsActive, grantOpens, grantUnexpired, holdsCommunity };
+export { GrantColumns, GrantedContentType, activeGrantCovers, communityMember, communityPublished, grantExpired, grantIsActive, grantOpens, grantUnexpired, holdsCommunity, oneOf };
 //# sourceMappingURL=grant-covers.d.ts.map

package/dist/repositories/grant-covers.js

@@ -1,6 +1,5 @@
 import { entitlements } from "../schema/entitlements.js";
 import { sql } from "drizzle-orm";
-import { STAFF_ROLES } from "@headless-lms/core/organizations";
 //#region src/repositories/grant-covers.ts
 function grantUnexpired(expiresAt = entitlements.expiresAt, at = sql`now()`) {
 	return sql`(${expiresAt} is null or ${expiresAt} > ${at})`;
@@ -46,10 +45,14 @@ function communityPublished(orgId, communityId) {
 function holdsCommunity(orgId, orgUserId, communityId) {
 	return sql`(${communityPublished(orgId, communityId)} and ${activeGrantCovers(orgId, orgUserId, communityId, "community")})`;
 }
-function communityMember(orgId, orgUserId, role, communityId) {
-	return sql`(${role} in (${sql.join(STAFF_ROLES.map((r) => sql`${r}`), sql`, `)}) or ${holdsCommunity(orgId, orgUserId, communityId)})`;
+function oneOf(column, ids) {
+	if (ids.length === 0) return sql`false`;
+	return sql`${column} in (${sql.join(ids.map((id) => sql`${id}`), sql`, `)})`;
+}
+function communityMember(orgId, orgUserId, communityId, readerIds) {
+	return sql`(${oneOf(orgUserId, readerIds)} or ${holdsCommunity(orgId, orgUserId, communityId)})`;
 }
 //#endregion
-export { activeGrantCovers, communityMember, communityPublished, grantExpired, grantIsActive, grantOpens, grantUnexpired, holdsCommunity };
+export { activeGrantCovers, communityMember, communityPublished, grantExpired, grantIsActive, grantOpens, grantUnexpired, holdsCommunity, oneOf };
 
 //# sourceMappingURL=grant-covers.js.map

package/dist/repositories/grant-covers.js.map

@@ -1 +1 @@
-{"version":3,"file":"grant-covers.js","names":[],"sources":["../../src/repositories/grant-covers.ts"],"sourcesContent":["import { sql, type SQL, type SQLWrapper } from \"drizzle-orm\";\nimport { STAFF_ROLES } from \"@headless-lms/core/organizations\";\nimport { entitlements } from \"../schema/entitlements.js\";\n\nexport type GrantedContentType = \"course\" | \"download\" | \"community\";\n\nexport interface GrantColumns {\n  orgId: SQLWrapper;\n  contentId: SQLWrapper;\n  bundleId: SQLWrapper;\n}\n\nexport function grantUnexpired(\n  expiresAt: SQLWrapper = entitlements.expiresAt,\n  at: SQL = sql`now()`,\n): SQL {\n  return sql`(${expiresAt} is null or ${expiresAt} > ${at})`;\n}\n\nexport function grantExpired(\n  expiresAt: SQLWrapper = entitlements.expiresAt,\n  at: SQL = sql`now()`,\n): SQL {\n  return sql`(${expiresAt} is not null and ${expiresAt} <= ${at})`;\n}\n\nexport function grantIsActive(row: typeof entitlements = entitlements, at?: SQL): SQL {\n  return sql`(${row.status} = 'active' and ${grantUnexpired(row.expiresAt, at)})`;\n}\n\nexport function grantOpens(row: GrantColumns, contentId: SQL, type: GrantedContentType): SQL {\n  return sql`(\n    exists (\n      select 1 from content_items ci\n      where ci.org_id = ${row.orgId} and ci.id = ${contentId} and ci.type = ${type}\n    )\n    and (\n      ${row.contentId} = ${contentId}\n      or exists (\n        select 1 from bundle_items bi\n        where bi.org_id = ${row.orgId}\n          and bi.bundle_id = ${row.bundleId}\n          and bi.content_id = ${contentId}\n      )\n    )\n  )`;\n}\n\nexport function activeGrantCovers(\n  orgId: SQL,\n  orgUserId: SQL,\n  contentId: SQL,\n  type: GrantedContentType,\n): SQL {\n  return sql`exists (\n    select 1 from content_access ca\n    join content_items ci on ci.org_id = ca.org_id and ci.id = ca.content_id and ci.type = ${type}\n    where ca.org_id = ${orgId}\n      and ca.org_user_id = ${orgUserId}\n      and ca.content_id = ${contentId}\n  )`;\n}\n\nexport function communityPublished(orgId: SQL, communityId: SQL): SQL {\n  return sql`exists (\n    select 1 from communities pc\n    where pc.org_id = ${orgId} and pc.id = ${communityId} and pc.status = 'published'\n  )`;\n}\n\nexport function holdsCommunity(orgId: SQL, orgUserId: SQL, communityId: SQL): SQL {\n  return sql`(${communityPublished(orgId, communityId)} and ${activeGrantCovers(orgId, orgUserId, communityId, \"community\")})`;\n}\n\nexport function communityMember(orgId: SQL, orgUserId: SQL, role: SQL, communityId: SQL): SQL {\n  const staff = sql.join(\n    STAFF_ROLES.map((r) => sql`${r}`),\n    sql`, `,\n  );\n  return sql`(${role} in (${staff}) or ${holdsCommunity(orgId, orgUserId, communityId)})`;\n}\n"],"mappings":";;;;AAYA,SAAgB,eACd,YAAwB,aAAa,WACrC,KAAU,GAAG,SACR;CACL,OAAO,GAAG,IAAI,UAAU,cAAc,UAAU,KAAK,GAAG;AAC1D;AAEA,SAAgB,aACd,YAAwB,aAAa,WACrC,KAAU,GAAG,SACR;CACL,OAAO,GAAG,IAAI,UAAU,mBAAmB,UAAU,MAAM,GAAG;AAChE;AAEA,SAAgB,cAAc,MAA2B,cAAc,IAAe;CACpF,OAAO,GAAG,IAAI,IAAI,OAAO,kBAAkB,eAAe,IAAI,WAAW,EAAE,EAAE;AAC/E;AAEA,SAAgB,WAAW,KAAmB,WAAgB,MAA+B;CAC3F,OAAO,GAAG;;;0BAGc,IAAI,MAAM,eAAe,UAAU,iBAAiB,KAAK;;;QAG3E,IAAI,UAAU,KAAK,UAAU;;;4BAGT,IAAI,MAAM;+BACP,IAAI,SAAS;gCACZ,UAAU;;;;AAI1C;AAEA,SAAgB,kBACd,OACA,WACA,WACA,MACK;CACL,OAAO,GAAG;;6FAEiF,KAAK;wBAC1E,MAAM;6BACD,UAAU;4BACX,UAAU;;AAEtC;AAEA,SAAgB,mBAAmB,OAAY,aAAuB;CACpE,OAAO,GAAG;;wBAEY,MAAM,eAAe,YAAY;;AAEzD;AAEA,SAAgB,eAAe,OAAY,WAAgB,aAAuB;CAChF,OAAO,GAAG,IAAI,mBAAmB,OAAO,WAAW,EAAE,OAAO,kBAAkB,OAAO,WAAW,aAAa,WAAW,EAAE;AAC5H;AAEA,SAAgB,gBAAgB,OAAY,WAAgB,MAAW,aAAuB;CAK5F,OAAO,GAAG,IAAI,KAAK,OAJL,IAAI,KAChB,YAAY,KAAK,MAAM,GAAG,GAAG,GAAG,GAChC,GAAG,IAEyB,EAAE,OAAO,eAAe,OAAO,WAAW,WAAW,EAAE;AACvF"}
+{"version":3,"file":"grant-covers.js","names":[],"sources":["../../src/repositories/grant-covers.ts"],"sourcesContent":["import { sql, type SQL, type SQLWrapper } from \"drizzle-orm\";\nimport { entitlements } from \"../schema/entitlements.js\";\n\nexport type GrantedContentType = \"course\" | \"download\" | \"community\" | \"event\";\n\nexport interface GrantColumns {\n  orgId: SQLWrapper;\n  contentId: SQLWrapper;\n  bundleId: SQLWrapper;\n}\n\nexport function grantUnexpired(\n  expiresAt: SQLWrapper = entitlements.expiresAt,\n  at: SQL = sql`now()`,\n): SQL {\n  return sql`(${expiresAt} is null or ${expiresAt} > ${at})`;\n}\n\nexport function grantExpired(\n  expiresAt: SQLWrapper = entitlements.expiresAt,\n  at: SQL = sql`now()`,\n): SQL {\n  return sql`(${expiresAt} is not null and ${expiresAt} <= ${at})`;\n}\n\nexport function grantIsActive(row: typeof entitlements = entitlements, at?: SQL): SQL {\n  return sql`(${row.status} = 'active' and ${grantUnexpired(row.expiresAt, at)})`;\n}\n\nexport function grantOpens(row: GrantColumns, contentId: SQL, type: GrantedContentType): SQL {\n  return sql`(\n    exists (\n      select 1 from content_items ci\n      where ci.org_id = ${row.orgId} and ci.id = ${contentId} and ci.type = ${type}\n    )\n    and (\n      ${row.contentId} = ${contentId}\n      or exists (\n        select 1 from bundle_items bi\n        where bi.org_id = ${row.orgId}\n          and bi.bundle_id = ${row.bundleId}\n          and bi.content_id = ${contentId}\n      )\n    )\n  )`;\n}\n\nexport function activeGrantCovers(\n  orgId: SQL,\n  orgUserId: SQL,\n  contentId: SQL,\n  type: GrantedContentType,\n): SQL {\n  return sql`exists (\n    select 1 from content_access ca\n    join content_items ci on ci.org_id = ca.org_id and ci.id = ca.content_id and ci.type = ${type}\n    where ca.org_id = ${orgId}\n      and ca.org_user_id = ${orgUserId}\n      and ca.content_id = ${contentId}\n  )`;\n}\n\nexport function communityPublished(orgId: SQL, communityId: SQL): SQL {\n  return sql`exists (\n    select 1 from communities pc\n    where pc.org_id = ${orgId} and pc.id = ${communityId} and pc.status = 'published'\n  )`;\n}\n\nexport function holdsCommunity(orgId: SQL, orgUserId: SQL, communityId: SQL): SQL {\n  return sql`(${communityPublished(orgId, communityId)} and ${activeGrantCovers(orgId, orgUserId, communityId, \"community\")})`;\n}\n\nexport function oneOf(column: SQL, ids: readonly string[]): SQL {\n  if (ids.length === 0) {\n    return sql`false`;\n  }\n  return sql`${column} in (${sql.join(\n    ids.map((id) => sql`${id}`),\n    sql`, `,\n  )})`;\n}\n\nexport function communityMember(\n  orgId: SQL,\n  orgUserId: SQL,\n  communityId: SQL,\n  readerIds: readonly string[],\n): SQL {\n  return sql`(${oneOf(orgUserId, readerIds)} or ${holdsCommunity(orgId, orgUserId, communityId)})`;\n}\n"],"mappings":";;;AAWA,SAAgB,eACd,YAAwB,aAAa,WACrC,KAAU,GAAG,SACR;CACL,OAAO,GAAG,IAAI,UAAU,cAAc,UAAU,KAAK,GAAG;AAC1D;AAEA,SAAgB,aACd,YAAwB,aAAa,WACrC,KAAU,GAAG,SACR;CACL,OAAO,GAAG,IAAI,UAAU,mBAAmB,UAAU,MAAM,GAAG;AAChE;AAEA,SAAgB,cAAc,MAA2B,cAAc,IAAe;CACpF,OAAO,GAAG,IAAI,IAAI,OAAO,kBAAkB,eAAe,IAAI,WAAW,EAAE,EAAE;AAC/E;AAEA,SAAgB,WAAW,KAAmB,WAAgB,MAA+B;CAC3F,OAAO,GAAG;;;0BAGc,IAAI,MAAM,eAAe,UAAU,iBAAiB,KAAK;;;QAG3E,IAAI,UAAU,KAAK,UAAU;;;4BAGT,IAAI,MAAM;+BACP,IAAI,SAAS;gCACZ,UAAU;;;;AAI1C;AAEA,SAAgB,kBACd,OACA,WACA,WACA,MACK;CACL,OAAO,GAAG;;6FAEiF,KAAK;wBAC1E,MAAM;6BACD,UAAU;4BACX,UAAU;;AAEtC;AAEA,SAAgB,mBAAmB,OAAY,aAAuB;CACpE,OAAO,GAAG;;wBAEY,MAAM,eAAe,YAAY;;AAEzD;AAEA,SAAgB,eAAe,OAAY,WAAgB,aAAuB;CAChF,OAAO,GAAG,IAAI,mBAAmB,OAAO,WAAW,EAAE,OAAO,kBAAkB,OAAO,WAAW,aAAa,WAAW,EAAE;AAC5H;AAEA,SAAgB,MAAM,QAAa,KAA6B;CAC9D,IAAI,IAAI,WAAW,GACjB,OAAO,GAAG;CAEZ,OAAO,GAAG,GAAG,OAAO,OAAO,IAAI,KAC7B,IAAI,KAAK,OAAO,GAAG,GAAG,IAAI,GAC1B,GAAG,IACL,EAAE;AACJ;AAEA,SAAgB,gBACd,OACA,WACA,aACA,WACK;CACL,OAAO,GAAG,IAAI,MAAM,WAAW,SAAS,EAAE,MAAM,eAAe,OAAO,WAAW,WAAW,EAAE;AAChG"}

package/dist/repositories/identity.js

@@ -1,7 +1,7 @@
 import { userProfiles, users } from "../schema/identity.js";
 import { translateDbErrors } from "./pg-errors.js";
-import { eq, sql } from "drizzle-orm";
 import { noopLogger } from "@headless-lms/core/shared/logger";
+import { eq, sql } from "drizzle-orm";
 //#region src/repositories/identity.ts
 var DrizzleIdentityRepository = class {
 	db;

package/dist/repositories/integrations.js

@@ -1,7 +1,7 @@
 import { connections } from "../schema/integrations.js";
 import { translateDbErrors } from "./pg-errors.js";
-import { and, asc, eq } from "drizzle-orm";
 import { noopLogger } from "@headless-lms/core/shared/logger";
+import { and, asc, eq } from "drizzle-orm";
 //#region src/repositories/integrations.ts
 function toConnection(row) {
 	return {

package/dist/repositories/member.d.ts

@@ -1,15 +1,23 @@
 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";
+import { MemberEventsQuery, Page } from "@headless-lms/core/types";
+import { DirectoryQuery, DirectoryRow, EventAttendeeRow, EventReader, MemberReportRepository } from "@headless-lms/core/reporting/member";
+import { EventFaces } from "@headless-lms/core/reporting/events";
 //#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>>;
+  directory(orgId: string, communityId: string, query: DirectoryQuery, readerIds: string[]): Promise<Page<DirectoryRow>>;
   people(orgId: string, orgUserIds: string[]): Promise<DirectoryRow[]>;
-  spaceMemberCounts(orgId: string, communityId: string): Promise<Record<string, number>>;
+  eventAttendees(orgId: string, eventId: string, page: {
+    page: number;
+    pageSize: number;
+  }): Promise<Page<EventAttendeeRow>>;
+  eventFaces(orgId: string, eventIds: string[], limit: number): Promise<Record<string, EventFaces>>;
+  directEventGrants(orgId: string, orgUserId: string, eventIds: string[]): Promise<string[]>;
+  events(orgId: string, query: MemberEventsQuery, reader: EventReader, now: Date): Promise<Page<string>>;
+  spaceMemberCounts(orgId: string, communityId: string, excluding: string[]): Promise<Record<string, number>>;
 }
 //#endregion
 export { DrizzleMemberRepository };

package/dist/repositories/member.js

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

package/dist/repositories/member.js.map

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

package/dist/repositories/members.d.ts

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

package/dist/repositories/members.js

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