add seat reservation types to enrollment datapuller

asuc-octo · Feb 10, 2025 · 9ad0369 · 9ad0369
1 parent f40b254
commit 9ad0369
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/apps/datapuller/src/lib/enrollment.ts b/apps/datapuller/src/lib/enrollment.ts
@@ -42,15 +42,15 @@ const formatEnrollmentSingular = (input: ClassSection, time: Date) => {
         input.enrollmentStatus?.instructorAddConsentRequired,
       instructorDropConsentRequired:
         input.enrollmentStatus?.instructorDropConsentRequired,
-      seatReservations: input.enrollmentStatus?.seatReservations?.map(
+      seatReservationCounts: input.enrollmentStatus?.seatReservations?.map(
         (reservation) => ({
           number: reservation.number,
           maxEnroll: reservation.maxEnroll,
           enrolledCount: reservation.enrolledCount,
         })
       ),
     },
-    seatReservations: input.enrollmentStatus?.seatReservations?.map(
+    seatReservationTypes: input.enrollmentStatus?.seatReservations?.map(
       (reservation) => ({
         number: reservation.number,
         requirementGroup: reservation.requirementGroup?.description,

diff --git a/apps/datapuller/src/pullers/enrollment.ts b/apps/datapuller/src/pullers/enrollment.ts
@@ -31,17 +31,18 @@ const enrollmentSingularsEqual = (
   }
 
   const aSeatReservationsEmpty =
-    a.seatReservations == undefined || a.seatReservations.length == 0;
+    a.seatReservationCounts == undefined || a.seatReservationCounts.length == 0;
   const bSeatReservationsEmpty =
-    b.seatReservations == undefined || b.seatReservations.length == 0;
+    b.seatReservationCounts == undefined || b.seatReservationCounts.length == 0;
   if (aSeatReservationsEmpty != bSeatReservationsEmpty) {
     return false;
   }
 
-  if (a.seatReservations && b.seatReservations) {
-    if (a.seatReservations.length !== b.seatReservations.length) return false;
-    for (const aSeats of a.seatReservations) {
-      const bSeats = b.seatReservations.find(
+  if (a.seatReservationCounts && b.seatReservationCounts) {
+    if (a.seatReservationCounts.length !== b.seatReservationCounts.length)
+      return false;
+    for (const aSeats of a.seatReservationCounts) {
+      const bSeats = b.seatReservationCounts.find(
         (bSeats) => bSeats.number === aSeats.number
       );
       if (
@@ -131,6 +132,9 @@ const updateEnrollmentHistories = async ({
             sectionId: enrollmentSingular.sectionId,
           },
           {
+            $setOnInsert: {
+              seatReservationTypes: enrollmentSingular.seatReservationTypes,
+            },
             $push: {
               history: enrollmentSingular.data,
             },

diff --git a/packages/common/src/models/enrollment-history.ts b/packages/common/src/models/enrollment-history.ts
@@ -7,7 +7,7 @@ export interface IEnrollmentHistoryItem {
 
   // maps number to requirementGroup.
   // this assumes that these fields are constant over time.
-  seatReservations?: {
+  seatReservationTypes?: {
     number: number;
     requirementGroup?: string;
     fromDate: string;
@@ -24,7 +24,7 @@ export interface IEnrollmentHistoryItem {
     openReserved?: number;
     instructorAddConsentRequired?: boolean;
     instructorDropConsentRequired?: boolean;
-    seatReservations?: {
+    seatReservationCounts?: {
       number: number; // maps to seatReservations.number to get requirementGroup
       maxEnroll: number;
       enrolledCount?: number;
@@ -59,7 +59,7 @@ const enrollmentHistorySchema = new Schema<IEnrollmentHistoryItem>({
       openReserved: { type: Number },
       instructorAddConsentRequired: { type: Boolean },
       instructorDropConsentRequired: { type: Boolean },
-      seatReservations: [
+      seatReservationCounts: [
         {
           _id: false,
           number: { type: Number },
@@ -69,7 +69,7 @@ const enrollmentHistorySchema = new Schema<IEnrollmentHistoryItem>({
       ],
     },
   ],
-  seatReservations: [
+  seatReservationTypes: [
     {
       _id: false,
       number: { type: Number },