@eeplatform/basic-edu 1.10.20 → 1.10.22

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eeplatform/basic-edu
 
+## 1.10.22
+
+### Patch Changes
+
+- 5cd19b0: Default specialProgram to none; tidy params
+
+## 1.10.21
+
+### Patch Changes
+
+- 82c1c45: Adjust enrollment status handling and minor fixes
+
 ## 1.10.20
 
 ### Patch Changes

package/dist/index.js

@@ -3232,7 +3232,6 @@ function MLearner(value) {
   if (value.specialProgram && typeof value.specialProgram === "string") {
     try {
       value.specialProgram = new import_mongodb5.ObjectId(value.specialProgram);
-      value.status = "screening";
     } catch (error2) {
       throw new import_nodejs_utils8.BadRequestError("Invalid specialProgram format");
     }
@@ -3851,6 +3850,9 @@ function useLearnerRepo() {
         throw new import_nodejs_utils10.BadRequestError("Invalid special program ID.");
       }
       cacheKeyOptions.specialProgram = value.specialProgram.toString();
+    } else {
+      query["learnerInfo.specialProgram"] = { $in: [null, ""] };
+      cacheKeyOptions.specialProgram = "none";
     }
     if (value.track) {
       try {
@@ -36206,7 +36208,6 @@ function useEnrollmentService() {
       if (status === "accepted") {
         delete enrollment._id;
         enrollment.school = enrollment.school.toString();
-        enrollment.status = "active";
         enrollment.updatedAt = "";
         enrollment.createdAt = /* @__PURE__ */ new Date();
         enrollment.deletedAt = "";
@@ -36242,14 +36243,13 @@ function useEnrollmentService() {
         if (enrollment.seniorHighInfo?.strand) {
           enrollment.seniorHighInfo.strand = enrollment.seniorHighInfo?.strand?.toString();
         }
+        enrollment.status = "active";
         await addLearner(enrollment, session);
       }
       const programScreening = await getByApplicantId(_id);
       if (programScreening) {
         if (["cancelled", "withdrawn"].includes(status)) {
           await updateStatusByApplicantId(_id, "cancelled", session);
-        } else {
-          await updateStatusByApplicantId(_id, status, session);
         }
       }
       await session.commitTransaction();