@eeplatform/basic-edu 1.10.8 → 1.10.10

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eeplatform/basic-edu
 
+## 1.10.10
+
+### Patch Changes
+
+- 7a326c0: fix
+
+## 1.10.9
+
+### Patch Changes
+
+- 113f487: Section management - fix section generation
+
 ## 1.10.8
 
 ### Patch Changes

package/dist/index.d.ts

@@ -80,7 +80,7 @@ declare function useCurriculumController(): {
 
 type TSubject = {
     _id?: ObjectId;
-    school?: ObjectId;
+    school: string | ObjectId;
     schoolName?: string;
     curriculum: ObjectId | string;
     curriculumName: string;
@@ -110,7 +110,7 @@ declare const schemaSubject: Joi.ObjectSchema<any>;
 declare const schemaSubjectAdd: Joi.ObjectSchema<any>;
 declare function modelSubject(value: TSubject): {
     _id: ObjectId | undefined;
-    school: ObjectId | undefined;
+    school: ObjectId;
     schoolName: string;
     curriculum: ObjectId;
     curriculumName: string;
@@ -140,7 +140,8 @@ declare function modelSubject(value: TSubject): {
 declare function useSubjectRepo(): {
     createIndexes: () => Promise<void>;
     add: (value: TSubject, session?: ClientSession) => Promise<ObjectId>;
-    getAll: ({ search, page, limit, sort, status, curriculum, educationLevel, gradeLevel, schoolYear, }?: {
+    getAll: ({ school, search, page, limit, sort, status, curriculum, educationLevel, gradeLevel, }?: {
+        school?: string | ObjectId;
         search?: string;
         page?: number;
         limit?: number;
@@ -166,6 +167,8 @@ declare function useSubjectRepo(): {
 declare function useSubjectController(): {
     add: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     addMany: (value: {
+        school: string;
+        schoolName?: string;
         curriculum: string;
         curriculumName: string;
         effectiveSchoolYear?: number[];
@@ -178,6 +181,7 @@ declare function useSubjectController(): {
         sessionDuration: number;
         totalMinutesPerWeek: number;
     }) => Promise<string>;
+    getBySchool: (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>;
     getByCurriculum: (req: Request, res: Response, next: NextFunction) => Promise<void>;
@@ -189,6 +193,8 @@ declare function useSubjectController(): {
 
 declare function useSubjectService(): {
     addMany: (value: {
+        school: string;
+        schoolName?: string;
         curriculum: string;
         curriculumName: string;
         effectiveSchoolYear?: number[];
@@ -1584,6 +1590,7 @@ declare function useTeachingLoadSlotRepo(): {
     getById: (_id: string | ObjectId) => Promise<TTeachingLoadSlot | null>;
     deleteById: (_id: string | ObjectId, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     delCachedData: () => void;
+    deleteBySection: (section: string | ObjectId, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
 };
 
 declare function useTeachingLoadSlotController(): {
@@ -1594,6 +1601,7 @@ declare function useTeachingLoadSlotController(): {
     deleteById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getByTeachingLoad: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getByTeacher: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getBySection: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 type TProgram = {

package/dist/index.js

@@ -2163,7 +2163,7 @@ var import_joi3 = __toESM(require("joi"));
 var import_mongodb3 = require("mongodb");
 var schemaSubject = import_joi3.default.object({
   _id: import_joi3.default.string().hex().optional(),
-  school: import_joi3.default.string().hex().optional().allow("", null),
+  school: import_joi3.default.string().hex().required(),
   schoolName: import_joi3.default.string().optional().allow("", null),
   curriculum: import_joi3.default.string().hex().required(),
   curriculumName: import_joi3.default.string().required(),
@@ -2190,6 +2190,8 @@ var schemaSubject = import_joi3.default.object({
   deletedBy: import_joi3.default.string().optional().allow("", null)
 });
 var schemaSubjectAdd = import_joi3.default.object({
+  school: import_joi3.default.string().hex().required(),
+  schoolName: import_joi3.default.string().optional().allow("", null),
   curriculum: import_joi3.default.string().hex().required(),
   curriculumName: import_joi3.default.string().required(),
   effectiveSchoolYear: import_joi3.default.array().items(import_joi3.default.number().integer().min(1900)).optional(),
@@ -2213,6 +2215,11 @@ function modelSubject(value) {
     import_nodejs_utils4.logger.info(`Subject Model: ${error.message}`);
     throw new import_nodejs_utils4.BadRequestError(error.message);
   }
+  try {
+    value.school = new import_mongodb3.ObjectId(value.school);
+  } catch (error2) {
+    throw new import_nodejs_utils4.BadRequestError("Invalid school ID format");
+  }
   if (value._id && typeof value._id === "string") {
     try {
       value._id = new import_mongodb3.ObjectId(value._id);
@@ -2227,13 +2234,6 @@ function modelSubject(value) {
       throw new import_nodejs_utils4.BadRequestError("Invalid curriculum ID format");
     }
   }
-  if (value.school && typeof value.school === "string") {
-    try {
-      value.school = new import_mongodb3.ObjectId(value.school);
-    } catch (error2) {
-      throw new import_nodejs_utils4.BadRequestError("Invalid school ID format");
-    }
-  }
   if (value.program && typeof value.program === "string") {
     try {
       value.program = new import_mongodb3.ObjectId(value.program);
@@ -2353,6 +2353,7 @@ function useSubjectRepo() {
     }
   }
   async function getAll({
+    school = "",
     search = "",
     page = 1,
     limit = 10,
@@ -2360,18 +2361,27 @@ function useSubjectRepo() {
     status = "active",
     curriculum,
     educationLevel,
-    gradeLevel,
-    schoolYear = 0
+    gradeLevel
   } = {}) {
     page = page > 0 ? page - 1 : 0;
-    const query = {
-      status
-    };
+    const query = {};
     const cacheParams = {
       page,
       limit,
       sort: JSON.stringify(sort)
     };
+    if (status) {
+      query.status = status;
+      cacheParams.status = status;
+    }
+    if (school) {
+      try {
+        query.school = new import_mongodb4.ObjectId(school);
+      } catch (error) {
+        throw new import_nodejs_utils5.BadRequestError("Invalid school ID format.");
+      }
+      cacheParams.school = school;
+    }
     if (curriculum) {
       try {
         query.curriculum = new import_mongodb4.ObjectId(curriculum);
@@ -2388,10 +2398,6 @@ function useSubjectRepo() {
       query.gradeLevel = gradeLevel;
       cacheParams.gradeLevel = gradeLevel;
     }
-    if (schoolYear) {
-      query.effectiveSchoolYear = schoolYear;
-      cacheParams.schoolYear = schoolYear;
-    }
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     if (search) {
       query.$or = [
@@ -2687,11 +2693,11 @@ function useSubjectService() {
   async function addMany(value) {
     const { error } = schemaSubjectAdd.validate(value);
     if (error) {
-      throw new Error(`Validation error: ${error.message}`);
+      throw new import_nodejs_utils6.BadRequestError(`Validation error: ${error.message}`);
     }
     const session = import_nodejs_utils6.useAtlas.getClient()?.startSession();
     if (!session) {
-      throw new Error("Failed to start database session.");
+      throw new import_nodejs_utils6.BadRequestError("Failed to start database session.");
     }
     try {
       session.startTransaction();
@@ -2699,6 +2705,8 @@ function useSubjectService() {
         const gradeLevel = value.gradeLevel[index];
         await add(
           {
+            school: value.school,
+            schoolName: value.schoolName,
             curriculum: value.curriculum,
             curriculumName: value.curriculumName,
             effectiveSchoolYear: value.effectiveSchoolYear,
@@ -2850,6 +2858,62 @@ function useSubjectController() {
       next(error2);
     }
   }
+  async function getBySchool(req, res, next) {
+    const school = req.params.school ?? "";
+    const { error: errorSchool } = import_joi4.default.string().hex().required().validate(school);
+    if (errorSchool) {
+      next(new import_nodejs_utils7.BadRequestError(errorSchool.message));
+      return;
+    }
+    const query = req.query;
+    const validation = import_joi4.default.object({
+      page: import_joi4.default.number().min(1).optional().allow("", null),
+      limit: import_joi4.default.number().min(1).optional().allow("", null),
+      search: import_joi4.default.string().optional().allow("", null),
+      status: import_joi4.default.string().optional().allow("", null),
+      curriculum: import_joi4.default.string().hex().optional().allow("", null),
+      educationLevel: import_joi4.default.string().optional().allow("", null),
+      gradeLevel: import_joi4.default.string().optional().allow("", null)
+    });
+    const { error } = validation.validate(query);
+    if (error) {
+      next(new import_nodejs_utils7.BadRequestError(error.message));
+      return;
+    }
+    const page = parseInt(req.query.page) ?? 1;
+    let limit = parseInt(req.query.limit) ?? 20;
+    limit = isNaN(limit) ? 20 : limit;
+    const sort = req.query.sort ? String(req.query.sort).split(",") : "";
+    const sortOrder = req.query.sortOrder ? String(req.query.sortOrder).split(",") : "";
+    const sortObj = {};
+    if (sort && Array.isArray(sort) && sort.length && sortOrder && Array.isArray(sortOrder) && sortOrder.length) {
+      sort.forEach((field, index) => {
+        sortObj[field] = sortOrder[index] === "desc" ? -1 : 1;
+      });
+    }
+    const status = req.query.status ?? "active";
+    const search = req.query.search ?? "";
+    const curriculum = req.query.curriculum ?? "";
+    const educationLevel = req.query.educationLevel ?? "";
+    const gradeLevel = req.query.gradeLevel ?? "";
+    try {
+      const curriculumSubjects = await _getAll({
+        school,
+        page,
+        limit,
+        sort: sortObj,
+        status,
+        search,
+        curriculum,
+        educationLevel,
+        gradeLevel
+      });
+      res.json(curriculumSubjects);
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
   async function getAsOptions(req, res, next) {
     const query = req.query;
     const validation = import_joi4.default.object({
@@ -2957,6 +3021,7 @@ function useSubjectController() {
   return {
     add,
     addMany,
+    getBySchool,
     getAll,
     getById,
     getByCurriculum,
@@ -42452,6 +42517,32 @@ function useTeachingLoadSlotRepo() {
       }
     }
   }
+  async function deleteBySection(section, session) {
+    try {
+      section = new import_mongodb40.ObjectId(section);
+    } catch (error) {
+      throw new import_nodejs_utils66.BadRequestError(namespace_collection + " Invalid section ID.");
+    }
+    try {
+      const res = await collection.updateOne(
+        { section },
+        { $set: { status: "deleted", deletedAt: /* @__PURE__ */ new Date() } },
+        { session }
+      );
+      delCachedData();
+      return res;
+    } catch (error) {
+      import_nodejs_utils66.logger.log({
+        level: "error",
+        message: error.message
+      });
+      if (error instanceof import_nodejs_utils66.AppError) {
+        throw error;
+      } else {
+        throw new import_nodejs_utils66.InternalServerError("Failed to delete teaching load slot.");
+      }
+    }
+  }
   function delCachedData() {
     delNamespace().then(() => {
       import_nodejs_utils66.logger.log({
@@ -42472,7 +42563,8 @@ function useTeachingLoadSlotRepo() {
     getAll,
     getById,
     deleteById,
-    delCachedData
+    delCachedData,
+    deleteBySection
   };
 }
 
@@ -42588,6 +42680,43 @@ function useTeachingLoadSlotController() {
       next(error2);
     }
   }
+  async function getBySection(req, res, next) {
+    const section = req.params.section ?? "";
+    const validation = import_joi42.default.string().hex().required();
+    const { error: errorTeacher } = validation.validate(section);
+    if (errorTeacher) {
+      next(new import_nodejs_utils68.BadRequestError(errorTeacher.message));
+      import_nodejs_utils68.logger.info(`Controller: ${errorTeacher.message}`);
+      return;
+    }
+    const query = req.query;
+    const schema = import_joi42.default.object({
+      page: import_joi42.default.number().min(1).optional().allow("", null),
+      limit: import_joi42.default.number().min(1).max(100).optional().allow("", null),
+      status: import_joi42.default.string().optional().allow("", null)
+    });
+    const { error } = schema.validate(query);
+    if (error) {
+      next(new import_nodejs_utils68.BadRequestError(error.message));
+      import_nodejs_utils68.logger.info(`Controller: ${error.message}`);
+      return;
+    }
+    const page = Number(req.query.page ?? 1);
+    const limit = Number(req.query.limit ?? 10);
+    const status = req.query.status ?? "active";
+    try {
+      const result = await _getAll({
+        section,
+        page,
+        limit,
+        status
+      });
+      res.json(result);
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
   async function getByTeacher(req, res, next) {
     const teacher = req.params.teacher ?? "";
     const schemaTeacher = import_joi42.default.string().hex().required();
@@ -42776,7 +42905,8 @@ function useTeachingLoadSlotController() {
     getById,
     deleteById,
     getByTeachingLoad,
-    getByTeacher
+    getByTeacher,
+    getBySection
   };
 }
 
@@ -43359,6 +43489,7 @@ function useSectionService() {
   const { getById: getSchoolById } = useSchoolRepo();
   const { getAll: getAllPersonnel } = usePersonnelRepo();
   const { add: addTeachingLoad, getByTeacher } = useTeachingLoadRepo();
+  const { deleteBySection: deleteTeachingLoadSlotsBySection } = useTeachingLoadSlotRepo();
   function distributeStudents(total, minPer, maxPer) {
     if (total <= 0)
       return [];
@@ -43460,7 +43591,6 @@ function useSectionService() {
       let subjectsSkipped = 0;
       await delCachedSectionData();
       await delCachedSectionStudentData();
-      console.log("SECTION SIZES:", sectionSizes);
       for (let i = 0; i < sectionSizes.length; i++) {
         const size = sectionSizes[i];
         const sectionName = String(i + 1);
@@ -43623,6 +43753,7 @@ function useSectionService() {
             continue;
           }
           await deleteSectionById(sectionId, session);
+          await deleteTeachingLoadSlotsBySection(sectionId, session);
         }
       }
       await session.commitTransaction();
@@ -43643,7 +43774,6 @@ function useSectionService() {
         }
       };
     } catch (error2) {
-      console.log(error2);
       await session.abortTransaction();
       if (error2 instanceof import_nodejs_utils72.AppError) {
         throw error2;