@headless-lms/core 0.3.0 → 0.5.0

package/dist/progress/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","names":[],"sources":["../../src/progress/service.ts"],"sourcesContent":["// progress context — service implementation (inbound port).\n// The frontend only reports usage; this service makes every completion\n// decision. One report batch runs in one UoW transaction: ensure the record,\n// merge item payloads into the per-subject state map, evaluate the activity's\n// completion rule, then module/course against current published structure —\n// appending events with the writes. The container is resolved from the\n// hierarchy (activity → module → course), never supplied by the caller.\n// Percentage/resume are derived by readers, never stored here.\nimport { genId } from '../shared/id.js';\nimport { NotFoundError } from '../shared/errors.js';\nimport type { ProgressRecord } from './model.js';\nimport type {\n  ContentAccessReader,\n  ProgressRepository,\n  ProgressService,\n  ProgressUnitOfWork,\n  ProgressWriteScope,\n} from './ports.js';\nimport type { ProgressReportItem, ProgressTarget, ReportProgressInput } from './types.js';\nimport { progressEvents, type NewProgressEvent } from './events.js';\nimport type { Activity, CourseManagementService, Module } from '../content/index.js';\nimport type { JsonValue } from '../types/index.js';\nimport type { Logger } from '../shared/ports.js';\nimport { noopLogger } from '../shared/logger.js';\n\n/** Mirrors reporting/member: `settings.published === false` is the only draft signal. */\nfunction isActivityPublished(settings: unknown): boolean {\n  return (settings as { published?: boolean } | null)?.published !== false;\n}\n\n/** Fold a report batch into the record's per-subject state map. Reserved keys\n *  (`asset` = subject, `completed` = claim) are stripped; the rest is the asset\n *  type's own vocabulary, stored opaquely — latest report per subject wins. */\nfunction mergeReports(\n  position: unknown,\n  items: ProgressReportItem[],\n): { map: Record<string, JsonValue>; changed: boolean; claimed: boolean } {\n  const map = { ...((position as Record<string, JsonValue> | null) ?? {}) };\n  let changed = false;\n  let claimed = false;\n  for (const item of items) {\n    const { asset, completed, ...payload } = item;\n    if (completed === true) {\n      claimed = true;\n    }\n    if (Object.keys(payload).length > 0) {\n      map[asset ?? 'self'] = payload;\n      changed = true;\n    }\n  }\n  return { map, changed, claimed };\n}\n\n/** The completion-rule seam. Only `manual` ships: no authored rule → the\n *  learner's claim decides. Authored rules are never satisfied until their\n *  evaluators exist. Future rules evaluate against the accumulated state map. */\nfunction completionSatisfied(settings: unknown, claimed: boolean): boolean {\n  const rule = (settings as { completion?: { rule?: string } } | null)?.completion?.rule;\n  if (!rule || rule === 'manual') {\n    return claimed;\n  }\n  return false;\n}\n\nexport type ProgressServiceParams = {\n  repo: ProgressRepository;\n  content: CourseManagementService;\n  access: ContentAccessReader;\n  uow: ProgressUnitOfWork;\n  logger?: Logger;\n};\n\nexport class ProgressServiceImpl implements ProgressService {\n  private readonly repo: ProgressRepository;\n  private readonly content: CourseManagementService;\n  private readonly access: ContentAccessReader;\n  private readonly uow: ProgressUnitOfWork;\n  private readonly logger: Logger;\n\n  constructor(params: ProgressServiceParams) {\n    this.repo = params.repo;\n    this.content = params.content;\n    this.access = params.access;\n    this.uow = params.uow;\n    this.logger = params.logger ?? noopLogger;\n  }\n\n  async report(orgId: string, input: ReportProgressInput): Promise<ProgressRecord> {\n    const activity = await this.content.getActivity(orgId, input.activityId);\n    if (!activity || !isActivityPublished(activity.settings)) {\n      throw new NotFoundError('Activity', input.activityId);\n    }\n    const courseId = activity.courseId;\n    const course = await this.content.getCourse(orgId, courseId);\n    if (\n      !course ||\n      course.status !== 'published' ||\n      !(await this.access.hasAccess(orgId, input.orgUserId, courseId))\n    ) {\n      throw new NotFoundError('Activity', input.activityId);\n    }\n    const modules = await this.content.listCourseModules(orgId, courseId);\n    const courseActivities = await this.content.listCourseActivities(orgId, courseId);\n    return this.uow.run(async (scope) => {\n      // Serializes concurrent reports for this student+course (locks are tx-scoped;\n      // both racers lock in the same order, the loser waits and then sees committed state).\n      const lockIds = [\n        ...courseActivities.filter((a) => isActivityPublished(a.settings)).map((a) => a.id),\n        ...modules.map((m) => m.id),\n        courseId,\n      ];\n      await scope.progress.findByTargets(orgId, input.orgUserId, lockIds, { forUpdate: true });\n      const events: NewProgressEvent[] = [];\n      let record = await this.ensureActivityRecord(orgId, input, scope, events);\n      const state = mergeReports(record.position, input.reports);\n      if (state.changed) {\n        record = (await scope.progress.update(orgId, record.id, { position: state.map })) ?? record;\n      }\n      if (!record.completedAt && completionSatisfied(activity.settings, state.claimed)) {\n        record =\n          (await scope.progress.update(orgId, record.id, {\n            completedAt: new Date(),\n          })) ?? record;\n        events.push(progressEvents.progressCompleted.make({ orgId, data: record }));\n        await this.completeContainers(\n          orgId,\n          input,\n          courseId,\n          modules,\n          courseActivities,\n          scope,\n          events,\n        );\n        this.logger.info('progress completed', { orgId, recordId: record.id });\n      }\n      if (events.length > 0) {\n        await scope.outbox.append(events);\n      }\n      return record;\n    });\n  }\n\n  private async ensureActivityRecord(\n    orgId: string,\n    input: ReportProgressInput,\n    scope: ProgressWriteScope,\n    events: NewProgressEvent[],\n  ): Promise<ProgressRecord> {\n    const target: ProgressTarget = {\n      orgUserId: input.orgUserId,\n      targetType: 'activity',\n      targetId: input.activityId,\n    };\n    const existing = await scope.progress.findByTarget(orgId, target);\n    if (existing) {\n      return existing;\n    }\n    const now = new Date();\n    const record = await scope.progress.insert(orgId, {\n      id: genId('progress'),\n      orgId,\n      orgUserId: input.orgUserId,\n      targetType: 'activity',\n      targetId: input.activityId,\n      startedAt: now,\n      position: null,\n      completedAt: null,\n      createdAt: now,\n      updatedAt: now,\n    });\n    if (!record) {\n      // Lost a concurrent first-touch insert: the winner owns the row and emitted\n      // progress.started. Return its row without re-emitting.\n      const winner = await scope.progress.findByTarget(orgId, target);\n      if (!winner) {\n        throw new Error('progress record vanished after insert conflict');\n      }\n      return winner;\n    }\n    events.push(progressEvents.progressStarted.make({ orgId, data: record }));\n    this.logger.info('progress started', { orgId, recordId: record.id });\n    return record;\n  }\n\n  /** After an activity completes: newly-complete containers get their records\n   *  (created complete) and a progress.completed event — same transaction. */\n  private async completeContainers(\n    orgId: string,\n    input: ReportProgressInput,\n    courseId: string,\n    modules: Module[],\n    courseActivities: Activity[],\n    scope: ProgressWriteScope,\n    events: NewProgressEvent[],\n  ): Promise<void> {\n    const published = courseActivities.filter((a) => isActivityPublished(a.settings));\n    const byModule = modules.map((m) => ({\n      id: m.id,\n      activityIds: published.filter((a) => a.moduleId === m.id).map((a) => a.id),\n    }));\n    const allIds = byModule.flatMap((m) => m.activityIds);\n    const records = await scope.progress.findByTargets(orgId, input.orgUserId, allIds);\n    const done = new Set(\n      records.filter((r) => r.targetType === 'activity' && r.completedAt).map((r) => r.targetId),\n    );\n    const containing = byModule.find((m) => m.activityIds.includes(input.activityId));\n    if (containing && containing.activityIds.every((id) => done.has(id))) {\n      await this.ensureContainerComplete(orgId, input, 'module', containing.id, scope, events);\n    }\n    if (allIds.length > 0 && allIds.every((id) => done.has(id))) {\n      await this.ensureContainerComplete(orgId, input, 'course', courseId, scope, events);\n    }\n  }\n\n  private async ensureContainerComplete(\n    orgId: string,\n    input: ReportProgressInput,\n    targetType: 'module' | 'course',\n    targetId: string,\n    scope: ProgressWriteScope,\n    events: NewProgressEvent[],\n  ): Promise<void> {\n    const target: ProgressTarget = { orgUserId: input.orgUserId, targetType, targetId };\n    let existing = await scope.progress.findByTarget(orgId, target);\n    if (existing?.completedAt) {\n      return;\n    }\n    if (!existing) {\n      const now = new Date();\n      const inserted = await scope.progress.insert(orgId, {\n        id: genId('progress'),\n        orgId,\n        orgUserId: input.orgUserId,\n        targetType,\n        targetId,\n        startedAt: now,\n        position: null,\n        completedAt: now,\n        createdAt: now,\n        updatedAt: now,\n      });\n      if (inserted) {\n        events.push(progressEvents.progressCompleted.make({ orgId, data: inserted }));\n        return;\n      }\n      // Lost a concurrent insert: re-read the winner's row.\n      existing = await scope.progress.findByTarget(orgId, target);\n      if (existing?.completedAt) {\n        return;\n      }\n      if (!existing) {\n        throw new Error('progress container record vanished after insert conflict');\n      }\n    }\n    const record =\n      (await scope.progress.update(orgId, existing.id, {\n        completedAt: new Date(),\n      })) ?? existing;\n    events.push(progressEvents.progressCompleted.make({ orgId, data: record }));\n  }\n\n  get(orgId: string, target: ProgressTarget): Promise<ProgressRecord | null> {\n    return this.repo.findByTarget(orgId, target);\n  }\n\n  listByTargets(orgId: string, orgUserId: string, targetIds: string[]): Promise<ProgressRecord[]> {\n    return this.repo.findByTargets(orgId, orgUserId, targetIds);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"service.js","names":[],"sources":["../../src/progress/service.ts"],"sourcesContent":["// progress context — service implementation (inbound port).\n// The frontend only reports usage; this service makes every completion\n// decision. One report batch runs in one UoW transaction: ensure the record,\n// merge item payloads into the per-subject state map, evaluate the activity's\n// completion rule, then module/course against current published structure —\n// appending events with the writes. The container is resolved from the\n// hierarchy (activity → module → course), never supplied by the caller.\n// Percentage/resume are derived by readers, never stored here.\nimport { genId } from '../shared/id.js';\nimport { NotFoundError } from '../shared/errors.js';\nimport type { ProgressRecord } from './model.js';\nimport type {\n  ContentAccessReader,\n  CourseReader,\n  ProgressRepository,\n  ProgressService,\n  ProgressUnitOfWork,\n  ProgressWriteScope,\n  SystemActors,\n} from './ports.js';\nimport type { ProgressReportItem, ProgressTarget, ReportProgressInput } from './types.js';\nimport { progressEvents, type NewProgressEvent } from './events.js';\nimport type { Activity, Module } from '../content/index.js';\nimport type { Actor } from '../shared/actor.js';\nimport type { JsonValue } from '../types/index.js';\nimport type { Logger } from '../shared/ports.js';\nimport { noopLogger } from '../shared/logger.js';\n\n/** Mirrors reporting/member: `settings.published === false` is the only draft signal. */\nfunction isActivityPublished(settings: unknown): boolean {\n  return (settings as { published?: boolean } | null)?.published !== false;\n}\n\n/** Fold a report batch into the record's per-subject state map. Reserved keys\n *  (`asset` = subject, `completed` = claim) are stripped; the rest is the asset\n *  type's own vocabulary, stored opaquely — latest report per subject wins. */\nfunction mergeReports(\n  position: unknown,\n  items: ProgressReportItem[],\n): { map: Record<string, JsonValue>; changed: boolean; claimed: boolean } {\n  const map = { ...((position as Record<string, JsonValue> | null) ?? {}) };\n  let changed = false;\n  let claimed = false;\n  for (const item of items) {\n    const { asset, completed, ...payload } = item;\n    if (completed === true) {\n      claimed = true;\n    }\n    if (Object.keys(payload).length > 0) {\n      map[asset ?? 'self'] = payload;\n      changed = true;\n    }\n  }\n  return { map, changed, claimed };\n}\n\n/** The completion-rule seam. Only `manual` ships: no authored rule → the\n *  learner's claim decides. Authored rules are never satisfied until their\n *  evaluators exist. Future rules evaluate against the accumulated state map. */\nfunction completionSatisfied(settings: unknown, claimed: boolean): boolean {\n  const rule = (settings as { completion?: { rule?: string } } | null)?.completion?.rule;\n  if (!rule || rule === 'manual') {\n    return claimed;\n  }\n  return false;\n}\n\ntype Reporter = ReportProgressInput & { orgUserId: string };\n\nexport type ProgressServiceParams = {\n  repo: ProgressRepository;\n  content: CourseReader;\n  access: ContentAccessReader;\n  system: SystemActors;\n  uow: ProgressUnitOfWork;\n  logger?: Logger;\n};\n\nexport class ProgressServiceImpl implements ProgressService {\n  private readonly repo: ProgressRepository;\n  private readonly content: CourseReader;\n  private readonly access: ContentAccessReader;\n  private readonly system: SystemActors;\n  private readonly uow: ProgressUnitOfWork;\n  private readonly logger: Logger;\n\n  constructor(params: ProgressServiceParams) {\n    this.repo = params.repo;\n    this.content = params.content;\n    this.access = params.access;\n    this.system = params.system;\n    this.uow = params.uow;\n    this.logger = params.logger ?? noopLogger;\n  }\n\n  async report(report: ReportProgressInput, actor: Actor): Promise<ProgressRecord> {\n    const orgId = actor.orgId;\n    const input: Reporter = { ...report, orgUserId: actor.id };\n    const system = this.system.systemActor(orgId);\n    const activity = await this.content.getActivity(input.activityId, system);\n    if (!activity || !isActivityPublished(activity.settings)) {\n      throw new NotFoundError('Activity', input.activityId);\n    }\n    const courseId = activity.courseId;\n    const course = await this.content.findCourse(courseId, system);\n    const opens =\n      course !== null &&\n      (actor.permissions.has('courses:read', courseId) ||\n        (course.status === 'published' &&\n          (await this.access.hasAccess(orgId, actor.id, courseId))));\n    if (!opens) {\n      this.logger.warn('progress report refused — course not open', {\n        orgId,\n        activityId: input.activityId,\n        actorId: actor.id,\n      });\n      throw new NotFoundError('Activity', input.activityId);\n    }\n    const modules = await this.content.listCourseModules(courseId, system);\n    const courseActivities = await this.content.listCourseActivities(courseId, system);\n    return this.uow.run(async (scope) => {\n      // Serializes concurrent reports for this student+course (locks are tx-scoped;\n      // both racers lock in the same order, the loser waits and then sees committed state).\n      const lockIds = [\n        ...courseActivities.filter((a) => isActivityPublished(a.settings)).map((a) => a.id),\n        ...modules.map((m) => m.id),\n        courseId,\n      ];\n      await scope.progress.findByTargets(orgId, input.orgUserId, lockIds, { forUpdate: true });\n      const events: NewProgressEvent[] = [];\n      let record = await this.ensureActivityRecord(orgId, input, scope, events);\n      const state = mergeReports(record.position, input.reports);\n      if (state.changed) {\n        record = (await scope.progress.update(orgId, record.id, { position: state.map })) ?? record;\n      }\n      if (!record.completedAt && completionSatisfied(activity.settings, state.claimed)) {\n        record =\n          (await scope.progress.update(orgId, record.id, {\n            completedAt: new Date(),\n          })) ?? record;\n        events.push(progressEvents.progressCompleted.make({ orgId, data: record }));\n        await this.completeContainers(\n          orgId,\n          input,\n          courseId,\n          modules,\n          courseActivities,\n          scope,\n          events,\n        );\n        this.logger.info('progress completed', { orgId, recordId: record.id });\n      }\n      if (events.length > 0) {\n        await scope.outbox.append(events);\n      }\n      return record;\n    });\n  }\n\n  private async ensureActivityRecord(\n    orgId: string,\n    input: Reporter,\n    scope: ProgressWriteScope,\n    events: NewProgressEvent[],\n  ): Promise<ProgressRecord> {\n    const target: ProgressTarget = {\n      orgUserId: input.orgUserId,\n      targetType: 'activity',\n      targetId: input.activityId,\n    };\n    const existing = await scope.progress.findByTarget(orgId, target);\n    if (existing) {\n      return existing;\n    }\n    const now = new Date();\n    const record = await scope.progress.insert(orgId, {\n      id: genId('progress'),\n      orgId,\n      orgUserId: input.orgUserId,\n      targetType: 'activity',\n      targetId: input.activityId,\n      startedAt: now,\n      position: null,\n      completedAt: null,\n      createdAt: now,\n      updatedAt: now,\n    });\n    if (!record) {\n      // Lost a concurrent first-touch insert: the winner owns the row and emitted\n      // progress.started. Return its row without re-emitting.\n      const winner = await scope.progress.findByTarget(orgId, target);\n      if (!winner) {\n        throw new Error('progress record vanished after insert conflict');\n      }\n      return winner;\n    }\n    events.push(progressEvents.progressStarted.make({ orgId, data: record }));\n    this.logger.info('progress started', { orgId, recordId: record.id });\n    return record;\n  }\n\n  /** After an activity completes: newly-complete containers get their records\n   *  (created complete) and a progress.completed event — same transaction. */\n  private async completeContainers(\n    orgId: string,\n    input: Reporter,\n    courseId: string,\n    modules: Module[],\n    courseActivities: Activity[],\n    scope: ProgressWriteScope,\n    events: NewProgressEvent[],\n  ): Promise<void> {\n    const published = courseActivities.filter((a) => isActivityPublished(a.settings));\n    const byModule = modules.map((m) => ({\n      id: m.id,\n      activityIds: published.filter((a) => a.moduleId === m.id).map((a) => a.id),\n    }));\n    const allIds = byModule.flatMap((m) => m.activityIds);\n    const records = await scope.progress.findByTargets(orgId, input.orgUserId, allIds);\n    const done = new Set(\n      records.filter((r) => r.targetType === 'activity' && r.completedAt).map((r) => r.targetId),\n    );\n    const containing = byModule.find((m) => m.activityIds.includes(input.activityId));\n    if (containing && containing.activityIds.every((id) => done.has(id))) {\n      await this.ensureContainerComplete(orgId, input, 'module', containing.id, scope, events);\n    }\n    if (allIds.length > 0 && allIds.every((id) => done.has(id))) {\n      await this.ensureContainerComplete(orgId, input, 'course', courseId, scope, events);\n    }\n  }\n\n  private async ensureContainerComplete(\n    orgId: string,\n    input: Reporter,\n    targetType: 'module' | 'course',\n    targetId: string,\n    scope: ProgressWriteScope,\n    events: NewProgressEvent[],\n  ): Promise<void> {\n    const target: ProgressTarget = { orgUserId: input.orgUserId, targetType, targetId };\n    let existing = await scope.progress.findByTarget(orgId, target);\n    if (existing?.completedAt) {\n      return;\n    }\n    if (!existing) {\n      const now = new Date();\n      const inserted = await scope.progress.insert(orgId, {\n        id: genId('progress'),\n        orgId,\n        orgUserId: input.orgUserId,\n        targetType,\n        targetId,\n        startedAt: now,\n        position: null,\n        completedAt: now,\n        createdAt: now,\n        updatedAt: now,\n      });\n      if (inserted) {\n        events.push(progressEvents.progressCompleted.make({ orgId, data: inserted }));\n        return;\n      }\n      // Lost a concurrent insert: re-read the winner's row.\n      existing = await scope.progress.findByTarget(orgId, target);\n      if (existing?.completedAt) {\n        return;\n      }\n      if (!existing) {\n        throw new Error('progress container record vanished after insert conflict');\n      }\n    }\n    const record =\n      (await scope.progress.update(orgId, existing.id, {\n        completedAt: new Date(),\n      })) ?? existing;\n    events.push(progressEvents.progressCompleted.make({ orgId, data: record }));\n  }\n\n  get(orgId: string, target: ProgressTarget): Promise<ProgressRecord | null> {\n    return this.repo.findByTarget(orgId, target);\n  }\n\n  listByTargets(orgId: string, orgUserId: string, targetIds: string[]): Promise<ProgressRecord[]> {\n    return this.repo.findByTargets(orgId, orgUserId, targetIds);\n  }\n}\n"],"mappings":"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"}

package/dist/reporting/admin/index.d.ts

@@ -1,4 +1,6 @@
-import { CommunityAnalytics, CommunityMember, CommunityMembersQuery, CourseActivityEngagement, CourseAnalytics, CourseEnrollmentPoint, EnrollmentPoint, OverviewStats, Page, Student, StudentAnalytics, StudentCourseProgress, StudentsQuery } from "./model.js";
-import { AdminReportRepository, AdminReportService } from "./ports.js";
-import { AdminReportServiceImpl } from "./service.js";
-export { type AdminReportRepository, type AdminReportService, AdminReportServiceImpl, type CommunityAnalytics, type CommunityMember, type CommunityMembersQuery, type CourseActivityEngagement, type CourseAnalytics, type CourseEnrollmentPoint, type EnrollmentPoint, type OverviewStats, type Page, type Student, type StudentAnalytics, type StudentCourseProgress, type StudentsQuery };
+import { EventAnalytics, EventAttendee } from "../../types/schemas/content.js";
+import { EventAttendeeRow } from "../events/index.js";
+import { CommunityAnalytics, CommunityMember, CommunityMembersQuery, CourseActivityEngagement, CourseAnalytics, CourseEnrollmentPoint, CourseLearner, CourseLearnersQuery, EnrollmentPoint, LearnerGrantStatus, OverviewStats, Page, Student, StudentAnalytics, StudentCourseProgress, StudentItem, StudentRow, StudentsQuery } from "./model.js";
+import { AdminReportRepository, AdminReportService, PermissionsReader, SpaceOpenersReader } from "./ports.js";
+import { AdminReportServiceImpl, AdminReportServiceParams } from "./service.js";
+export { type AdminReportRepository, type AdminReportService, AdminReportServiceImpl, type AdminReportServiceParams, type CommunityAnalytics, type CommunityMember, type CommunityMembersQuery, type CourseActivityEngagement, type CourseAnalytics, type CourseEnrollmentPoint, type CourseLearner, type CourseLearnersQuery, type EnrollmentPoint, type EventAnalytics, type EventAttendee, type EventAttendeeRow, type LearnerGrantStatus, type OverviewStats, type Page, type PermissionsReader, type SpaceOpenersReader, type Student, type StudentAnalytics, type StudentCourseProgress, type StudentItem, type StudentRow, type StudentsQuery };

package/dist/reporting/admin/model.d.ts

@@ -1,5 +1,9 @@
-import { OrgUserProfile, OrgUserStatus, Role } from "../../types/schemas/organizations.js";
+import { ContentType, EventAnalytics, EventAttendee } from "../../types/schemas/content.js";
+import { OrgUserProfile, OrgUserStatus } from "../../types/schemas/organizations.js";
 import "../../types/index.js";
+import { ItemRole } from "../../organizations/members.js";
+import "../../organizations/index.js";
+import { EventAttendeeRow } from "../events/index.js";
 //#region src/reporting/admin/model.d.ts
 interface SpacePostCount {
   spaceId: string;
@@ -25,6 +29,7 @@ interface OverviewStats {
   draftCourses: number;
   activeStudents: number;
   expiringSoon: number;
+  upcomingEvents: number;
 }
 interface EnrollmentPoint {
   date: string;
@@ -62,6 +67,15 @@ interface Student extends OrgUserProfile {
   status: OrgUserStatus;
   joinedAt: string;
   lastActiveAt: string | null;
+  /** The roles they hold on content items. */
+  items: ItemRole[];
+}
+interface StudentItem {
+  contentId: string;
+  contentType: ContentType;
+}
+interface StudentRow extends Omit<Student, 'items'> {
+  items: StudentItem[];
 }
 interface StudentCourseProgress {
   courseId: string;
@@ -84,7 +98,26 @@ interface StudentAnalytics {
   courses: StudentCourseProgress[];
 }
 interface CommunityMember extends OrgUserProfile {
-  role: Role;
+  team: boolean;
+  roleName: string | null;
+  opensEverySpace: boolean;
+}
+type LearnerGrantStatus = 'active' | 'expired' | 'revoked';
+interface CourseLearner extends OrgUserProfile {
+  status: LearnerGrantStatus;
+  source: string;
+  grantedAt: string;
+  expiresAt: string | null;
+  totalActivities: number;
+  completedActivities: number;
+  progress: number;
+  lastActivityAt: string | null;
+  completedAt: string | null;
+}
+interface CourseLearnersQuery {
+  page: number;
+  pageSize: number;
+  search?: string | undefined;
 }
 interface CommunityMembersQuery {
   page: number;
@@ -104,5 +137,5 @@ interface Page<T> {
   pageSize: number;
 }
 //#endregion
-export { CommunityAnalytics, CommunityMember, CommunityMembersQuery, CourseActivityEngagement, CourseAnalytics, CourseEnrollmentPoint, EnrollmentPoint, OverviewStats, Page, PostCommentCount, SpacePostCount, Student, StudentAnalytics, StudentCourseProgress, StudentsQuery };
+export { CommunityAnalytics, CommunityMember, CommunityMembersQuery, CourseActivityEngagement, CourseAnalytics, CourseEnrollmentPoint, CourseLearner, CourseLearnersQuery, EnrollmentPoint, type EventAnalytics, type EventAttendee, type EventAttendeeRow, LearnerGrantStatus, OverviewStats, Page, PostCommentCount, SpacePostCount, Student, StudentAnalytics, StudentCourseProgress, StudentItem, StudentRow, StudentsQuery };
 //# sourceMappingURL=model.d.ts.map

package/dist/reporting/admin/ports.d.ts

@@ -1,27 +1,52 @@
-import { CommunityAnalytics, CommunityMember, CommunityMembersQuery, CourseAnalytics, CourseEnrollmentPoint, EnrollmentPoint, OverviewStats, Page, Student, StudentAnalytics, StudentsQuery } from "./model.js";
+import { EventAnalytics, EventAttendee } from "../../types/schemas/content.js";
+import { OrgUserProfile } from "../../types/schemas/organizations.js";
+import "../../types/index.js";
+import { Actor, EffectivePermissions } from "../../shared/actor.js";
+import { EventAttendeeRow } from "../events/index.js";
+import { CommunityAnalytics, CommunityMember, CommunityMembersQuery, CourseAnalytics, CourseEnrollmentPoint, CourseLearner, CourseLearnersQuery, EnrollmentPoint, OverviewStats, Page, Student, StudentAnalytics, StudentRow, StudentsQuery } from "./model.js";
 //#region src/reporting/admin/ports.d.ts
 interface AdminReportService {
-  overview(orgId: string): Promise<OverviewStats>;
-  enrollments(orgId: string, days: number): Promise<EnrollmentPoint[]>;
-  courseAnalytics(orgId: string, courseId: string): Promise<CourseAnalytics | null>;
-  courseEnrollments(orgId: string, courseId: string, days: number): Promise<CourseEnrollmentPoint[] | null>;
-  listStudents(orgId: string, query: StudentsQuery): Promise<Page<Student>>;
-  getStudent(orgId: string, id: string): Promise<Student | null>;
-  studentAnalytics(orgId: string, id: string): Promise<StudentAnalytics | null>;
-  communityAnalytics(orgId: string, communityId: string): Promise<CommunityAnalytics | null>;
-  communityMembers(orgId: string, communityId: string, query: CommunityMembersQuery): Promise<Page<CommunityMember> | null>;
+  overview(actor: Actor): Promise<OverviewStats>;
+  enrollments(days: number, actor: Actor): Promise<EnrollmentPoint[]>;
+  courseAnalytics(courseId: string, actor: Actor): Promise<CourseAnalytics>;
+  courseEnrollments(courseId: string, days: number, actor: Actor): Promise<CourseEnrollmentPoint[]>;
+  courseLearners(courseId: string, query: CourseLearnersQuery, actor: Actor): Promise<Page<CourseLearner>>;
+  listStudents(query: StudentsQuery, actor: Actor): Promise<Page<Student>>;
+  getStudent(id: string, actor: Actor): Promise<Student>;
+  studentAnalytics(id: string, actor: Actor): Promise<StudentAnalytics>;
+  communityAnalytics(communityId: string, actor: Actor): Promise<CommunityAnalytics>;
+  communityMembers(communityId: string, query: CommunityMembersQuery, actor: Actor): Promise<Page<CommunityMember>>;
+  eventAttendees(eventId: string, query: {
+    page: number;
+    pageSize: number;
+  }, actor: Actor): Promise<Page<EventAttendee>>;
+  eventAnalytics(eventId: string, actor: Actor): Promise<EventAnalytics>;
+}
+interface PermissionsReader {
+  permissionsOfMany(orgId: string, orgUserIds: string[]): Promise<Map<string, EffectivePermissions>>;
+}
+interface SpaceOpenersReader {
+  everySpaceOpeners(orgId: string, communityId: string): Promise<string[]>;
 }
 interface AdminReportRepository {
   overview(orgId: string): Promise<OverviewStats>;
   enrollments(orgId: string, days: number): Promise<EnrollmentPoint[]>;
   courseAnalytics(orgId: string, courseId: string): Promise<CourseAnalytics | null>;
   courseEnrollments(orgId: string, courseId: string, days: number): Promise<CourseEnrollmentPoint[] | null>;
-  listStudents(orgId: string, query: StudentsQuery): Promise<Page<Student>>;
-  getStudent(orgId: string, id: string): Promise<Student | null>;
+  courseLearners(orgId: string, courseId: string, query: CourseLearnersQuery): Promise<Page<CourseLearner> | null>;
+  /** Active and invited org users whose org role is `memberRoleKey`: no org assignment,
+   *  and for an invited one, a pending invite carrying that key. */
+  listStudents(orgId: string, query: StudentsQuery, memberRoleKey: string): Promise<Page<StudentRow>>;
+  getStudent(orgId: string, id: string): Promise<StudentRow | null>;
   studentAnalytics(orgId: string, id: string): Promise<StudentAnalytics | null>;
   communityAnalytics(orgId: string, communityId: string): Promise<CommunityAnalytics | null>;
-  communityMembers(orgId: string, communityId: string, query: CommunityMembersQuery): Promise<Page<CommunityMember> | null>;
+  communityMembers(orgId: string, communityId: string, query: CommunityMembersQuery): Promise<Page<OrgUserProfile> | null>;
+  eventAttendees(orgId: string, eventId: string, page: {
+    page: number;
+    pageSize: number;
+  }): Promise<Page<EventAttendeeRow>>;
+  eventAnalytics(orgId: string, eventId: string, startsAt: Date): Promise<Omit<EventAnalytics, 'capacity'>>;
 }
 //#endregion
-export { AdminReportRepository, AdminReportService };
+export { AdminReportRepository, AdminReportService, PermissionsReader, SpaceOpenersReader };
 //# sourceMappingURL=ports.d.ts.map

package/dist/reporting/admin/service.d.ts

@@ -1,21 +1,42 @@
-import { CommunityAnalytics, CommunityMember, CommunityMembersQuery, CourseAnalytics, CourseEnrollmentPoint, EnrollmentPoint, OverviewStats, Page, Student, StudentAnalytics, StudentsQuery } from "./model.js";
-import { AdminReportRepository, AdminReportService } from "./ports.js";
+import { EventAnalytics, EventAttendee } from "../../types/schemas/content.js";
+import { Actor } from "../../shared/actor.js";
+import { FileUrls } from "../../assets/file-urls.js";
+import "../../assets/index.js";
+import { EventsService } from "../../content/ports.js";
+import "../../content/index.js";
+import { CommunityAnalytics, CommunityMember, CommunityMembersQuery, CourseAnalytics, CourseEnrollmentPoint, CourseLearner, CourseLearnersQuery, EnrollmentPoint, OverviewStats, Page, Student, StudentAnalytics, StudentsQuery } from "./model.js";
+import { AdminReportRepository, AdminReportService, PermissionsReader, SpaceOpenersReader } from "./ports.js";
 //#region src/reporting/admin/service.d.ts
 type AdminReportServiceParams = {
   repo: AdminReportRepository;
+  permissions: PermissionsReader;
+  spaces: SpaceOpenersReader;
+  events: Pick<EventsService, 'findEvent'>;
+  fileUrls: Pick<FileUrls, 'publicImage'>;
 };
 declare class AdminReportServiceImpl implements AdminReportService {
   private readonly repo;
+  private readonly permissions;
+  private readonly spaces;
+  private readonly events;
+  private readonly fileUrls;
   constructor(params: AdminReportServiceParams);
-  overview(orgId: string): Promise<OverviewStats>;
-  enrollments(orgId: string, days: number): Promise<EnrollmentPoint[]>;
-  courseAnalytics(orgId: string, courseId: string): Promise<CourseAnalytics | null>;
-  courseEnrollments(orgId: string, courseId: string, days: number): Promise<CourseEnrollmentPoint[] | null>;
-  listStudents(orgId: string, query: StudentsQuery): Promise<Page<Student>>;
-  getStudent(orgId: string, id: string): Promise<Student | null>;
-  studentAnalytics(orgId: string, id: string): Promise<StudentAnalytics | null>;
-  communityAnalytics(orgId: string, communityId: string): Promise<CommunityAnalytics | null>;
-  communityMembers(orgId: string, communityId: string, query: CommunityMembersQuery): Promise<Page<CommunityMember> | null>;
+  overview(actor: Actor): Promise<OverviewStats>;
+  enrollments(days: number, actor: Actor): Promise<EnrollmentPoint[]>;
+  courseAnalytics(courseId: string, actor: Actor): Promise<CourseAnalytics>;
+  courseEnrollments(courseId: string, days: number, actor: Actor): Promise<CourseEnrollmentPoint[]>;
+  courseLearners(courseId: string, query: CourseLearnersQuery, actor: Actor): Promise<Page<CourseLearner>>;
+  listStudents(query: StudentsQuery, actor: Actor): Promise<Page<Student>>;
+  getStudent(id: string, actor: Actor): Promise<Student>;
+  studentAnalytics(id: string, actor: Actor): Promise<StudentAnalytics>;
+  communityAnalytics(communityId: string, actor: Actor): Promise<CommunityAnalytics>;
+  communityMembers(communityId: string, query: CommunityMembersQuery, actor: Actor): Promise<Page<CommunityMember>>;
+  eventAttendees(eventId: string, query: {
+    page: number;
+    pageSize: number;
+  }, actor: Actor): Promise<Page<EventAttendee>>;
+  eventAnalytics(eventId: string, actor: Actor): Promise<EventAnalytics>;
+  private withItemRoles;
 }
 //#endregion
 export { AdminReportServiceImpl, AdminReportServiceParams };

package/dist/reporting/admin/service.js

@@ -1,37 +1,121 @@
+import { NotFoundError } from "../../shared/errors.js";
+import { MEMBER_ROLE_KEY } from "../../organizations/default-roles.js";
+import { attendeeView } from "../events/index.js";
 //#region src/reporting/admin/service.ts
 var AdminReportServiceImpl = class {
 	repo;
+	permissions;
+	spaces;
+	events;
+	fileUrls;
 	constructor(params) {
 		this.repo = params.repo;
+		this.permissions = params.permissions;
+		this.spaces = params.spaces;
+		this.events = params.events;
+		this.fileUrls = params.fileUrls;
 	}
-	overview(orgId) {
-		return this.repo.overview(orgId);
+	async overview(actor) {
+		actor.permissions.require("analytics:read");
+		return this.repo.overview(actor.orgId);
 	}
-	enrollments(orgId, days) {
-		return this.repo.enrollments(orgId, days);
+	async enrollments(days, actor) {
+		actor.permissions.require("analytics:read");
+		return this.repo.enrollments(actor.orgId, days);
 	}
-	courseAnalytics(orgId, courseId) {
-		return this.repo.courseAnalytics(orgId, courseId);
+	async courseAnalytics(courseId, actor) {
+		actor.permissions.require("progress:read", courseId);
+		return found(await this.repo.courseAnalytics(actor.orgId, courseId), "Course", courseId);
 	}
-	courseEnrollments(orgId, courseId, days) {
-		return this.repo.courseEnrollments(orgId, courseId, days);
+	async courseEnrollments(courseId, days, actor) {
+		actor.permissions.require("progress:read", courseId);
+		return found(await this.repo.courseEnrollments(actor.orgId, courseId, days), "Course", courseId);
 	}
-	listStudents(orgId, query) {
-		return this.repo.listStudents(orgId, query);
+	async courseLearners(courseId, query, actor) {
+		actor.permissions.require("progress:read", courseId);
+		return found(await this.repo.courseLearners(actor.orgId, courseId, query), "Course", courseId);
 	}
-	getStudent(orgId, id) {
-		return this.repo.getStudent(orgId, id);
+	async listStudents(query, actor) {
+		actor.permissions.require("people:read");
+		const page = await this.repo.listStudents(actor.orgId, query, MEMBER_ROLE_KEY);
+		return {
+			...page,
+			rows: await this.withItemRoles(actor.orgId, page.rows)
+		};
 	}
-	studentAnalytics(orgId, id) {
-		return this.repo.studentAnalytics(orgId, id);
+	async getStudent(id, actor) {
+		actor.permissions.require("people:read");
+		const row = found(await this.repo.getStudent(actor.orgId, id), "Student", id);
+		const [student] = await this.withItemRoles(actor.orgId, [row]);
+		return found(student, "Student", id);
 	}
-	communityAnalytics(orgId, communityId) {
-		return this.repo.communityAnalytics(orgId, communityId);
+	async studentAnalytics(id, actor) {
+		actor.permissions.require("people:read");
+		return found(await this.repo.studentAnalytics(actor.orgId, id), "Student", id);
 	}
-	communityMembers(orgId, communityId, query) {
-		return this.repo.communityMembers(orgId, communityId, query);
+	async communityAnalytics(communityId, actor) {
+		actor.permissions.require("communities:read", communityId);
+		return found(await this.repo.communityAnalytics(actor.orgId, communityId), "Community", communityId);
+	}
+	async communityMembers(communityId, query, actor) {
+		actor.permissions.require("access:read");
+		const page = found(await this.repo.communityMembers(actor.orgId, communityId, query), "Community", communityId);
+		const [held, openers] = await Promise.all([this.permissions.permissionsOfMany(actor.orgId, page.rows.map((row) => row.id)), this.spaces.everySpaceOpeners(actor.orgId, communityId)]);
+		const opensEverySpace = new Set(openers);
+		return {
+			...page,
+			rows: page.rows.map((row) => {
+				const permissions = held.get(row.id);
+				const item = permissions?.roleOn(communityId);
+				const org = permissions?.roleOn();
+				const team = (item?.team ?? false) || (org?.team ?? false);
+				const roleName = item?.team ? item.name : org?.team ? org.name : null;
+				return {
+					...row,
+					team,
+					roleName,
+					opensEverySpace: opensEverySpace.has(row.id)
+				};
+			})
+		};
+	}
+	async eventAttendees(eventId, query, actor) {
+		actor.permissions.require("events:read", eventId);
+		found(await this.events.findEvent(eventId, actor), "Event", eventId);
+		const page = await this.repo.eventAttendees(actor.orgId, eventId, query);
+		return {
+			...page,
+			rows: page.rows.map((row) => attendeeView(actor.orgId, row, this.fileUrls))
+		};
+	}
+	async eventAnalytics(eventId, actor) {
+		actor.permissions.require("events:read", eventId);
+		const event = found(await this.events.findEvent(eventId, actor), "Event", eventId);
+		return {
+			...await this.repo.eventAnalytics(actor.orgId, eventId, event.startsAt),
+			capacity: event.settings.capacity
+		};
+	}
+	async withItemRoles(orgId, rows) {
+		const ids = rows.filter((row) => row.items.length > 0).map((row) => row.id);
+		const held = ids.length > 0 ? await this.permissions.permissionsOfMany(orgId, ids) : /* @__PURE__ */ new Map();
+		return rows.map((row) => ({
+			...row,
+			items: row.items.flatMap((item) => {
+				const role = held.get(row.id)?.roleOn(item.contentId);
+				return role ? [{
+					...item,
+					roleKey: role.key,
+					roleName: role.name
+				}] : [];
+			})
+		}));
 	}
 };
+function found(value, what, id) {
+	if (value === null || value === void 0) throw new NotFoundError(what, id);
+	return value;
+}
 //#endregion
 export { AdminReportServiceImpl };
 

package/dist/reporting/admin/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","names":[],"sources":["../../../src/reporting/admin/service.ts"],"sourcesContent":["import type {\n  CommunityAnalytics,\n  CommunityMember,\n  CommunityMembersQuery,\n  CourseAnalytics,\n  CourseEnrollmentPoint,\n  EnrollmentPoint,\n  OverviewStats,\n  Page,\n  Student,\n  StudentAnalytics,\n  StudentsQuery,\n} from './model.js';\nimport type { AdminReportRepository, AdminReportService } from './ports.js';\n\nexport type AdminReportServiceParams = {\n  repo: AdminReportRepository;\n};\n\nexport class AdminReportServiceImpl implements AdminReportService {\n  private readonly repo: AdminReportRepository;\n\n  constructor(params: AdminReportServiceParams) {\n    this.repo = params.repo;\n  }\n\n  overview(orgId: string): Promise<OverviewStats> {\n    return this.repo.overview(orgId);\n  }\n\n  enrollments(orgId: string, days: number): Promise<EnrollmentPoint[]> {\n    return this.repo.enrollments(orgId, days);\n  }\n\n  courseAnalytics(orgId: string, courseId: string): Promise<CourseAnalytics | null> {\n    return this.repo.courseAnalytics(orgId, courseId);\n  }\n\n  courseEnrollments(\n    orgId: string,\n    courseId: string,\n    days: number,\n  ): Promise<CourseEnrollmentPoint[] | null> {\n    return this.repo.courseEnrollments(orgId, courseId, days);\n  }\n\n  listStudents(orgId: string, query: StudentsQuery): Promise<Page<Student>> {\n    return this.repo.listStudents(orgId, query);\n  }\n\n  getStudent(orgId: string, id: string): Promise<Student | null> {\n    return this.repo.getStudent(orgId, id);\n  }\n\n  studentAnalytics(orgId: string, id: string): Promise<StudentAnalytics | null> {\n    return this.repo.studentAnalytics(orgId, id);\n  }\n\n  communityAnalytics(orgId: string, communityId: string): Promise<CommunityAnalytics | null> {\n    return this.repo.communityAnalytics(orgId, communityId);\n  }\n\n  communityMembers(\n    orgId: string,\n    communityId: string,\n    query: CommunityMembersQuery,\n  ): Promise<Page<CommunityMember> | null> {\n    return this.repo.communityMembers(orgId, communityId, query);\n  }\n}\n"],"mappings":";AAmBA,IAAa,yBAAb,MAAkE;CAChE;CAEA,YAAY,QAAkC;EAC5C,KAAK,OAAO,OAAO;CACrB;CAEA,SAAS,OAAuC;EAC9C,OAAO,KAAK,KAAK,SAAS,KAAK;CACjC;CAEA,YAAY,OAAe,MAA0C;EACnE,OAAO,KAAK,KAAK,YAAY,OAAO,IAAI;CAC1C;CAEA,gBAAgB,OAAe,UAAmD;EAChF,OAAO,KAAK,KAAK,gBAAgB,OAAO,QAAQ;CAClD;CAEA,kBACE,OACA,UACA,MACyC;EACzC,OAAO,KAAK,KAAK,kBAAkB,OAAO,UAAU,IAAI;CAC1D;CAEA,aAAa,OAAe,OAA8C;EACxE,OAAO,KAAK,KAAK,aAAa,OAAO,KAAK;CAC5C;CAEA,WAAW,OAAe,IAAqC;EAC7D,OAAO,KAAK,KAAK,WAAW,OAAO,EAAE;CACvC;CAEA,iBAAiB,OAAe,IAA8C;EAC5E,OAAO,KAAK,KAAK,iBAAiB,OAAO,EAAE;CAC7C;CAEA,mBAAmB,OAAe,aAAyD;EACzF,OAAO,KAAK,KAAK,mBAAmB,OAAO,WAAW;CACxD;CAEA,iBACE,OACA,aACA,OACuC;EACvC,OAAO,KAAK,KAAK,iBAAiB,OAAO,aAAa,KAAK;CAC7D;AACF"}
+{"version":3,"file":"service.js","names":[],"sources":["../../../src/reporting/admin/service.ts"],"sourcesContent":["import type { Actor } from '../../shared/actor.js';\nimport { NotFoundError } from '../../shared/errors.js';\nimport { MEMBER_ROLE_KEY } from '../../organizations/index.js';\nimport type { EventsService } from '../../content/index.js';\nimport type { FileUrls } from '../../assets/index.js';\nimport type {\n  CommunityAnalytics,\n  CommunityMember,\n  CommunityMembersQuery,\n  CourseAnalytics,\n  CourseEnrollmentPoint,\n  CourseLearner,\n  CourseLearnersQuery,\n  EnrollmentPoint,\n  EventAnalytics,\n  EventAttendee,\n  OverviewStats,\n  Page,\n  Student,\n  StudentAnalytics,\n  StudentRow,\n  StudentsQuery,\n} from './model.js';\nimport type {\n  AdminReportRepository,\n  AdminReportService,\n  PermissionsReader,\n  SpaceOpenersReader,\n} from './ports.js';\nimport { attendeeView } from '../events/index.js';\n\nexport type AdminReportServiceParams = {\n  repo: AdminReportRepository;\n  permissions: PermissionsReader;\n  spaces: SpaceOpenersReader;\n  events: Pick<EventsService, 'findEvent'>;\n  fileUrls: Pick<FileUrls, 'publicImage'>;\n};\n\nexport class AdminReportServiceImpl implements AdminReportService {\n  private readonly repo: AdminReportRepository;\n  private readonly permissions: PermissionsReader;\n  private readonly spaces: SpaceOpenersReader;\n  private readonly events: Pick<EventsService, 'findEvent'>;\n  private readonly fileUrls: Pick<FileUrls, 'publicImage'>;\n\n  constructor(params: AdminReportServiceParams) {\n    this.repo = params.repo;\n    this.permissions = params.permissions;\n    this.spaces = params.spaces;\n    this.events = params.events;\n    this.fileUrls = params.fileUrls;\n  }\n\n  async overview(actor: Actor): Promise<OverviewStats> {\n    actor.permissions.require('analytics:read');\n    return this.repo.overview(actor.orgId);\n  }\n\n  async enrollments(days: number, actor: Actor): Promise<EnrollmentPoint[]> {\n    actor.permissions.require('analytics:read');\n    return this.repo.enrollments(actor.orgId, days);\n  }\n\n  async courseAnalytics(courseId: string, actor: Actor): Promise<CourseAnalytics> {\n    actor.permissions.require('progress:read', courseId);\n    return found(await this.repo.courseAnalytics(actor.orgId, courseId), 'Course', courseId);\n  }\n\n  async courseEnrollments(\n    courseId: string,\n    days: number,\n    actor: Actor,\n  ): Promise<CourseEnrollmentPoint[]> {\n    actor.permissions.require('progress:read', courseId);\n    return found(\n      await this.repo.courseEnrollments(actor.orgId, courseId, days),\n      'Course',\n      courseId,\n    );\n  }\n\n  async courseLearners(\n    courseId: string,\n    query: CourseLearnersQuery,\n    actor: Actor,\n  ): Promise<Page<CourseLearner>> {\n    actor.permissions.require('progress:read', courseId);\n    return found(await this.repo.courseLearners(actor.orgId, courseId, query), 'Course', courseId);\n  }\n\n  async listStudents(query: StudentsQuery, actor: Actor): Promise<Page<Student>> {\n    actor.permissions.require('people:read');\n    const page = await this.repo.listStudents(actor.orgId, query, MEMBER_ROLE_KEY);\n    return { ...page, rows: await this.withItemRoles(actor.orgId, page.rows) };\n  }\n\n  async getStudent(id: string, actor: Actor): Promise<Student> {\n    actor.permissions.require('people:read');\n    const row = found(await this.repo.getStudent(actor.orgId, id), 'Student', id);\n    const [student] = await this.withItemRoles(actor.orgId, [row]);\n    return found(student, 'Student', id);\n  }\n\n  async studentAnalytics(id: string, actor: Actor): Promise<StudentAnalytics> {\n    actor.permissions.require('people:read');\n    return found(await this.repo.studentAnalytics(actor.orgId, id), 'Student', id);\n  }\n\n  async communityAnalytics(communityId: string, actor: Actor): Promise<CommunityAnalytics> {\n    actor.permissions.require('communities:read', communityId);\n    return found(\n      await this.repo.communityAnalytics(actor.orgId, communityId),\n      'Community',\n      communityId,\n    );\n  }\n\n  async communityMembers(\n    communityId: string,\n    query: CommunityMembersQuery,\n    actor: Actor,\n  ): Promise<Page<CommunityMember>> {\n    actor.permissions.require('access:read');\n    const page = found(\n      await this.repo.communityMembers(actor.orgId, communityId, query),\n      'Community',\n      communityId,\n    );\n    const [held, openers] = await Promise.all([\n      this.permissions.permissionsOfMany(\n        actor.orgId,\n        page.rows.map((row) => row.id),\n      ),\n      this.spaces.everySpaceOpeners(actor.orgId, communityId),\n    ]);\n    const opensEverySpace = new Set(openers);\n    return {\n      ...page,\n      rows: page.rows.map((row) => {\n        const permissions = held.get(row.id);\n        const item = permissions?.roleOn(communityId);\n        const org = permissions?.roleOn();\n        const team = (item?.team ?? false) || (org?.team ?? false);\n        const roleName = item?.team ? item.name : org?.team ? org.name : null;\n        return { ...row, team, roleName, opensEverySpace: opensEverySpace.has(row.id) };\n      }),\n    };\n  }\n\n  async eventAttendees(\n    eventId: string,\n    query: { page: number; pageSize: number },\n    actor: Actor,\n  ): Promise<Page<EventAttendee>> {\n    actor.permissions.require('events:read', eventId);\n    found(await this.events.findEvent(eventId, actor), 'Event', eventId);\n    const page = await this.repo.eventAttendees(actor.orgId, eventId, query);\n    return {\n      ...page,\n      rows: page.rows.map((row) => attendeeView(actor.orgId, row, this.fileUrls)),\n    };\n  }\n\n  async eventAnalytics(eventId: string, actor: Actor): Promise<EventAnalytics> {\n    actor.permissions.require('events:read', eventId);\n    const event = found(await this.events.findEvent(eventId, actor), 'Event', eventId);\n    const figures = await this.repo.eventAnalytics(actor.orgId, eventId, event.startsAt);\n    return { ...figures, capacity: event.settings.capacity };\n  }\n\n  private async withItemRoles(orgId: string, rows: StudentRow[]): Promise<Student[]> {\n    const ids = rows.filter((row) => row.items.length > 0).map((row) => row.id);\n    const held = ids.length > 0 ? await this.permissions.permissionsOfMany(orgId, ids) : new Map();\n    return rows.map((row) => ({\n      ...row,\n      items: row.items.flatMap((item) => {\n        const role = held.get(row.id)?.roleOn(item.contentId);\n        return role ? [{ ...item, roleKey: role.key, roleName: role.name }] : [];\n      }),\n    }));\n  }\n}\n\nfunction found<T>(value: T | null | undefined, what: string, id: string): T {\n  if (value === null || value === undefined) {\n    throw new NotFoundError(what, id);\n  }\n  return value;\n}\n"],"mappings":"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"}

package/dist/reporting/events/index.d.ts

@@ -0,0 +1,27 @@
+import { EventAttendee, EventAttendeeFace, EventAttendeeSource } from "../../types/schemas/content.js";
+import "../../types/index.js";
+import { FileUrls } from "../../assets/file-urls.js";
+import "../../assets/index.js";
+//#region src/reporting/events/index.d.ts
+interface EventAttendeeRow {
+  orgUserId: string;
+  displayName: string | null;
+  imageAssetId: string | null;
+  source: EventAttendeeSource;
+  grantedAt: Date;
+}
+type EventFaceRow = Pick<EventAttendeeRow, 'orgUserId' | 'displayName' | 'imageAssetId'>;
+interface EventFaces {
+  total: number;
+  rows: EventFaceRow[];
+}
+interface EventReader {
+  orgUserId: string;
+  readAll: boolean;
+  readIds: string[];
+}
+declare function attendeeFace(orgId: string, row: EventFaceRow, fileUrls: Pick<FileUrls, 'publicImage'>): EventAttendeeFace;
+declare function attendeeView(orgId: string, row: EventAttendeeRow, fileUrls: Pick<FileUrls, 'publicImage'>): EventAttendee;
+//#endregion
+export { EventAttendeeRow, EventFaceRow, EventFaces, EventReader, attendeeFace, attendeeView };
+//# sourceMappingURL=index.d.ts.map

package/dist/reporting/events/index.js

@@ -0,0 +1,20 @@
+import "../../identity/service.js";
+//#region src/reporting/events/index.ts
+function attendeeFace(orgId, row, fileUrls) {
+	return {
+		orgUserId: row.orgUserId,
+		name: row.displayName ?? "A member",
+		avatarUrl: row.imageAssetId ? fileUrls.publicImage(orgId, row.orgUserId, row.imageAssetId) : null
+	};
+}
+function attendeeView(orgId, row, fileUrls) {
+	return {
+		...attendeeFace(orgId, row, fileUrls),
+		source: row.source,
+		grantedAt: row.grantedAt
+	};
+}
+//#endregion
+export { attendeeFace, attendeeView };
+
+//# sourceMappingURL=index.js.map

package/dist/reporting/events/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","names":[],"sources":["../../../src/reporting/events/index.ts"],"sourcesContent":["import type { FileUrls } from '../../assets/index.js';\nimport { UNNAMED_MEMBER } from '../../identity/index.js';\nimport type { EventAttendee, EventAttendeeFace, EventAttendeeSource } from '../../types/index.js';\n\nexport interface EventAttendeeRow {\n  orgUserId: string;\n  displayName: string | null;\n  imageAssetId: string | null;\n  source: EventAttendeeSource;\n  grantedAt: Date;\n}\n\nexport type EventFaceRow = Pick<EventAttendeeRow, 'orgUserId' | 'displayName' | 'imageAssetId'>;\n\nexport interface EventFaces {\n  total: number;\n  rows: EventFaceRow[];\n}\n\nexport interface EventReader {\n  orgUserId: string;\n  readAll: boolean;\n  readIds: string[];\n}\n\nexport function attendeeFace(\n  orgId: string,\n  row: EventFaceRow,\n  fileUrls: Pick<FileUrls, 'publicImage'>,\n): EventAttendeeFace {\n  return {\n    orgUserId: row.orgUserId,\n    name: row.displayName ?? UNNAMED_MEMBER,\n    avatarUrl: row.imageAssetId\n      ? fileUrls.publicImage(orgId, row.orgUserId, row.imageAssetId)\n      : null,\n  };\n}\n\nexport function attendeeView(\n  orgId: string,\n  row: EventAttendeeRow,\n  fileUrls: Pick<FileUrls, 'publicImage'>,\n): EventAttendee {\n  return { ...attendeeFace(orgId, row, fileUrls), source: row.source, grantedAt: row.grantedAt };\n}\n"],"mappings":";;AAyBA,SAAgB,aACd,OACA,KACA,UACmB;CACnB,OAAO;EACL,WAAW,IAAI;EACf,MAAM,IAAI,eAAA;EACV,WAAW,IAAI,eACX,SAAS,YAAY,OAAO,IAAI,WAAW,IAAI,YAAY,IAC3D;CACN;AACF;AAEA,SAAgB,aACd,OACA,KACA,UACe;CACf,OAAO;EAAE,GAAG,aAAa,OAAO,KAAK,QAAQ;EAAG,QAAQ,IAAI;EAAQ,WAAW,IAAI;CAAU;AAC/F"}

package/dist/reporting/member/calendar.d.ts

@@ -0,0 +1,11 @@
+import { Event } from "../../types/schemas/content.js";
+import "../../content/index.js";
+//#region src/reporting/member/calendar.d.ts
+declare function eventCalendar(event: Event, options: {
+  pageUrl: string;
+  withLocation: boolean;
+  now: Date;
+}): string;
+//#endregion
+export { eventCalendar };
+//# sourceMappingURL=calendar.d.ts.map

package/dist/reporting/member/calendar.js

@@ -0,0 +1,75 @@
+//#region src/reporting/member/calendar.ts
+function stamp(date) {
+	return date.toISOString().replace(/[-:]/g, "").replace(/\.\d{3}/, "");
+}
+function text(value) {
+	return value.replace(/\\/g, "\\\\").replace(/;/g, "\\;").replace(/,/g, "\\,").replace(/\r?\n/g, "\\n");
+}
+const encoder = new TextEncoder();
+function octets(value) {
+	return encoder.encode(value).length;
+}
+function fold(line) {
+	const parts = [];
+	let part = "";
+	let size = 0;
+	let width = 75;
+	for (const char of line) {
+		const length = octets(char);
+		if (size + length > width) {
+			parts.push(part);
+			part = "";
+			size = 0;
+			width = 74;
+		}
+		part += char;
+		size += length;
+	}
+	parts.push(part);
+	return parts.join("\r\n ");
+}
+function where(event) {
+	const venue = event.location.venue;
+	if (venue) {
+		const address = venue.address;
+		const lines = address ? [
+			address.line1,
+			address.line2,
+			address.city,
+			address.region,
+			address.postalCode,
+			address.country
+		] : [];
+		return [venue.name, ...lines].filter((part) => Boolean(part)).join(", ");
+	}
+	return event.location.online?.url ?? null;
+}
+function eventCalendar(event, options) {
+	const lines = [
+		"BEGIN:VCALENDAR",
+		"VERSION:2.0",
+		"PRODID:-//Headless LMS//Events//EN",
+		"CALSCALE:GREGORIAN",
+		"METHOD:PUBLISH",
+		"BEGIN:VEVENT",
+		`UID:${event.id}`,
+		`DTSTAMP:${stamp(options.now)}`,
+		`DTSTART:${stamp(event.startsAt)}`,
+		`DTEND:${stamp(event.endsAt)}`,
+		`SUMMARY:${text(event.title)}`,
+		`DESCRIPTION:${text(options.pageUrl)}`,
+		`URL:${options.pageUrl}`
+	];
+	if (event.status === "canceled") lines.push("STATUS:CANCELLED");
+	if (options.withLocation) {
+		const location = where(event);
+		if (location) lines.push(`LOCATION:${text(location)}`);
+		if (event.location.online) lines.push(`CONFERENCE;VALUE=URI:${event.location.online.url}`);
+	}
+	lines.push("END:VEVENT", "END:VCALENDAR");
+	return `${lines.map(fold).join("\r\n")}\r\n`;
+}
+//#endregion
+export { eventCalendar };
+
+//# sourceMappingURL=calendar.js.map

package/dist/reporting/member/calendar.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"calendar.js","names":[],"sources":["../../../src/reporting/member/calendar.ts"],"sourcesContent":["import type { Event } from '../../content/index.js';\n\nfunction stamp(date: Date): string {\n  return date\n    .toISOString()\n    .replace(/[-:]/g, '')\n    .replace(/\\.\\d{3}/, '');\n}\n\nfunction text(value: string): string {\n  return value\n    .replace(/\\\\/g, '\\\\\\\\')\n    .replace(/;/g, '\\\\;')\n    .replace(/,/g, '\\\\,')\n    .replace(/\\r?\\n/g, '\\\\n');\n}\n\nconst encoder = new TextEncoder();\n\nfunction octets(value: string): number {\n  return encoder.encode(value).length;\n}\n\nfunction fold(line: string): string {\n  const parts: string[] = [];\n  let part = '';\n  let size = 0;\n  let width = 75;\n  for (const char of line) {\n    const length = octets(char);\n    if (size + length > width) {\n      parts.push(part);\n      part = '';\n      size = 0;\n      width = 74;\n    }\n    part += char;\n    size += length;\n  }\n  parts.push(part);\n  return parts.join('\\r\\n ');\n}\n\nfunction where(event: Event): string | null {\n  const venue = event.location.venue;\n  if (venue) {\n    const address = venue.address;\n    const lines = address\n      ? [\n          address.line1,\n          address.line2,\n          address.city,\n          address.region,\n          address.postalCode,\n          address.country,\n        ]\n      : [];\n    return [venue.name, ...lines].filter((part): part is string => Boolean(part)).join(', ');\n  }\n  return event.location.online?.url ?? null;\n}\n\nexport function eventCalendar(\n  event: Event,\n  options: { pageUrl: string; withLocation: boolean; now: Date },\n): string {\n  const lines = [\n    'BEGIN:VCALENDAR',\n    'VERSION:2.0',\n    'PRODID:-//Headless LMS//Events//EN',\n    'CALSCALE:GREGORIAN',\n    'METHOD:PUBLISH',\n    'BEGIN:VEVENT',\n    `UID:${event.id}`,\n    `DTSTAMP:${stamp(options.now)}`,\n    `DTSTART:${stamp(event.startsAt)}`,\n    `DTEND:${stamp(event.endsAt)}`,\n    `SUMMARY:${text(event.title)}`,\n    `DESCRIPTION:${text(options.pageUrl)}`,\n    `URL:${options.pageUrl}`,\n  ];\n  if (event.status === 'canceled') {\n    lines.push('STATUS:CANCELLED');\n  }\n  if (options.withLocation) {\n    const location = where(event);\n    if (location) {\n      lines.push(`LOCATION:${text(location)}`);\n    }\n    if (event.location.online) {\n      lines.push(`CONFERENCE;VALUE=URI:${event.location.online.url}`);\n    }\n  }\n  lines.push('END:VEVENT', 'END:VCALENDAR');\n  return `${lines.map(fold).join('\\r\\n')}\\r\\n`;\n}\n"],"mappings":";AAEA,SAAS,MAAM,MAAoB;CACjC,OAAO,KACJ,YAAY,CAAC,CACb,QAAQ,SAAS,EAAE,CAAC,CACpB,QAAQ,WAAW,EAAE;AAC1B;AAEA,SAAS,KAAK,OAAuB;CACnC,OAAO,MACJ,QAAQ,OAAO,MAAM,CAAC,CACtB,QAAQ,MAAM,KAAK,CAAC,CACpB,QAAQ,MAAM,KAAK,CAAC,CACpB,QAAQ,UAAU,KAAK;AAC5B;AAEA,MAAM,UAAU,IAAI,YAAY;AAEhC,SAAS,OAAO,OAAuB;CACrC,OAAO,QAAQ,OAAO,KAAK,CAAC,CAAC;AAC/B;AAEA,SAAS,KAAK,MAAsB;CAClC,MAAM,QAAkB,CAAC;CACzB,IAAI,OAAO;CACX,IAAI,OAAO;CACX,IAAI,QAAQ;CACZ,KAAK,MAAM,QAAQ,MAAM;EACvB,MAAM,SAAS,OAAO,IAAI;EAC1B,IAAI,OAAO,SAAS,OAAO;GACzB,MAAM,KAAK,IAAI;GACf,OAAO;GACP,OAAO;GACP,QAAQ;EACV;EACA,QAAQ;EACR,QAAQ;CACV;CACA,MAAM,KAAK,IAAI;CACf,OAAO,MAAM,KAAK,OAAO;AAC3B;AAEA,SAAS,MAAM,OAA6B;CAC1C,MAAM,QAAQ,MAAM,SAAS;CAC7B,IAAI,OAAO;EACT,MAAM,UAAU,MAAM;EACtB,MAAM,QAAQ,UACV;GACE,QAAQ;GACR,QAAQ;GACR,QAAQ;GACR,QAAQ;GACR,QAAQ;GACR,QAAQ;EACV,IACA,CAAC;EACL,OAAO,CAAC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,QAAQ,SAAyB,QAAQ,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI;CACzF;CACA,OAAO,MAAM,SAAS,QAAQ,OAAO;AACvC;AAEA,SAAgB,cACd,OACA,SACQ;CACR,MAAM,QAAQ;EACZ;EACA;EACA;EACA;EACA;EACA;EACA,OAAO,MAAM;EACb,WAAW,MAAM,QAAQ,GAAG;EAC5B,WAAW,MAAM,MAAM,QAAQ;EAC/B,SAAS,MAAM,MAAM,MAAM;EAC3B,WAAW,KAAK,MAAM,KAAK;EAC3B,eAAe,KAAK,QAAQ,OAAO;EACnC,OAAO,QAAQ;CACjB;CACA,IAAI,MAAM,WAAW,YACnB,MAAM,KAAK,kBAAkB;CAE/B,IAAI,QAAQ,cAAc;EACxB,MAAM,WAAW,MAAM,KAAK;EAC5B,IAAI,UACF,MAAM,KAAK,YAAY,KAAK,QAAQ,GAAG;EAEzC,IAAI,MAAM,SAAS,QACjB,MAAM,KAAK,wBAAwB,MAAM,SAAS,OAAO,KAAK;CAElE;CACA,MAAM,KAAK,cAAc,eAAe;CACxC,OAAO,GAAG,MAAM,IAAI,IAAI,CAAC,CAAC,KAAK,MAAM,EAAE;AACzC"}

package/dist/reporting/member/index.d.ts

@@ -1,5 +1,6 @@
 import { CourseView, Module } from "../../types/schemas/content.js";
-import { CommunityHome, CommunityHomeSpace, CourseProgressView, DirectoryEntry, DirectoryQuery, DirectoryRow, LockedCommunitySpace, NotificationView, NotificationsView, OpenCommunitySpace } from "./model.js";
+import { EventAttendeeRow, EventReader } from "../events/index.js";
+import { CommunityHome, CommunityHomeSpace, CommunityNotificationSettingsView, CommunityViewer, CourseProgressView, DirectoryEntry, DirectoryQuery, DirectoryRow, LockedCommunitySpace, MemberViewer, NotificationItemView, NotificationSettingsCategoryView, NotificationUnreadCounts, NotificationView, NotificationsView, OpenCommunitySpace, OrgNotificationSettingsView, SettingsChannelView } from "./model.js";
 import { MemberReportRepository, MemberReportService } from "./ports.js";
 import { MemberReportServiceImpl } from "./service.js";
-export { type CommunityHome, type CommunityHomeSpace, type CourseProgressView, type CourseView, type DirectoryEntry, type DirectoryQuery, type DirectoryRow, type LockedCommunitySpace, type MemberReportRepository, type MemberReportService, MemberReportServiceImpl, type Module, type NotificationView, type NotificationsView, type OpenCommunitySpace };
+export { type CommunityHome, type CommunityHomeSpace, type CommunityNotificationSettingsView, type CommunityViewer, type CourseProgressView, type CourseView, type DirectoryEntry, type DirectoryQuery, type DirectoryRow, type EventAttendeeRow, type EventReader, type LockedCommunitySpace, type MemberReportRepository, type MemberReportService, MemberReportServiceImpl, type MemberViewer, type Module, type NotificationItemView, type NotificationSettingsCategoryView, type NotificationUnreadCounts, type NotificationView, type NotificationsView, type OpenCommunitySpace, type OrgNotificationSettingsView, type SettingsChannelView };