@eeplatform/basic-edu 1.10.7 → 1.10.9

package/dist/index.mjs

@@ -2038,7 +2038,7 @@ import Joi3 from "joi";
 import { ObjectId as ObjectId3 } from "mongodb";
 var schemaSubject = Joi3.object({
   _id: Joi3.string().hex().optional(),
-  school: Joi3.string().hex().optional().allow("", null),
+  school: Joi3.string().hex().required(),
   schoolName: Joi3.string().optional().allow("", null),
   curriculum: Joi3.string().hex().required(),
   curriculumName: Joi3.string().required(),
@@ -2065,6 +2065,8 @@ var schemaSubject = Joi3.object({
   deletedBy: Joi3.string().optional().allow("", null)
 });
 var schemaSubjectAdd = Joi3.object({
+  school: Joi3.string().hex().required(),
+  schoolName: Joi3.string().optional().allow("", null),
   curriculum: Joi3.string().hex().required(),
   curriculumName: Joi3.string().required(),
   effectiveSchoolYear: Joi3.array().items(Joi3.number().integer().min(1900)).optional(),
@@ -2088,6 +2090,11 @@ function modelSubject(value) {
     logger4.info(`Subject Model: ${error.message}`);
     throw new BadRequestError4(error.message);
   }
+  try {
+    value.school = new ObjectId3(value.school);
+  } catch (error2) {
+    throw new BadRequestError4("Invalid school ID format");
+  }
   if (value._id && typeof value._id === "string") {
     try {
       value._id = new ObjectId3(value._id);
@@ -2102,13 +2109,6 @@ function modelSubject(value) {
       throw new BadRequestError4("Invalid curriculum ID format");
     }
   }
-  if (value.school && typeof value.school === "string") {
-    try {
-      value.school = new ObjectId3(value.school);
-    } catch (error2) {
-      throw new BadRequestError4("Invalid school ID format");
-    }
-  }
   if (value.program && typeof value.program === "string") {
     try {
       value.program = new ObjectId3(value.program);
@@ -2237,6 +2237,7 @@ function useSubjectRepo() {
     }
   }
   async function getAll({
+    school = "",
     search = "",
     page = 1,
     limit = 10,
@@ -2244,18 +2245,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 ObjectId4(school);
+      } catch (error) {
+        throw new BadRequestError5("Invalid school ID format.");
+      }
+      cacheParams.school = school;
+    }
     if (curriculum) {
       try {
         query.curriculum = new ObjectId4(curriculum);
@@ -2272,10 +2282,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 = [
@@ -2587,6 +2593,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,
@@ -2738,6 +2746,62 @@ function useSubjectController() {
       next(error2);
     }
   }
+  async function getBySchool(req, res, next) {
+    const school = req.params.school ?? "";
+    const { error: errorSchool } = Joi4.string().hex().required().validate(school);
+    if (errorSchool) {
+      next(new BadRequestError6(errorSchool.message));
+      return;
+    }
+    const query = req.query;
+    const validation = Joi4.object({
+      page: Joi4.number().min(1).optional().allow("", null),
+      limit: Joi4.number().min(1).optional().allow("", null),
+      search: Joi4.string().optional().allow("", null),
+      status: Joi4.string().optional().allow("", null),
+      curriculum: Joi4.string().hex().optional().allow("", null),
+      educationLevel: Joi4.string().optional().allow("", null),
+      gradeLevel: Joi4.string().optional().allow("", null)
+    });
+    const { error } = validation.validate(query);
+    if (error) {
+      next(new BadRequestError6(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 = Joi4.object({
@@ -2845,6 +2909,7 @@ function useSubjectController() {
   return {
     add,
     addMany,
+    getBySchool,
     getAll,
     getById,
     getByCurriculum,
@@ -40788,7 +40853,7 @@ function useSectionRepo() {
     school = "",
     schoolYear = "",
     gradeLevel = ""
-  } = {}) {
+  } = {}, session) {
     page = page > 0 ? page - 1 : 0;
     const query = {
       deletedAt: { $in: ["", null] },
@@ -40835,12 +40900,15 @@ function useSectionRepo() {
         });
         return cached;
       }
-      const items = await collection.aggregate([
-        { $match: query },
-        { $sort: sort },
-        { $skip: page * limit },
-        { $limit: limit }
-      ]).toArray();
+      const items = await collection.aggregate(
+        [
+          { $match: query },
+          { $sort: sort },
+          { $skip: page * limit },
+          { $limit: limit }
+        ],
+        { session }
+      ).toArray();
       const length = await collection.countDocuments(query);
       const data = paginate17(items, page, limit, length);
       setCache(cacheKey, data, 600).then(() => {
@@ -40905,7 +40973,10 @@ function useSectionRepo() {
   }
   async function getSection(options) {
     const query = {};
-    const cacheKeyOptions = { tag: "getSection" };
+    const cacheKeyOptions = {
+      tag: "getSection",
+      status: "notDeleted"
+    };
     try {
       query.school = new ObjectId34(options.school);
       cacheKeyOptions.school = String(options.school);
@@ -41060,7 +41131,7 @@ function useSectionRepo() {
       const updateValue = field === "adviser" ? new ObjectId34(value) : value;
       await collection.updateOne(
         { _id, deletedAt: { $in: ["", null] } },
-        { $set: { [field]: updateValue, updatedAt: (/* @__PURE__ */ new Date()).toISOString() } },
+        { $set: { [field]: updateValue, updatedAt: /* @__PURE__ */ new Date() } },
         { session }
       );
       delCachedData();
@@ -41080,7 +41151,7 @@ function useSectionRepo() {
         { _id, deletedAt: { $in: ["", null] } },
         {
           $addToSet: { students: studentId },
-          $set: { updatedAt: (/* @__PURE__ */ new Date()).toISOString() }
+          $set: { updatedAt: /* @__PURE__ */ new Date() }
         },
         { session }
       );
@@ -41102,7 +41173,7 @@ function useSectionRepo() {
         {
           // @ts-ignore
           $pull: { students: studentId },
-          $set: { updatedAt: (/* @__PURE__ */ new Date()).toISOString() }
+          $set: { updatedAt: /* @__PURE__ */ new Date() }
         },
         { session }
       );
@@ -41112,23 +41183,42 @@ function useSectionRepo() {
       throw new InternalServerError16("Failed to remove student from section.");
     }
   }
-  async function deleteById(_id) {
+  async function deleteById(_id, session) {
     try {
       _id = new ObjectId34(_id);
     } catch (error) {
       throw new BadRequestError56(namespace_collection + " Invalid ID.");
     }
     try {
-      await collection.updateOne(
-        { _id },
-        { $set: { status: "deleted", deletedAt: (/* @__PURE__ */ new Date()).toISOString() } }
-      );
+      await collection.deleteOne({ _id }, { session });
       delCachedData();
       return "Successfully deleted section.";
     } catch (error) {
       throw new InternalServerError16("Failed to delete section.");
     }
   }
+  async function deleteByIds(_id, session) {
+    if (_id && Array.isArray(_id)) {
+      _id = _id.map((id) => {
+        try {
+          return new ObjectId34(id);
+        } catch (error) {
+          throw new BadRequestError56(namespace_collection + " Invalid ID.");
+        }
+      });
+    }
+    try {
+      await collection.updateOne(
+        { _id: { $in: _id } },
+        { $set: { status: "deleted", deletedAt: /* @__PURE__ */ new Date() } },
+        { session }
+      );
+      delCachedData();
+      return "Successfully deleted sections.";
+    } catch (error) {
+      throw new InternalServerError16("Failed to delete sections.");
+    }
+  }
   async function updateSizeById(_id, size, session) {
     try {
       _id = new ObjectId34(_id);
@@ -41138,7 +41228,7 @@ function useSectionRepo() {
     try {
       await collection.updateOne(
         { _id },
-        { $set: { student: size, updateAt: /* @__PURE__ */ new Date() } },
+        { $set: { students: size, updateAt: /* @__PURE__ */ new Date() } },
         { session }
       );
       delCachedData();
@@ -41148,6 +41238,7 @@ function useSectionRepo() {
     }
   }
   return {
+    delCachedData,
     createIndexes,
     add,
     getAll,
@@ -41159,7 +41250,8 @@ function useSectionRepo() {
     addStudentToSection,
     removeStudentFromSection,
     deleteById,
-    updateSizeById
+    updateSizeById,
+    deleteByIds
   };
 }
 
@@ -41339,7 +41431,7 @@ function useSectionStudentRepo() {
     gradeLevel = "",
     section = "",
     schoolYear = ""
-  } = {}) {
+  } = {}, session) {
     const { error } = Joi37.object({
       page: Joi37.number().min(1).default(1),
       limit: Joi37.number().min(1).max(100).default(10),
@@ -41401,11 +41493,10 @@ function useSectionStudentRepo() {
       return cachedData;
     }
     page = page > 0 ? page - 1 : 0;
-    const items = await collection.aggregate([
-      { $match: query },
-      { $skip: page * limit },
-      { $limit: limit }
-    ]).toArray();
+    const items = await collection.aggregate(
+      [{ $match: query }, { $skip: page * limit }, { $limit: limit }],
+      { session }
+    ).toArray();
     const length = await collection.countDocuments(query);
     const data = paginate18(items, page, limit, length);
     setCache(cacheKey, data, 600).then(() => {
@@ -41480,6 +41571,13 @@ function useSectionStudentRepo() {
     } catch (error) {
       throw new BadRequestError58("Invalid section student ID.");
     }
+    try {
+      if (typeof options.section === "string") {
+        options.section = new ObjectId36(options.section);
+      }
+    } catch (error) {
+      throw new BadRequestError58("Invalid section ID.");
+    }
     try {
       await collection.updateMany({ _id }, { $set: options }, { session });
       delCachedData();
@@ -42492,6 +42590,32 @@ function useTeachingLoadSlotRepo() {
       }
     }
   }
+  async function deleteBySection(section, session) {
+    try {
+      section = new ObjectId40(section);
+    } catch (error) {
+      throw new BadRequestError63(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) {
+      logger35.log({
+        level: "error",
+        message: error.message
+      });
+      if (error instanceof AppError23) {
+        throw error;
+      } else {
+        throw new InternalServerError19("Failed to delete teaching load slot.");
+      }
+    }
+  }
   function delCachedData() {
     delNamespace().then(() => {
       logger35.log({
@@ -42512,7 +42636,8 @@ function useTeachingLoadSlotRepo() {
     getAll,
     getById,
     deleteById,
-    delCachedData
+    delCachedData,
+    deleteBySection
   };
 }
 
@@ -42628,6 +42753,43 @@ function useTeachingLoadSlotController() {
       next(error2);
     }
   }
+  async function getBySection(req, res, next) {
+    const section = req.params.section ?? "";
+    const validation = Joi42.string().hex().required();
+    const { error: errorTeacher } = validation.validate(section);
+    if (errorTeacher) {
+      next(new BadRequestError64(errorTeacher.message));
+      logger36.info(`Controller: ${errorTeacher.message}`);
+      return;
+    }
+    const query = req.query;
+    const schema = Joi42.object({
+      page: Joi42.number().min(1).optional().allow("", null),
+      limit: Joi42.number().min(1).max(100).optional().allow("", null),
+      status: Joi42.string().optional().allow("", null)
+    });
+    const { error } = schema.validate(query);
+    if (error) {
+      next(new BadRequestError64(error.message));
+      logger36.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 = Joi42.string().hex().required();
@@ -42816,7 +42978,8 @@ function useTeachingLoadSlotController() {
     getById,
     deleteById,
     getByTeachingLoad,
-    getByTeacher
+    getByTeacher,
+    getBySection
   };
 }
 
@@ -43390,15 +43553,25 @@ function usePersonnelController() {
 function useSectionService() {
   const { getCountByGradeLevel, getByGradeLevel: getLeanerByGradeLevel } = useLearnerRepo();
   const { getByGradeLevel } = useGradeLevelRepo();
-  const { add: createSection, getSection, updateSizeById } = useSectionRepo();
+  const {
+    add: createSection,
+    getSection,
+    updateSizeById,
+    getAll: getAllSection,
+    deleteById: deleteSectionById,
+    delCachedData: delCachedSectionData
+  } = useSectionRepo();
   const {
     add: assignStudent,
     getStudent,
-    updateSectionById
+    updateSectionById,
+    getAll: getAllStudents,
+    delCachedData: delCachedSectionStudentData
   } = useSectionStudentRepo();
   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 [];
@@ -43498,6 +43671,8 @@ function useSectionService() {
       let studentSkipped = 0;
       let subjectsAssigned = 0;
       let subjectsSkipped = 0;
+      await delCachedSectionData();
+      await delCachedSectionStudentData();
       for (let i = 0; i < sectionSizes.length; i++) {
         const size = sectionSizes[i];
         const sectionName = String(i + 1);
@@ -43512,11 +43687,7 @@ function useSectionService() {
           sectionId = existingSection._id?.toString() || "";
           sectionsSkipped++;
           if (size !== existingSection.students) {
-            await updateSizeById(
-              existingSection._id?.toString() || "",
-              size,
-              session
-            );
+            await updateSizeById(sectionId, size, session);
           }
         } else {
           sectionId = await createSection(
@@ -43558,14 +43729,13 @@ function useSectionService() {
           const existingStudent = await getStudent({
             student: student._id.toString(),
             schoolYear: value.schoolYear,
-            section: sectionId,
             gradeLevel: value.gradeLevel
           });
           if (existingStudent) {
             studentSkipped++;
-            if (existingStudent.section !== sectionId) {
+            if (String(existingStudent.section) !== sectionId) {
               await updateSectionById(
-                sectionId,
+                existingStudent._id?.toString() ?? "",
                 { section: sectionId, sectionName },
                 session
               );
@@ -43639,6 +43809,36 @@ function useSectionService() {
         }
       }
       await session.commitTransaction();
+      await session.startTransaction();
+      await delCachedSectionData();
+      await delCachedSectionStudentData();
+      const sections = await getAllSection(
+        {
+          school: value.school,
+          schoolYear: value.schoolYear,
+          gradeLevel: value.gradeLevel
+        },
+        session
+      );
+      if (sections && sections.items && sections.items.length) {
+        for (const section of sections.items) {
+          const sectionId = section._id?.toString() || "";
+          const students = await getAllStudents(
+            {
+              school: value.school,
+              schoolYear: value.schoolYear,
+              section: sectionId
+            },
+            session
+          );
+          if (students && students.items && students.items.length) {
+            continue;
+          }
+          await deleteSectionById(sectionId, session);
+          await deleteTeachingLoadSlotsBySection(sectionId, session);
+        }
+      }
+      await session.commitTransaction();
       return {
         message: "Sections generated successfully.",
         summary: {