@playcademy/sandbox 0.3.17-beta.23 → 0.3.17-beta.25

package/dist/cli.js

@@ -1330,7 +1330,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@playcademy/sandbox",
-    version: "0.3.17-beta.23",
+    version: "0.3.17-beta.25",
     description: "Local development server for Playcademy game development",
     type: "module",
     exports: {
@@ -30893,13 +30893,54 @@ class TimebackAdminService {
     const remediationItems = events.map((event) => mapCaliperEventToRemediationActivity(event, relevantCourseIds)).filter((item) => Boolean(item));
     return [...groupedGameplayItems, ...remediationItems].toSorted((a, b) => b.occurredAt.localeCompare(a.occurredAt));
   }
-  async getStudentEnrollmentsByCourseId(client, studentId, courseIds) {
-    const relevantCourseIds = new Set(courseIds);
-    const enrollments = await client.edubridge.enrollments.listByUser(studentId);
-    return new Map(enrollments.filter((enrollment) => relevantCourseIds.has(enrollment.course.id)).map((enrollment) => [enrollment.course.id, enrollment]));
+  async getStudentEnrollmentsByCourseId(client, studentId, courseIds, options) {
+    const enrollments = new Map;
+    const entries = await Promise.all(courseIds.map(async (courseId) => {
+      const roster = await client.oneroster.enrollments.listByCourse(courseId, {
+        includeInactive: options?.includeInactive,
+        includeUsers: false
+      });
+      const matches = roster.filter((entry) => entry.enrollment.user.sourcedId === studentId).toSorted((a, b) => {
+        const aActive = a.enrollment.status === "active";
+        const bActive = b.enrollment.status === "active";
+        if (aActive !== bActive) {
+          return aActive ? -1 : 1;
+        }
+        return (b.enrollment.dateLastModified ?? "").localeCompare(a.enrollment.dateLastModified ?? "");
+      });
+      return { courseId, match: matches[0] ?? null };
+    }));
+    for (const { courseId, match } of entries) {
+      if (match) {
+        enrollments.set(courseId, {
+          id: match.enrollment.sourcedId,
+          status: match.enrollment.status ?? "active",
+          role: match.enrollment.role ?? "student",
+          beginDate: match.enrollment.beginDate ?? null,
+          endDate: match.enrollment.endDate ?? null,
+          course: {
+            id: courseId,
+            title: match.class?.title ?? "",
+            subjects: null,
+            grades: null
+          }
+        });
+      }
+    }
+    return { enrollments };
   }
   async assertStudentEnrolledInCourse(client, studentId, courseId) {
-    const enrollmentsByCourseId = await this.getStudentEnrollmentsByCourseId(client, studentId, [courseId]);
+    const enrollments = await client.edubridge.enrollments.listByUser(studentId);
+    const match = enrollments.find((e) => e.course.id === courseId);
+    if (!match) {
+      throw new NotFoundError("Student enrollment", `${studentId}:${courseId}`);
+    }
+    return match;
+  }
+  async assertStudentHasEnrollmentInCourse(client, studentId, courseId) {
+    const { enrollments: enrollmentsByCourseId } = await this.getStudentEnrollmentsByCourseId(client, studentId, [courseId], {
+      includeInactive: true
+    });
     if (!enrollmentsByCourseId.has(courseId)) {
       throw new NotFoundError("Student enrollment", `${studentId}:${courseId}`);
     }
@@ -30952,7 +30993,7 @@ class TimebackAdminService {
       return [];
     }
   }
-  async listStudentsForCourse(gameId, courseId, user) {
+  async listStudentsForCourse(gameId, courseId, user, options) {
     const client = this.requireClient();
     await this.deps.validateGameManagementAccess(user, gameId);
     const integration = await this.deps.db.query.gameTimebackIntegrations.findFirst({
@@ -30962,7 +31003,8 @@ class TimebackAdminService {
       throw new NotFoundError("Timeback integration", `${gameId}:${courseId}`);
     }
     const roster = await client.oneroster.enrollments.listByCourse(courseId, {
-      role: "student"
+      role: "student",
+      includeInactive: options?.includeInactive
     });
     const analyticsByEnrollmentId = await this.loadEnrollmentAnalyticsSummaries(roster.map((rosterEntry) => rosterEntry.enrollment.sourcedId).filter((enrollmentId) => Boolean(enrollmentId)));
     const masterableUnits = await this.getMasterableUnits(courseId);
@@ -30971,6 +31013,7 @@ class TimebackAdminService {
       const summary = enrollmentId ? analyticsByEnrollmentId.get(enrollmentId) : undefined;
       const analyticsUnavailable = Boolean(enrollmentId) && summary?.analyticsAvailable !== true;
       const name3 = rosterEntry.user ? `${rosterEntry.user.givenName} ${rosterEntry.user.familyName}`.trim() : rosterEntry.enrollment.user.sourcedId;
+      const inactive = rosterEntry.enrollment.status === "tobedeleted";
       return {
         studentId: rosterEntry.enrollment.user.sourcedId,
         enrollmentId,
@@ -30984,11 +31027,25 @@ class TimebackAdminService {
         activeTimeSeconds: summary?.activeTimeSeconds ?? 0,
         masteredUnits: summary?.masteredUnits ?? 0,
         masterableUnits,
-        pctCompleteApp: TimebackAdminService.computeCompletionPct(summary?.masteredUnits ?? 0, masterableUnits)
+        pctCompleteApp: TimebackAdminService.computeCompletionPct(summary?.masteredUnits ?? 0, masterableUnits),
+        ...inactive ? { inactive } : {}
       };
     });
-    students.sort((a, b) => a.name.localeCompare(b.name));
-    return { gameId, courseId, students };
+    const studentMap = new Map;
+    for (const student of students) {
+      const existing = studentMap.get(student.studentId);
+      if (!existing || existing.inactive && !student.inactive) {
+        studentMap.set(student.studentId, student);
+      }
+    }
+    const deduped = [...studentMap.values()];
+    deduped.sort((a, b) => {
+      if (a.inactive !== b.inactive) {
+        return a.inactive ? 1 : -1;
+      }
+      return a.name.localeCompare(b.name);
+    });
+    return { gameId, courseId, students: deduped };
   }
   async getStudentOverview(gameId, studentId, user, courseId) {
     const client = this.requireClient();
@@ -31000,7 +31057,9 @@ class TimebackAdminService {
       throw new NotFoundError("Timeback integration", gameId);
     }
     const courseIds = new Set(integrations.map((integration) => integration.courseId));
-    const enrollmentsByCourseId = await this.getStudentEnrollmentsByCourseId(client, studentId, [...courseIds]);
+    const { enrollments: enrollmentsByCourseId } = await this.getStudentEnrollmentsByCourseId(client, studentId, [...courseIds], {
+      includeInactive: true
+    });
     if (enrollmentsByCourseId.size === 0) {
       throw new NotFoundError("Student enrollment", courseId ? `${studentId}:${courseId}` : `${studentId}:${gameId}`);
     }
@@ -31015,6 +31074,7 @@ class TimebackAdminService {
       const summary = enrollment ? analyticsByEnrollmentId.get(enrollment.id) : undefined;
       const masterableUnits = masterableUnitsByCourse.get(integration.courseId);
       const analyticsUnavailable = Boolean(enrollment?.id) && summary?.analyticsAvailable !== true;
+      const inactive = enrollment?.status === "tobedeleted";
       return {
         courseId: integration.courseId,
         title: enrollment?.course.title || `${integration.subject} Grade ${integration.grade}`,
@@ -31029,7 +31089,8 @@ class TimebackAdminService {
         masterableUnits,
         pctCompleteApp: TimebackAdminService.computeCompletionPct(summary?.masteredUnits ?? 0, masterableUnits),
         completionStatus: completionStatusByCourse.get(integration.courseId) ?? "none",
-        history: summary?.history ?? []
+        history: summary?.history ?? [],
+        ...inactive ? { inactive } : {}
       };
     });
     return {
@@ -31056,7 +31117,7 @@ class TimebackAdminService {
     if (!integration) {
       throw new NotFoundError("Timeback integration", `${gameId}:${courseId}`);
     }
-    await this.assertStudentEnrolledInCourse(client, studentId, courseId);
+    await this.assertStudentHasEnrollmentInCourse(client, studentId, courseId);
     const relevantCourseIds = new Set([courseId]);
     const fetchLimit = Math.min(safeOffset + safeLimit + 1, TimebackAdminService.MAX_STUDENT_ACTIVITY_OFFSET + TimebackAdminService.MAX_STUDENT_ACTIVITY_LIMIT + 1);
     const allActivities = await this.listRecentActivityForStudent(client, studentId, gameSource, relevantCourseIds, fetchLimit);
@@ -31077,7 +31138,7 @@ class TimebackAdminService {
     if (!integration) {
       throw new NotFoundError("Timeback integration", `${gameId}:${courseId}`);
     }
-    await this.assertStudentEnrolledInCourse(client, studentId, courseId);
+    await this.assertStudentHasEnrollmentInCourse(client, studentId, courseId);
     const events = await this.fetchCaliperEventsForStudent(client, studentId, gameSource, TimebackAdminService.MAX_RECENT_ACTIVITY_EVENT_FETCH);
     const relevantCourseIds = new Set([courseId]);
     let matchedEvents;
@@ -35684,7 +35745,7 @@ function createOneRosterNamespace(client) {
       listByClass: async (classSourcedId, options) => {
         const queryParams = new URLSearchParams;
         const filters = [`class.sourcedId='${escapeFilterValue2(classSourcedId)}'`];
-        if (options?.onlyActive ?? true) {
+        if (!options?.includeInactive) {
           filters.push(`status='active'`);
         }
         queryParams.set("filter", filters.join(" AND "));
@@ -35719,7 +35780,7 @@ function createOneRosterNamespace(client) {
             const queryParams = new URLSearchParams;
             const classFilter = batch.map((classId) => `class.sourcedId='${escapeFilterValue2(classId)}'`).join(" OR ");
             const filters = [batch.length > 1 ? `(${classFilter})` : classFilter];
-            if (options?.onlyActive ?? true) {
+            if (!options?.includeInactive) {
               filters.push(`status='active'`);
             }
             if (options?.role) {
@@ -96846,15 +96907,19 @@ var init_timeback_controller = __esm(() => {
   getRoster = requireGameManagementAccess(async (ctx) => {
     const gameId = ctx.params.gameId;
     const courseId = ctx.params.courseId;
+    const includeInactive = ctx.url.searchParams.get("includeInactive") === "true";
     if (!gameId || !courseId) {
       throw ApiError.badRequest("Missing gameId or courseId parameter");
     }
     logger64.debug("Getting course roster", {
       requesterId: ctx.user.id,
       gameId,
-      courseId
+      courseId,
+      includeInactive
+    });
+    return ctx.services.timebackAdmin.listStudentsForCourse(gameId, courseId, ctx.user, {
+      includeInactive
     });
-    return ctx.services.timebackAdmin.listStudentsForCourse(gameId, courseId, ctx.user);
   });
   getStudentOverview = requireGameManagementAccess(async (ctx) => {
     const timebackId = ctx.params.timebackId;

package/dist/server.js

@@ -1329,7 +1329,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@playcademy/sandbox",
-    version: "0.3.17-beta.23",
+    version: "0.3.17-beta.25",
     description: "Local development server for Playcademy game development",
     type: "module",
     exports: {
@@ -30892,13 +30892,54 @@ class TimebackAdminService {
     const remediationItems = events.map((event) => mapCaliperEventToRemediationActivity(event, relevantCourseIds)).filter((item) => Boolean(item));
     return [...groupedGameplayItems, ...remediationItems].toSorted((a, b) => b.occurredAt.localeCompare(a.occurredAt));
   }
-  async getStudentEnrollmentsByCourseId(client, studentId, courseIds) {
-    const relevantCourseIds = new Set(courseIds);
-    const enrollments = await client.edubridge.enrollments.listByUser(studentId);
-    return new Map(enrollments.filter((enrollment) => relevantCourseIds.has(enrollment.course.id)).map((enrollment) => [enrollment.course.id, enrollment]));
+  async getStudentEnrollmentsByCourseId(client, studentId, courseIds, options) {
+    const enrollments = new Map;
+    const entries = await Promise.all(courseIds.map(async (courseId) => {
+      const roster = await client.oneroster.enrollments.listByCourse(courseId, {
+        includeInactive: options?.includeInactive,
+        includeUsers: false
+      });
+      const matches = roster.filter((entry) => entry.enrollment.user.sourcedId === studentId).toSorted((a, b) => {
+        const aActive = a.enrollment.status === "active";
+        const bActive = b.enrollment.status === "active";
+        if (aActive !== bActive) {
+          return aActive ? -1 : 1;
+        }
+        return (b.enrollment.dateLastModified ?? "").localeCompare(a.enrollment.dateLastModified ?? "");
+      });
+      return { courseId, match: matches[0] ?? null };
+    }));
+    for (const { courseId, match } of entries) {
+      if (match) {
+        enrollments.set(courseId, {
+          id: match.enrollment.sourcedId,
+          status: match.enrollment.status ?? "active",
+          role: match.enrollment.role ?? "student",
+          beginDate: match.enrollment.beginDate ?? null,
+          endDate: match.enrollment.endDate ?? null,
+          course: {
+            id: courseId,
+            title: match.class?.title ?? "",
+            subjects: null,
+            grades: null
+          }
+        });
+      }
+    }
+    return { enrollments };
   }
   async assertStudentEnrolledInCourse(client, studentId, courseId) {
-    const enrollmentsByCourseId = await this.getStudentEnrollmentsByCourseId(client, studentId, [courseId]);
+    const enrollments = await client.edubridge.enrollments.listByUser(studentId);
+    const match = enrollments.find((e) => e.course.id === courseId);
+    if (!match) {
+      throw new NotFoundError("Student enrollment", `${studentId}:${courseId}`);
+    }
+    return match;
+  }
+  async assertStudentHasEnrollmentInCourse(client, studentId, courseId) {
+    const { enrollments: enrollmentsByCourseId } = await this.getStudentEnrollmentsByCourseId(client, studentId, [courseId], {
+      includeInactive: true
+    });
     if (!enrollmentsByCourseId.has(courseId)) {
       throw new NotFoundError("Student enrollment", `${studentId}:${courseId}`);
     }
@@ -30951,7 +30992,7 @@ class TimebackAdminService {
       return [];
     }
   }
-  async listStudentsForCourse(gameId, courseId, user) {
+  async listStudentsForCourse(gameId, courseId, user, options) {
     const client = this.requireClient();
     await this.deps.validateGameManagementAccess(user, gameId);
     const integration = await this.deps.db.query.gameTimebackIntegrations.findFirst({
@@ -30961,7 +31002,8 @@ class TimebackAdminService {
       throw new NotFoundError("Timeback integration", `${gameId}:${courseId}`);
     }
     const roster = await client.oneroster.enrollments.listByCourse(courseId, {
-      role: "student"
+      role: "student",
+      includeInactive: options?.includeInactive
     });
     const analyticsByEnrollmentId = await this.loadEnrollmentAnalyticsSummaries(roster.map((rosterEntry) => rosterEntry.enrollment.sourcedId).filter((enrollmentId) => Boolean(enrollmentId)));
     const masterableUnits = await this.getMasterableUnits(courseId);
@@ -30970,6 +31012,7 @@ class TimebackAdminService {
       const summary = enrollmentId ? analyticsByEnrollmentId.get(enrollmentId) : undefined;
       const analyticsUnavailable = Boolean(enrollmentId) && summary?.analyticsAvailable !== true;
       const name3 = rosterEntry.user ? `${rosterEntry.user.givenName} ${rosterEntry.user.familyName}`.trim() : rosterEntry.enrollment.user.sourcedId;
+      const inactive = rosterEntry.enrollment.status === "tobedeleted";
       return {
         studentId: rosterEntry.enrollment.user.sourcedId,
         enrollmentId,
@@ -30983,11 +31026,25 @@ class TimebackAdminService {
         activeTimeSeconds: summary?.activeTimeSeconds ?? 0,
         masteredUnits: summary?.masteredUnits ?? 0,
         masterableUnits,
-        pctCompleteApp: TimebackAdminService.computeCompletionPct(summary?.masteredUnits ?? 0, masterableUnits)
+        pctCompleteApp: TimebackAdminService.computeCompletionPct(summary?.masteredUnits ?? 0, masterableUnits),
+        ...inactive ? { inactive } : {}
       };
     });
-    students.sort((a, b) => a.name.localeCompare(b.name));
-    return { gameId, courseId, students };
+    const studentMap = new Map;
+    for (const student of students) {
+      const existing = studentMap.get(student.studentId);
+      if (!existing || existing.inactive && !student.inactive) {
+        studentMap.set(student.studentId, student);
+      }
+    }
+    const deduped = [...studentMap.values()];
+    deduped.sort((a, b) => {
+      if (a.inactive !== b.inactive) {
+        return a.inactive ? 1 : -1;
+      }
+      return a.name.localeCompare(b.name);
+    });
+    return { gameId, courseId, students: deduped };
   }
   async getStudentOverview(gameId, studentId, user, courseId) {
     const client = this.requireClient();
@@ -30999,7 +31056,9 @@ class TimebackAdminService {
       throw new NotFoundError("Timeback integration", gameId);
     }
     const courseIds = new Set(integrations.map((integration) => integration.courseId));
-    const enrollmentsByCourseId = await this.getStudentEnrollmentsByCourseId(client, studentId, [...courseIds]);
+    const { enrollments: enrollmentsByCourseId } = await this.getStudentEnrollmentsByCourseId(client, studentId, [...courseIds], {
+      includeInactive: true
+    });
     if (enrollmentsByCourseId.size === 0) {
       throw new NotFoundError("Student enrollment", courseId ? `${studentId}:${courseId}` : `${studentId}:${gameId}`);
     }
@@ -31014,6 +31073,7 @@ class TimebackAdminService {
       const summary = enrollment ? analyticsByEnrollmentId.get(enrollment.id) : undefined;
       const masterableUnits = masterableUnitsByCourse.get(integration.courseId);
       const analyticsUnavailable = Boolean(enrollment?.id) && summary?.analyticsAvailable !== true;
+      const inactive = enrollment?.status === "tobedeleted";
       return {
         courseId: integration.courseId,
         title: enrollment?.course.title || `${integration.subject} Grade ${integration.grade}`,
@@ -31028,7 +31088,8 @@ class TimebackAdminService {
         masterableUnits,
         pctCompleteApp: TimebackAdminService.computeCompletionPct(summary?.masteredUnits ?? 0, masterableUnits),
         completionStatus: completionStatusByCourse.get(integration.courseId) ?? "none",
-        history: summary?.history ?? []
+        history: summary?.history ?? [],
+        ...inactive ? { inactive } : {}
       };
     });
     return {
@@ -31055,7 +31116,7 @@ class TimebackAdminService {
     if (!integration) {
       throw new NotFoundError("Timeback integration", `${gameId}:${courseId}`);
     }
-    await this.assertStudentEnrolledInCourse(client, studentId, courseId);
+    await this.assertStudentHasEnrollmentInCourse(client, studentId, courseId);
     const relevantCourseIds = new Set([courseId]);
     const fetchLimit = Math.min(safeOffset + safeLimit + 1, TimebackAdminService.MAX_STUDENT_ACTIVITY_OFFSET + TimebackAdminService.MAX_STUDENT_ACTIVITY_LIMIT + 1);
     const allActivities = await this.listRecentActivityForStudent(client, studentId, gameSource, relevantCourseIds, fetchLimit);
@@ -31076,7 +31137,7 @@ class TimebackAdminService {
     if (!integration) {
       throw new NotFoundError("Timeback integration", `${gameId}:${courseId}`);
     }
-    await this.assertStudentEnrolledInCourse(client, studentId, courseId);
+    await this.assertStudentHasEnrollmentInCourse(client, studentId, courseId);
     const events = await this.fetchCaliperEventsForStudent(client, studentId, gameSource, TimebackAdminService.MAX_RECENT_ACTIVITY_EVENT_FETCH);
     const relevantCourseIds = new Set([courseId]);
     let matchedEvents;
@@ -35683,7 +35744,7 @@ function createOneRosterNamespace(client) {
       listByClass: async (classSourcedId, options) => {
         const queryParams = new URLSearchParams;
         const filters = [`class.sourcedId='${escapeFilterValue2(classSourcedId)}'`];
-        if (options?.onlyActive ?? true) {
+        if (!options?.includeInactive) {
           filters.push(`status='active'`);
         }
         queryParams.set("filter", filters.join(" AND "));
@@ -35718,7 +35779,7 @@ function createOneRosterNamespace(client) {
             const queryParams = new URLSearchParams;
             const classFilter = batch.map((classId) => `class.sourcedId='${escapeFilterValue2(classId)}'`).join(" OR ");
             const filters = [batch.length > 1 ? `(${classFilter})` : classFilter];
-            if (options?.onlyActive ?? true) {
+            if (!options?.includeInactive) {
               filters.push(`status='active'`);
             }
             if (options?.role) {
@@ -96845,15 +96906,19 @@ var init_timeback_controller = __esm(() => {
   getRoster = requireGameManagementAccess(async (ctx) => {
     const gameId = ctx.params.gameId;
     const courseId = ctx.params.courseId;
+    const includeInactive = ctx.url.searchParams.get("includeInactive") === "true";
     if (!gameId || !courseId) {
       throw ApiError.badRequest("Missing gameId or courseId parameter");
     }
     logger64.debug("Getting course roster", {
       requesterId: ctx.user.id,
       gameId,
-      courseId
+      courseId,
+      includeInactive
+    });
+    return ctx.services.timebackAdmin.listStudentsForCourse(gameId, courseId, ctx.user, {
+      includeInactive
     });
-    return ctx.services.timebackAdmin.listStudentsForCourse(gameId, courseId, ctx.user);
   });
   getStudentOverview = requireGameManagementAccess(async (ctx) => {
     const timebackId = ctx.params.timebackId;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@playcademy/sandbox",
-    "version": "0.3.17-beta.23",
+    "version": "0.3.17-beta.25",
     "description": "Local development server for Playcademy game development",
     "type": "module",
     "exports": {