@eeplatform/basic-edu 1.8.4 → 1.8.6

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eeplatform/basic-edu
 
+## 1.8.6
+
+### Patch Changes
+
+- 41403d6: Enrollment management - fix enrollment status update
+
+## 1.8.5
+
+### Patch Changes
+
+- b6607f7: Enrollment management - updated getById return type
+
 ## 1.8.4
 
 ### Patch Changes

package/dist/index.d.ts

@@ -367,7 +367,7 @@ declare function useEnrollmentRepo(): {
         length: number;
     }>;
     updateStatusById: (_id: string | ObjectId, status: string, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
-    getById: (_id: string | ObjectId, status?: string) => Promise<TLearner | null>;
+    getById: (_id: string | ObjectId, status?: string) => Promise<TEnrollment | null>;
 };
 
 declare function useEnrollmentService(): {

package/dist/index.js

@@ -5523,9 +5523,21 @@ 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.");
       }
       const result = await _updateStatusById(_id, status, session);
       if (result.modifiedCount === 0) {
@@ -5562,6 +5574,8 @@ function useEnrollmentService() {
           enrollment.learnerInfo.lrn = lrn;
           await incrementById(counterId, session);
         }
+        enrollment.specialProgram = enrollment.specialProgram?.toString();
+        enrollment.createdBy = enrollment.createdBy?.toString();
         await addLearner(enrollment, session);
       }
       await session.commitTransaction();