@playcademy/vite-plugin 0.2.29-beta.6 → 0.2.30-beta.1

package/dist/index.js

@@ -25370,7 +25370,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@playcademy/sandbox",
-    version: "0.3.16",
+    version: "0.3.17-beta.34",
     description: "Local development server for Playcademy game development",
     type: "module",
     exports: {
@@ -54340,6 +54340,13 @@ function resolveAdminEventTime(data) {
   }
   return toAttributionEventTime(data.date);
 }
+function compareEnrollmentsByRecency(a, b) {
+  const dateCompare = (b.beginDate ?? "").localeCompare(a.beginDate ?? "");
+  if (dateCompare !== 0) {
+    return dateCompare;
+  }
+  return (b.dateLastModified ?? "").localeCompare(a.dateLastModified ?? "");
+}
 var init_timeback_admin_util = __esm(() => {
   init_errors();
 });
@@ -54851,6 +54858,7 @@ class TimebackAdminService {
   }
   async getStudentEnrollmentsByCourseId(client, studentId, courseIds, options) {
     const enrollments = new Map;
+    const allEnrollments = new Map;
     const entries = await Promise.all(courseIds.map(async (courseId) => {
       const roster = await client.oneroster.enrollments.listByCourse(courseId, {
         includeInactive: options?.includeInactive,
@@ -54862,28 +54870,30 @@ class TimebackAdminService {
         if (aActive !== bActive) {
           return aActive ? -1 : 1;
         }
-        return (b.enrollment.dateLastModified ?? "").localeCompare(a.enrollment.dateLastModified ?? "");
+        return compareEnrollmentsByRecency(a.enrollment, b.enrollment);
       });
-      return { courseId, match: matches[0] ?? null };
+      return { courseId, matches };
     }));
-    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
-          }
-        });
+    for (const { courseId, matches } of entries) {
+      const records = matches.map((match) => ({
+        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
+        }
+      }));
+      if (records.length > 0) {
+        enrollments.set(courseId, records[0]);
       }
+      allEnrollments.set(courseId, records);
     }
-    return { enrollments };
+    return { enrollments, allEnrollments };
   }
   async assertStudentEnrolledInCourse(client, studentId, courseId) {
     const enrollments = await client.edubridge.enrollments.listByUser(studentId);
@@ -54970,7 +54980,7 @@ class TimebackAdminService {
       const enrollmentId = rosterEntry.enrollment.sourcedId || null;
       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 name3 = rosterEntry.user ? `${rosterEntry.user.givenName} ${rosterEntry.user.familyName}`.trim() || "No name specified" : "No name specified";
       const inactive = rosterEntry.enrollment.status === "tobedeleted";
       return {
         studentId: rosterEntry.enrollment.user.sourcedId,
@@ -55015,14 +55025,15 @@ class TimebackAdminService {
       throw new NotFoundError("Timeback integration", gameId);
     }
     const courseIds = new Set(integrations.map((integration) => integration.courseId));
-    const { enrollments: enrollmentsByCourseId } = await this.getStudentEnrollmentsByCourseId(client, studentId, [...courseIds], {
+    const { enrollments: enrollmentsByCourseId, allEnrollments: allEnrollmentsByCourseId } = await this.getStudentEnrollmentsByCourseId(client, studentId, [...courseIds], {
       includeInactive: true
     });
     if (enrollmentsByCourseId.size === 0) {
       throw new NotFoundError("Student enrollment", courseId ? `${studentId}:${courseId}` : `${studentId}:${gameId}`);
     }
+    const allEnrollmentIds = [...allEnrollmentsByCourseId.values()].flat().map((enrollment) => enrollment.id);
     const studentProfile = await client.oneroster.users.get(studentId);
-    const analyticsByEnrollmentId = await this.loadEnrollmentAnalyticsSummaries([...enrollmentsByCourseId.values()].map((enrollment) => enrollment.id));
+    const analyticsByEnrollmentId = await this.loadEnrollmentAnalyticsSummaries(allEnrollmentIds);
     const [masterableUnitsByCourse, completionStatusByCourse] = await Promise.all([
       this.getMasterableUnitsByCourse(integrations.map((integration) => integration.courseId)),
       this.getCompletionStatusByCourse(client, integrations.map((integration) => integration.courseId), studentId)
@@ -55033,6 +55044,24 @@ class TimebackAdminService {
       const masterableUnits = masterableUnitsByCourse.get(integration.courseId);
       const analyticsUnavailable = Boolean(enrollment?.id) && summary?.analyticsAvailable !== true;
       const inactive = enrollment?.status === "tobedeleted";
+      const courseEnrollments = allEnrollmentsByCourseId.get(integration.courseId) ?? [];
+      const enrollmentSummaries = courseEnrollments.length > 1 ? courseEnrollments.map((record) => {
+        const recordSummary = analyticsByEnrollmentId.get(record.id);
+        const recordAnalyticsUnavailable = recordSummary?.analyticsAvailable !== true;
+        return {
+          enrollmentId: record.id,
+          status: record.status === "tobedeleted" ? "tobedeleted" : "active",
+          beginDate: record.beginDate,
+          endDate: record.endDate,
+          analyticsUnavailable: recordAnalyticsUnavailable,
+          totalXp: recordSummary?.totalXp ?? 0,
+          todayXp: recordSummary?.todayXp ?? 0,
+          activeTimeSeconds: recordSummary?.activeTimeSeconds ?? 0,
+          masteredUnits: recordSummary?.masteredUnits ?? 0,
+          pctCompleteApp: TimebackAdminService.computeCompletionPct(recordSummary?.masteredUnits ?? 0, masterableUnits),
+          history: recordSummary?.history ?? []
+        };
+      }) : undefined;
       return {
         courseId: integration.courseId,
         title: enrollment?.course.title || `${integration.subject} Grade ${integration.grade}`,
@@ -55048,7 +55077,8 @@ class TimebackAdminService {
         pctCompleteApp: TimebackAdminService.computeCompletionPct(summary?.masteredUnits ?? 0, masterableUnits),
         completionStatus: completionStatusByCourse.get(integration.courseId) ?? "none",
         history: summary?.history ?? [],
-        ...inactive ? { inactive } : {}
+        ...inactive ? { inactive } : {},
+        ...enrollmentSummaries ? { enrollments: enrollmentSummaries } : {}
       };
     });
     return {
@@ -55290,17 +55320,34 @@ class TimebackAdminService {
       });
       return { students: [] };
     }
-    const roster = await client.oneroster.enrollments.listByCourse(courseId, {
+    const fullRoster = await client.oneroster.enrollments.listByCourse(courseId, {
       role: "student",
+      includeInactive: true,
       includeUsers: false
     });
-    const enrolledStudentIds = new Set(roster.map((entry) => entry.enrollment.user.sourcedId));
-    const students = allUsers.filter((entry) => Boolean(entry.sourcedId) && entry.roles?.some((role) => role.role === "student") === true).map((entry) => ({
-      studentId: entry.sourcedId,
-      name: `${entry.givenName || ""} ${entry.familyName || ""}`.trim() || entry.sourcedId,
-      email: entry.email || null,
-      alreadyEnrolled: enrolledStudentIds.has(entry.sourcedId)
-    }));
+    const enrolledStudentIds = new Set(fullRoster.filter((entry) => entry.enrollment.status === "active").map((entry) => entry.enrollment.user.sourcedId));
+    const pastEnrollmentsByStudent = new Map;
+    const inactiveEntries = fullRoster.filter((entry) => entry.enrollment.status === "tobedeleted").toSorted((a, b) => compareEnrollmentsByRecency(a.enrollment, b.enrollment));
+    for (const entry of inactiveEntries) {
+      const studentId = entry.enrollment.user.sourcedId;
+      const list = pastEnrollmentsByStudent.get(studentId) ?? [];
+      list.push({
+        enrollmentId: entry.enrollment.sourcedId,
+        beginDate: entry.enrollment.beginDate ?? null,
+        endDate: entry.enrollment.endDate ?? null
+      });
+      pastEnrollmentsByStudent.set(studentId, list);
+    }
+    const students = allUsers.filter((entry) => Boolean(entry.sourcedId) && entry.roles?.some((role) => role.role === "student") === true).map((entry) => {
+      const past = pastEnrollmentsByStudent.get(entry.sourcedId) ?? [];
+      return {
+        studentId: entry.sourcedId,
+        name: `${entry.givenName || ""} ${entry.familyName || ""}`.trim() || "No name specified",
+        email: entry.email || null,
+        alreadyEnrolled: enrolledStudentIds.has(entry.sourcedId),
+        ...past.length > 0 ? { pastEnrollments: past } : {}
+      };
+    });
     return { students };
   }
   async enrollStudent(data, user) {
@@ -55331,6 +55378,48 @@ class TimebackAdminService {
     client.invalidateEnrollments(data.studentId);
     return { status: "ok" };
   }
+  async reactivateEnrollment(data, user) {
+    const client = this.requireClient();
+    await this.deps.validateGameManagementAccess(user, data.gameId);
+    const integration = await this.deps.db.query.gameTimebackIntegrations.findFirst({
+      where: and(eq(gameTimebackIntegrations.gameId, data.gameId), eq(gameTimebackIntegrations.courseId, data.courseId))
+    });
+    if (!integration) {
+      throw new NotFoundError("Timeback integration", `${data.gameId}:${data.courseId}`);
+    }
+    const enrollment = await client.oneroster.enrollments.get(data.enrollmentId);
+    if (!enrollment) {
+      throw new NotFoundError("Enrollment", data.enrollmentId);
+    }
+    if (enrollment.user.sourcedId !== data.studentId) {
+      throw new ValidationError("Enrollment does not belong to the specified student");
+    }
+    if (enrollment.status === "active") {
+      throw new ValidationError("Enrollment is already active");
+    }
+    const { allEnrollments } = await this.getStudentEnrollmentsByCourseId(client, data.studentId, [data.courseId], { includeInactive: true });
+    const courseEnrollmentIds = new Set((allEnrollments.get(data.courseId) ?? []).map((e) => e.id));
+    if (!courseEnrollmentIds.has(data.enrollmentId)) {
+      throw new ValidationError("Enrollment does not belong to the specified course");
+    }
+    const activeEnrollments = await client.edubridge.enrollments.listByUser(data.studentId);
+    if (activeEnrollments.some((e) => e.course.id === data.courseId)) {
+      throw new ValidationError("Student already has an active enrollment for this course. Unenroll from the current enrollment before reactivating a past one.");
+    }
+    await client.oneroster.enrollments.update(data.enrollmentId, {
+      role: enrollment.role,
+      primary: enrollment.primary,
+      beginDate: enrollment.beginDate,
+      endDate: enrollment.endDate,
+      user: enrollment.user,
+      class: enrollment.class,
+      school: enrollment.school,
+      sourcedId: data.enrollmentId,
+      status: "active"
+    });
+    client.invalidateEnrollments(data.studentId);
+    return { status: "ok" };
+  }
   async getCompletionStatus(client, courseId, studentId) {
     const ids = deriveSourcedIds(courseId);
     const lineItemId = `${ids.course}-mastery-completion-assessment`;
@@ -60403,6 +60492,10 @@ function createOneRosterNamespace(client) {
       }
     },
     enrollments: {
+      get: async (sourcedId) => {
+        const response = await client["request"](`${ONEROSTER_ENDPOINTS5.enrollments}/${sourcedId}`, "GET");
+        return response.enrollment;
+      },
       listByClass: async (classSourcedId, options) => {
         const queryParams = new URLSearchParams;
         const filters = [`class.sourcedId='${escapeFilterValue2(classSourcedId)}'`];
@@ -60480,6 +60573,11 @@ function createOneRosterNamespace(client) {
         }
       },
       create: async (data) => client["request"](ONEROSTER_ENDPOINTS5.enrollments, "POST", { enrollment: data }),
+      update: async (sourcedId, data) => {
+        await client["request"](`${ONEROSTER_ENDPOINTS5.enrollments}/${sourcedId}`, "PUT", {
+          enrollment: data
+        });
+      },
       delete: async (sourcedId) => {
         await client["request"](`${ONEROSTER_ENDPOINTS5.enrollments}/${sourcedId}`, "DELETE");
       }
@@ -121699,6 +121797,7 @@ var AdjustTimebackMasteryRequestSchema;
 var ToggleCourseCompletionRequestSchema;
 var EnrollStudentRequestSchema;
 var UnenrollStudentRequestSchema;
+var ReactivateEnrollmentRequestSchema;
 var InsertAssessmentTestSchema;
 var CreateAssessmentRequestSchema;
 var ReorderAssessmentsRequestSchema;
@@ -121889,6 +121988,12 @@ var init_schemas11 = __esm(() => {
     courseId: exports_external.string().min(1),
     studentId: exports_external.string().min(1)
   });
+  ReactivateEnrollmentRequestSchema = exports_external.object({
+    gameId: exports_external.string().uuid(),
+    courseId: exports_external.string().min(1),
+    studentId: exports_external.string().min(1),
+    enrollmentId: exports_external.string().min(1)
+  });
   InsertAssessmentTestSchema = createInsertSchema(gameTimebackAssessmentTests).omit({
     id: true,
     createdAt: true
@@ -124142,6 +124247,7 @@ var toggleCompletion;
 var searchStudents;
 var enrollStudent;
 var unenrollStudent;
+var reactivateEnrollment;
 var listAssessments;
 var createAssessment;
 var deleteAssessment;
@@ -124602,6 +124708,17 @@ var init_timeback_controller = __esm(() => {
     });
     return ctx.services.timebackAdmin.unenrollStudent(body2, ctx.user);
   });
+  reactivateEnrollment = requireGameManagementAccess(async (ctx) => {
+    const body2 = await parseRequestBody(ctx.request, ReactivateEnrollmentRequestSchema);
+    logger65.debug("Reactivating enrollment", {
+      requesterId: ctx.user.id,
+      gameId: body2.gameId,
+      courseId: body2.courseId,
+      studentId: body2.studentId,
+      enrollmentId: body2.enrollmentId
+    });
+    return ctx.services.timebackAdmin.reactivateEnrollment(body2, ctx.user);
+  });
   listAssessments = requireGameManagementAccess(async (ctx) => {
     const { gameId, courseId } = ctx.params;
     if (!gameId || !courseId) {
@@ -124751,6 +124868,7 @@ var init_timeback_controller = __esm(() => {
     searchStudents,
     enrollStudent,
     unenrollStudent,
+    reactivateEnrollment,
     listAssessments,
     createAssessment,
     deleteAssessment,
@@ -127584,7 +127702,7 @@ var import_picocolors12 = __toESM(require_picocolors(), 1);
 // package.json
 var package_default2 = {
   name: "@playcademy/vite-plugin",
-  version: "0.2.29-beta.6",
+  version: "0.2.30-beta.1",
   type: "module",
   exports: {
     ".": {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@playcademy/vite-plugin",
-    "version": "0.2.29-beta.6",
+    "version": "0.2.30-beta.1",
     "type": "module",
     "exports": {
         ".": {