@eeplatform/basic-edu 1.8.7 → 1.8.8

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @eeplatform/basic-edu
 
+## 1.8.8
+
+### Patch Changes
+
+- cd82d95: Section Mgmt - revised generation
+
 ## 1.8.7
 
 ### 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>;

package/dist/index.js

@@ -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) {
@@ -6287,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;
@@ -6458,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
   };
 }
 
@@ -39017,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) {
@@ -42427,7 +42461,8 @@ function useSectionService() {
         {
           school: value.school,
           schoolYear: value.schoolYear,
-          gradeLevel: value.gradeLevel
+          gradeLevel: value.gradeLevel,
+          specialProgram: value.specialProgram
         },
         session
       );
@@ -42444,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(
@@ -42591,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
@@ -42607,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);
@@ -42644,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({
@@ -42835,6 +42945,7 @@ function useSectionController() {
   return {
     add,
     generateSections,
+    generateSectionPreview,
     getAll,
     getById,
     getByName,