@eeplatform/basic-edu 1.8.6 → 1.8.8

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eeplatform/basic-edu
 
+## 1.8.8
+
+### Patch Changes
+
+- cd82d95: Section Mgmt - revised generation
+
+## 1.8.7
+
+### Patch Changes
+
+- 24c7ff6: Fix enrollment status update
+
 ## 1.8.6
 
 ### Patch Changes

package/dist/index.d.ts

@@ -473,6 +473,7 @@ declare function useGradeLevelController(): {
     updateById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     deleteById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getByEducationLevel: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getByGradeLevel: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 type TRegion = {
@@ -870,6 +871,7 @@ declare function useLearnerRepo(): {
         school: string | ObjectId;
         schoolYear: string;
         gradeLevel: string;
+        specialProgram?: string | ObjectId;
         status?: string;
     }, session?: ClientSession) => Promise<number>;
     updateStatusById: (_id: string | ObjectId, status: string, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
@@ -1013,6 +1015,7 @@ declare function useSectionRepo(): {
 declare function useSectionController(): {
     add: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     generateSections: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    generateSectionPreview: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getByName: (req: Request, res: Response, next: NextFunction) => Promise<void>;
@@ -1636,6 +1639,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",
@@ -3649,17 +3649,16 @@ function useLearnerRepo() {
       school: import_joi7.default.string().hex().required(),
       schoolYear: import_joi7.default.string().required(),
       gradeLevel: import_joi7.default.string().required(),
+      specialProgram: import_joi7.default.string().hex().optional().allow(null, ""),
       status: import_joi7.default.string().optional()
     });
     const { error } = validation.validate(value);
     if (error) {
       throw new import_nodejs_utils10.BadRequestError(`Invalid data: ${error.message}`);
     }
-    const status = value.status ?? "active";
     const query = {
       schoolYear: value.schoolYear,
-      gradeLevel: value.gradeLevel,
-      status
+      gradeLevel: value.gradeLevel
     };
     const cacheKeyOptions = {
       ...query,
@@ -3673,6 +3672,16 @@ function useLearnerRepo() {
       }
       cacheKeyOptions.school = value.school.toString();
     }
+    if (value.specialProgram) {
+      try {
+        query["learnerInfo.specialProgram"] = new import_mongodb7.ObjectId(
+          value.specialProgram
+        );
+      } catch (error2) {
+        throw new import_nodejs_utils10.BadRequestError("Invalid special program ID.");
+      }
+      cacheKeyOptions.specialProgram = value.specialProgram.toString();
+    }
     const cacheKey = (0, import_nodejs_utils10.makeCacheKey)(namespace_collection, cacheKeyOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData !== void 0 && cachedData !== null) {
@@ -4390,6 +4399,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 +4567,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 +4595,9 @@ function useProgramScreeningRepo() {
     getByCode,
     updateFieldById,
     deleteById,
-    updateById
+    updateById,
+    updateStatusByApplicantId,
+    getByApplicantId
   };
 }
 
@@ -5408,7 +5484,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();
@@ -5539,6 +5619,11 @@ function useEnrollmentService() {
       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) {
         throw new import_nodejs_utils21.InternalServerError("Failed to accept enrollment");
@@ -5578,6 +5663,14 @@ function useEnrollmentService() {
         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) {
@@ -6203,7 +6296,8 @@ function useGradeLevelController() {
     add: _add,
     updateById: _updateById,
     deleteById: _deleteById,
-    getByEducationLevel: _getByEducationLevel
+    getByEducationLevel: _getByEducationLevel,
+    getByGradeLevel: _getByGradeLevel
   } = useGradeLevelRepo();
   async function add(req, res, next) {
     const value = req.body;
@@ -6374,13 +6468,34 @@ function useGradeLevelController() {
       next(error2);
     }
   }
+  async function getByGradeLevel(req, res, next) {
+    const gradeLevel = req.params.gradeLevel;
+    const school = req.params.school;
+    const validation = import_joi16.default.object({
+      gradeLevel: import_joi16.default.string().required(),
+      school: import_joi16.default.string().hex().required()
+    });
+    const { error } = validation.validate({ gradeLevel, school });
+    if (error) {
+      next(new import_nodejs_utils25.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const data = await _getByGradeLevel({ gradeLevel, school });
+      res.json(data);
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
   return {
     add,
     getAll,
     getById,
     updateById,
     deleteById,
-    getByEducationLevel
+    getByEducationLevel,
+    getByGradeLevel
   };
 }
 
@@ -38933,6 +39048,9 @@ var schemaGenerateSections = import_joi31.default.object({
   school: import_joi31.default.string().hex().required(),
   schoolYear: import_joi31.default.string().required(),
   gradeLevel: import_joi31.default.string().required(),
+  minStudents: import_joi31.default.number().integer().min(1).required(),
+  maxStudents: import_joi31.default.number().integer().min(import_joi31.default.ref("minStudents")).required(),
+  specialProgram: import_joi31.default.string().hex().optional().allow(null, ""),
   set: import_joi31.default.array().items(import_joi31.default.string().min(1).max(100)).required()
 });
 function modelSection(value) {
@@ -42343,7 +42461,8 @@ function useSectionService() {
         {
           school: value.school,
           schoolYear: value.schoolYear,
-          gradeLevel: value.gradeLevel
+          gradeLevel: value.gradeLevel,
+          specialProgram: value.specialProgram
         },
         session
       );
@@ -42360,8 +42479,8 @@ function useSectionService() {
       if (!gradeLevelData) {
         throw new import_nodejs_utils69.BadRequestError("Grade level not found.");
       }
-      const minPerSection = gradeLevelData.minNumberOfLearners;
-      const maxPerSection = gradeLevelData.maxNumberOfLearners;
+      const minPerSection = value.minStudents ?? gradeLevelData.minNumberOfLearners;
+      const maxPerSection = value.maxStudents ?? gradeLevelData.maxNumberOfLearners;
       const sectionsNeeded = Math.ceil(studentCount / minPerSection);
       if (sectionsNeeded > value.set.length) {
         throw new import_nodejs_utils69.BadRequestError(
@@ -42507,7 +42626,64 @@ function useSectionService() {
       await session?.endSession();
     }
   }
-  return { generateSections };
+  async function generateSectionPreview(value) {
+    const { error } = schemaGenerateSections.validate(value);
+    if (error) {
+      throw new import_nodejs_utils69.BadRequestError(
+        `Invalid section generation data: ${error.message}`
+      );
+    }
+    try {
+      const studentCount = await getCountByGradeLevel({
+        school: value.school,
+        schoolYear: value.schoolYear,
+        gradeLevel: value.gradeLevel,
+        specialProgram: value.specialProgram
+      });
+      if (studentCount === 0) {
+        throw new import_nodejs_utils69.BadRequestError("No learners found for this grade level.");
+      }
+      const gradeLevelData = await getByGradeLevel({
+        school: value.school,
+        gradeLevel: value.gradeLevel
+      });
+      if (!gradeLevelData) {
+        throw new import_nodejs_utils69.BadRequestError("Grade level not found.");
+      }
+      const minPerSection = value.minStudents ?? gradeLevelData.minNumberOfLearners;
+      const maxPerSection = value.maxStudents ?? gradeLevelData.maxNumberOfLearners;
+      const sectionsNeeded = Math.ceil(studentCount / minPerSection);
+      if (sectionsNeeded > value.set.length) {
+        throw new import_nodejs_utils69.BadRequestError(
+          "Insufficient number of section names in set[]."
+        );
+      }
+      const sectionSizes = distributeStudents(
+        studentCount,
+        minPerSection,
+        maxPerSection
+      );
+      if (sectionSizes.length === 0) {
+        throw new import_nodejs_utils69.BadRequestError("Unable to compute section sizes.");
+      }
+      const sections = sectionSizes.map((size, index) => ({
+        name: value.set[index],
+        value: size
+      }));
+      return {
+        totalSectionsGenerated: sectionSizes.length,
+        totalStudentsAssigned: studentCount,
+        sections
+      };
+    } catch (error2) {
+      if (error2 instanceof import_nodejs_utils69.AppError) {
+        throw error2;
+      } else {
+        throw new import_nodejs_utils69.InternalServerError("Failed to generate section preview.");
+      }
+    }
+  }
+  return { generateSections, generateSectionPreview };
 }
 
 // src/resources/section/section.controller.ts
@@ -42523,7 +42699,10 @@ function useSectionController() {
     removeStudentFromSection: _removeStudentFromSection,
     deleteById: _deleteById
   } = useSectionRepo();
-  const { generateSections: _generateSections } = useSectionService();
+  const {
+    generateSections: _generateSections,
+    generateSectionPreview: _generateSectionPreview
+  } = useSectionService();
   async function add(req, res, next) {
     const value = req.body;
     const { error } = schemaSection.validate(value);
@@ -42560,6 +42739,21 @@ function useSectionController() {
       next(error2);
     }
   }
+  async function generateSectionPreview(req, res, next) {
+    const value = req.body;
+    const { error } = schemaGenerateSections.validate(value);
+    if (error) {
+      next(new import_nodejs_utils70.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const data = await _generateSectionPreview(value);
+      res.json(data);
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
   async function getAll(req, res, next) {
     const query = req.query;
     const validation = import_joi43.default.object({
@@ -42751,6 +42945,7 @@ function useSectionController() {
   return {
     add,
     generateSections,
+    generateSectionPreview,
     getAll,
     getById,
     getByName,