@eeplatform/basic-edu 1.10.19 → 1.10.21

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eeplatform/basic-edu
 
+## 1.10.21
+
+### Patch Changes
+
+- 82c1c45: Adjust enrollment status handling and minor fixes
+
+## 1.10.20
+
+### Patch Changes
+
+- 149fe29: Add getById handler to school controller
+
 ## 1.10.19
 
 ### Patch Changes

package/dist/index.d.ts

@@ -698,6 +698,7 @@ declare function useSchoolController(): {
     updateFieldById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     updateById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     deleteById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 type TAsset = {

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");
     }
@@ -34650,7 +34649,8 @@ function useSchoolController() {
     updateStatusById: _updateStatusById,
     updateFieldById: _updateFieldById,
     updateById: _updateById,
-    deleteById: _deleteById
+    deleteById: _deleteById,
+    getById: _getById
   } = useSchoolRepo();
   const {
     add: _addSchool,
@@ -34891,6 +34891,22 @@ function useSchoolController() {
       next(error2);
     }
   }
+  async function getById(req, res, next) {
+    const schoolId = req.params.id;
+    const validation = import_joi15.default.string().hex().required();
+    const { error } = validation.validate(schoolId);
+    if (error) {
+      next(new import_nodejs_utils24.BadRequestError(`Validation error: ${error.message}`));
+      return;
+    }
+    try {
+      const school = await _getById(schoolId);
+      res.status(200).json(school);
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
   return {
     add,
     getAll,
@@ -34901,7 +34917,8 @@ function useSchoolController() {
     addBulk,
     updateFieldById,
     updateById,
-    deleteById
+    deleteById,
+    getById
   };
 }
 
@@ -36188,7 +36205,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 = "";
@@ -36224,14 +36240,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();