@eeplatform/basic-edu 1.8.5 → 1.8.7

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eeplatform/basic-edu
 
+## 1.8.7
+
+### Patch Changes
+
+- 24c7ff6: Fix enrollment status update
+
+## 1.8.6
+
+### Patch Changes
+
+- 41403d6: Enrollment management - fix enrollment status update
+
 ## 1.8.5
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1636,6 +1636,8 @@ declare function useProgramScreeningRepo(): {
     }, session?: ClientSession) => Promise<string>;
     deleteById: (_id: string | ObjectId) => Promise<string>;
     updateById: (_id: string | ObjectId, value: Pick<TProgramScreening, "specialProgram" | "specialProgramName" | "status">) => Promise<string>;
+    updateStatusByApplicantId: (_id: string | ObjectId, status: string, session?: ClientSession) => Promise<string>;
+    getByApplicantId: (_id: string | ObjectId) => Promise<TProgramScreening>;
 };
 
 declare function useProgramScreeningController(): {

package/dist/index.js

@@ -2968,7 +2968,7 @@ var learnerInfoSchema = import_joi5.default.object({
 });
 var schemaUpdateStatus = import_joi5.default.object({
   _id: import_joi5.default.string().hex().length(24).required(),
-  status: import_joi5.default.string().valid("pending", "accepted", "rejected").required()
+  status: import_joi5.default.string().valid("pending", "accepted", "rejected", "cancelled").required()
 });
 var gradeLevels = [
   "K1",
@@ -4390,6 +4390,51 @@ function useProgramScreeningRepo() {
       }
     }
   }
+  async function getByApplicantId(_id) {
+    try {
+      _id = new import_mongodb10.ObjectId(_id);
+    } catch (error) {
+      throw new import_nodejs_utils15.BadRequestError("Invalid ID.");
+    }
+    const cacheKey = (0, import_nodejs_utils15.makeCacheKey)(namespace_collection, {
+      applicant: String(_id)
+    });
+    try {
+      const cached = await getCache(cacheKey);
+      if (cached) {
+        import_nodejs_utils15.logger.log({
+          level: "info",
+          message: `Cache hit for getById program screening: ${cacheKey}`
+        });
+        return cached;
+      }
+      const result = await collection.findOne({
+        applicant: _id,
+        status: { $ne: "deleted" }
+      });
+      if (!result) {
+        throw new import_nodejs_utils15.BadRequestError("Program screening not found.");
+      }
+      setCache(cacheKey, result, 300).then(() => {
+        import_nodejs_utils15.logger.log({
+          level: "info",
+          message: `Cache set for program screening by id: ${cacheKey}`
+        });
+      }).catch((err) => {
+        import_nodejs_utils15.logger.log({
+          level: "error",
+          message: `Failed to set cache for program screening by id: ${err.message}`
+        });
+      });
+      return result;
+    } catch (error) {
+      if (error instanceof import_nodejs_utils15.AppError) {
+        throw error;
+      } else {
+        throw new import_nodejs_utils15.InternalServerError("Failed to get program screening.");
+      }
+    }
+  }
   async function getByCode(code, school) {
     try {
       school = new import_mongodb10.ObjectId(school);
@@ -4513,6 +4558,26 @@ function useProgramScreeningRepo() {
       );
     }
   }
+  async function updateStatusByApplicantId(_id, status, session) {
+    try {
+      _id = new import_mongodb10.ObjectId(_id);
+    } catch (error) {
+      throw new import_nodejs_utils15.BadRequestError("Invalid ID.");
+    }
+    try {
+      await collection.updateOne(
+        { applicant: _id },
+        { $set: { status, updatedAt: /* @__PURE__ */ new Date() } },
+        { session }
+      );
+      delCachedData();
+      return "Successfully updated program screening status.";
+    } catch (error) {
+      throw new import_nodejs_utils15.InternalServerError(
+        "Failed to update program screening status."
+      );
+    }
+  }
   return {
     createIndexes,
     add,
@@ -4521,7 +4586,9 @@ function useProgramScreeningRepo() {
     getByCode,
     updateFieldById,
     deleteById,
-    updateById
+    updateById,
+    updateStatusByApplicantId,
+    getByApplicantId
   };
 }
 
@@ -5408,7 +5475,11 @@ function useEnrollmentService() {
     getById: _getById,
     updateStatusById: _updateStatusById
   } = useEnrollmentRepo();
-  const { add: addProgramScreening } = useProgramScreeningRepo();
+  const {
+    add: addProgramScreening,
+    updateStatusByApplicantId,
+    getByApplicantId
+  } = useProgramScreeningRepo();
   const { getById: getProgramById } = useProgramRepo();
   async function add(value) {
     const session = import_nodejs_utils21.useAtlas.getClient()?.startSession();
@@ -5523,9 +5594,26 @@ function useEnrollmentService() {
     const session = client.startSession();
     try {
       session.startTransaction();
-      const enrollment = await _getById(_id, "pending");
+      const enrollment = await _getById(_id);
       if (!enrollment) {
-        throw new import_nodejs_utils21.NotFoundError("Enrollment not found or not pending");
+        throw new import_nodejs_utils21.NotFoundError("Enrollment not found.");
+      }
+      if (status === "accepted" && enrollment.status == "rejected") {
+        throw new import_nodejs_utils21.BadRequestError("Rejected enrollments cannot be accepted.");
+      }
+      if (status === "accepted" && enrollment.status == "accepted") {
+        throw new import_nodejs_utils21.BadRequestError("Enrollment is already accepted.");
+      }
+      if (status === "rejected" && enrollment.status == "rejected") {
+        throw new import_nodejs_utils21.BadRequestError("Enrollment is already rejected.");
+      }
+      if (status === "rejected" && enrollment.status == "accepted") {
+        throw new import_nodejs_utils21.BadRequestError("Accepted enrollments cannot be rejected.");
+      }
+      if (status === "withdrawn" && enrollment.status !== "screening") {
+        throw new import_nodejs_utils21.BadRequestError(
+          "Only enrollments in screening status can be withdrawn."
+        );
       }
       const result = await _updateStatusById(_id, status, session);
       if (result.modifiedCount === 0) {
@@ -5563,8 +5651,17 @@ function useEnrollmentService() {
           await incrementById(counterId, session);
         }
         enrollment.specialProgram = enrollment.specialProgram?.toString();
+        enrollment.createdBy = enrollment.createdBy?.toString();
         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();
       return "Enrollment accepted successfully";
     } catch (error2) {