@eeplatform/basic-edu 1.10.1 → 1.10.3

package/dist/index.mjs

@@ -39352,6 +39352,7 @@ var schemaSection = Joi31.object({
   _id: Joi31.string().hex().optional().allow(null, ""),
   school: Joi31.string().hex().required(),
   name: Joi31.string().min(1).max(100).required(),
+  label: Joi31.string().max(100).optional().allow(null, ""),
   schoolYear: Joi31.string().required(),
   gradeLevel: Joi31.string().required(),
   students: Joi31.number().integer().min(0).optional(),
@@ -39368,8 +39369,7 @@ var schemaGenerateSections = Joi31.object({
   gradeLevel: Joi31.string().required(),
   minStudents: Joi31.number().integer().min(1).required(),
   maxStudents: Joi31.number().integer().min(Joi31.ref("minStudents")).required(),
-  specialProgram: Joi31.string().hex().optional().allow(null, ""),
-  set: Joi31.array().items(Joi31.string().min(1).max(100)).required()
+  specialProgram: Joi31.string().hex().optional().allow(null, "")
 });
 function modelSection(value) {
   const { error } = schemaSection.validate(value);
@@ -39401,6 +39401,7 @@ function modelSection(value) {
     _id: value._id,
     school: value.school,
     name: value.name,
+    label: value.label ?? "",
     schoolYear: value.schoolYear,
     gradeLevel: value.gradeLevel,
     adviser: value.adviser,
@@ -39444,7 +39445,7 @@ function useSectionRepo() {
         { key: { createdAt: 1 } },
         { key: { name: "text", schoolYear: "text", gradeLevel: "text" } },
         {
-          key: { school: 1, name: 1, schoolYear: 1, status: 1 },
+          key: { school: 1, teacher: 1, schoolYear: 1, status: 1 },
           unique: true,
           name: "unique_section"
         }
@@ -39471,7 +39472,7 @@ function useSectionRepo() {
       value = modelSection(value);
       const res = await collection.insertOne(value, { session });
       delCachedData();
-      return res.insertedId;
+      return res.insertedId.toString();
     } catch (error) {
       logger27.log({
         level: "error",
@@ -39612,6 +39613,54 @@ function useSectionRepo() {
       }
     }
   }
+  async function getSection(options) {
+    const query = {};
+    const cacheKeyOptions = { tag: "getSection" };
+    try {
+      query.school = new ObjectId30(options.school);
+      cacheKeyOptions.school = String(options.school);
+    } catch (error) {
+      throw new BadRequestError49("Invalid school ID.");
+    }
+    query.gradeLevel = options.gradeLevel;
+    cacheKeyOptions.gradeLevel = options.gradeLevel;
+    query.name = options.name;
+    cacheKeyOptions.name = options.name;
+    if (options.schoolYear) {
+      query.schoolYear = options.schoolYear;
+      cacheKeyOptions.schoolYear = options.schoolYear;
+    }
+    const cacheKey = makeCacheKey16(namespace_collection, cacheKeyOptions);
+    try {
+      const cached = await getCache(cacheKey);
+      if (cached) {
+        logger27.log({
+          level: "info",
+          message: `Cache hit for getSection: ${cacheKey}`
+        });
+        return cached;
+      }
+      const result = await collection.findOne(query);
+      setCache(cacheKey, result, 300).then(() => {
+        logger27.log({
+          level: "info",
+          message: `Cache set for section: ${cacheKey}`
+        });
+      }).catch((err) => {
+        logger27.log({
+          level: "error",
+          message: `Failed to set cache for section: ${err.message}`
+        });
+      });
+      return result;
+    } catch (error) {
+      if (error instanceof AppError17) {
+        throw error;
+      } else {
+        throw new InternalServerError14("Failed to get section.");
+      }
+    }
+  }
   async function getByName(name) {
     const cacheKey = makeCacheKey16(namespace_collection, { name });
     try {
@@ -39795,6 +39844,7 @@ function useSectionRepo() {
     add,
     getAll,
     getById,
+    getSection,
     getByName,
     getBySchool,
     updateFieldById,
@@ -40053,11 +40103,73 @@ function useSectionStudentRepo() {
     });
     return data;
   }
+  async function getStudent(options) {
+    const query = {};
+    const cacheKeyOptions = { tag: "getStudent" };
+    if (options.learner) {
+      try {
+        query.learner = new ObjectId32(options.learner);
+        cacheKeyOptions.learner = String(options.learner);
+      } catch (error) {
+        throw new BadRequestError51("Invalid learner ID.");
+      }
+    }
+    if (options.schoolYear) {
+      query.schoolYear = options.schoolYear;
+      cacheKeyOptions.schoolYear = options.schoolYear;
+    }
+    if (options.section) {
+      try {
+        query.section = new ObjectId32(options.section);
+        cacheKeyOptions.section = String(options.section);
+      } catch (error) {
+        throw new BadRequestError51("Invalid section ID.");
+      }
+    }
+    if (options.gradeLevel) {
+      query.gradeLevel = options.gradeLevel;
+      cacheKeyOptions.gradeLevel = options.gradeLevel;
+    }
+    try {
+      query.student = new ObjectId32(options.student);
+      cacheKeyOptions.student = String(options.student);
+    } catch (error) {
+      throw new BadRequestError51("Invalid student ID.");
+    }
+    const cacheKey = makeCacheKey17(namespace_collection, cacheKeyOptions);
+    try {
+      const cached = await getCache(cacheKey);
+      if (cached) {
+        logger28.log({
+          level: "info",
+          message: `Cache hit for getStudent section student: ${cacheKey}`
+        });
+        return cached;
+      }
+      const item = await collection.findOne(query);
+      setCache(cacheKey, item, 600).then(() => {
+        logger28.log({
+          level: "info",
+          message: `Cache set for getStudent section student: ${cacheKey}`
+        });
+      }).catch((err) => {
+        logger28.log({
+          level: "error",
+          message: `Failed to set cache for getStudent section student: ${err.message}`
+        });
+      });
+      return item;
+    } catch (error) {
+      logger28.log({ level: "error", message: `${error}` });
+      throw error;
+    }
+  }
   return {
     createIndexes,
     delCachedData,
     add,
-    getAll
+    getAll,
+    getStudent
   };
 }
 
@@ -40403,6 +40515,63 @@ function useSectionSubjectRepo() {
       }
     }
   }
+  async function getSectionSubject(options) {
+    const query = {};
+    const cacheKeyOptions = { tag: "getSectionSubject" };
+    if (options.gradeLevel) {
+      query.gradeLevel = options.gradeLevel;
+      cacheKeyOptions.gradeLevel = options.gradeLevel;
+    }
+    if (options.schoolYear) {
+      query.schoolYear = options.schoolYear;
+      cacheKeyOptions.schoolYear = options.schoolYear;
+    }
+    if (options.subjectCode) {
+      query.subjectCode = options.subjectCode;
+      cacheKeyOptions.subjectCode = options.subjectCode;
+    }
+    try {
+      query.section = new ObjectId34(options.section);
+      cacheKeyOptions.section = String(options.section);
+    } catch (error) {
+      throw new BadRequestError53("Invalid section ID.");
+    }
+    const cacheKey = makeCacheKey18(namespace_collection, cacheKeyOptions);
+    try {
+      const cached = await getCache(cacheKey);
+      if (cached) {
+        logger29.log({
+          level: "info",
+          message: `Cache hit for getSectionSubject section subjects: ${cacheKey}`
+        });
+        return cached;
+      }
+      const result = await collection.find({
+        ...query,
+        deletedAt: { $in: ["", null] }
+      }).toArray();
+      setCache(cacheKey, result, 300).then(() => {
+        logger29.log({
+          level: "info",
+          message: `Cache set for section subjects by getSectionSubject: ${cacheKey}`
+        });
+      }).catch((err) => {
+        logger29.log({
+          level: "error",
+          message: `Failed to set cache for section subjects by getSectionSubject: ${err.message}`
+        });
+      });
+      return result;
+    } catch (error) {
+      if (error instanceof AppError19) {
+        throw error;
+      } else {
+        throw new InternalServerError16(
+          "Failed to get section subjects by getSectionSubject."
+        );
+      }
+    }
+  }
   async function getBySection(section) {
     try {
       section = new ObjectId34(section);
@@ -40635,6 +40804,7 @@ function useSectionSubjectRepo() {
     add,
     getAll,
     getById,
+    getSectionSubject,
     getBySection,
     getByTeacher,
     getBySchool,
@@ -41024,7 +41194,13 @@ function useTeachingLoadRepo() {
         { key: { status: 1 } },
         { key: { school: 1 } },
         { key: { teacher: 1 } },
-        { key: { schoolYear: 1 } }
+        { key: { gradeLevel: 1 } },
+        { key: { schoolYear: 1 } },
+        {
+          key: { school: 1, teacher: 1, schoolYear: 1, gradeLevel: 1 },
+          unique: true,
+          name: "unique_teaching_load_index"
+        }
       ]);
     } catch (error) {
       throw new Error("Failed to create index on teaching load.");
@@ -41044,7 +41220,11 @@ function useTeachingLoadRepo() {
       if (error instanceof AppError21) {
         throw error;
       } else {
-        throw new Error("Failed to create teaching load.");
+        const isDuplicated = error.message.includes("duplicate");
+        if (isDuplicated) {
+          throw new BadRequestError56("Teaching load already exist.");
+        }
+        throw new InternalServerError18("Failed to create teaching load.");
       }
     }
   }
@@ -41249,23 +41429,32 @@ function useTeachingLoadRepo() {
       }
     }
   }
-  async function getByTeacher(teacher, schoolYear) {
+  async function getByTeacher(options) {
+    const query = {};
+    const cacheKeyOptions = { tag: "getByTeacher" };
+    if (options.status) {
+      query.status = options.status;
+      cacheKeyOptions.status = options.status;
+    }
     try {
-      teacher = new ObjectId36(teacher);
+      query.teacher = new ObjectId36(options.teacher);
     } catch (error) {
       throw new BadRequestError56("Invalid teacher ID.");
     }
-    const query = {
-      teacher,
-      status: "active"
-    };
-    if (schoolYear) {
-      query.schoolYear = schoolYear;
+    cacheKeyOptions.teacher = String(options.teacher);
+    if (options.schoolYear) {
+      query.schoolYear = options.schoolYear;
+      cacheKeyOptions.schoolYear = options.schoolYear;
     }
-    const cacheKey = makeCacheKey19(namespace_collection, {
-      teacher: String(teacher),
-      schoolYear
-    });
+    if (options.school) {
+      try {
+        query.school = new ObjectId36(options.school);
+      } catch (error) {
+        throw new BadRequestError56("Invalid school ID.");
+      }
+      cacheKeyOptions.school = String(options.school);
+    }
+    const cacheKey = makeCacheKey19(namespace_collection, cacheKeyOptions);
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
@@ -41519,7 +41708,7 @@ function useTeachingLoadController() {
       return;
     }
     try {
-      const result = await _getByTeacher(teacher, schoolYear);
+      const result = await _getByTeacher({ teacher, schoolYear });
       res.json(result);
       return;
     } catch (error2) {
@@ -42382,7 +42571,9 @@ function usePersonnelRepo() {
     page = 1,
     limit = 10,
     sort = {},
-    status = "active"
+    status = "active",
+    gradeLevel = "",
+    classification = ""
   } = {}) {
     page = page > 0 ? page - 1 : 0;
     const query = {
@@ -42406,6 +42597,14 @@ function usePersonnelRepo() {
       }
       cacheParams.school = school;
     }
+    if (gradeLevel) {
+      query.gradeLevels = gradeLevel;
+      cacheParams.gradeLevel = gradeLevel;
+    }
+    if (classification) {
+      query.classification = classification;
+      cacheParams.classification = classification;
+    }
     const cacheKey = makeCacheKey21(namespace_collection, cacheParams);
     logger37.log({
       level: "info",
@@ -42794,13 +42993,13 @@ function usePersonnelController() {
 function useSectionService() {
   const { getCountByGradeLevel, getByGradeLevel: getLeanerByGradeLevel } = useLearnerRepo();
   const { getByGradeLevel } = useGradeLevelRepo();
-  const { add: createSection } = useSectionRepo();
-  const { add: assignStudent } = useSectionStudentRepo();
+  const { add: createSection, getSection } = useSectionRepo();
+  const { add: assignStudent, getStudent } = useSectionStudentRepo();
   const { getAll: getAllCurriculumSubjects } = useSubjectRepo();
-  const { add: addSectionSubject } = useSectionSubjectRepo();
+  const { add: addSectionSubject, getSectionSubject } = useSectionSubjectRepo();
   const { getById: getSchoolById } = useSchoolRepo();
   const { getAll: getAllPersonnel } = usePersonnelRepo();
-  const { add: addTeachingLoad } = useTeachingLoadRepo();
+  const { add: addTeachingLoad, getByTeacher } = useTeachingLoadRepo();
   function distributeStudents(total, minPer, maxPer) {
     if (total <= 0)
       return [];
@@ -42871,12 +43070,6 @@ function useSectionService() {
       }
       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 BadRequestError64(
-          "Insufficient number of section names in set[]."
-        );
-      }
       const sectionSizes = distributeStudents(
         studentCount,
         minPerSection,
@@ -42890,10 +43083,30 @@ function useSectionService() {
         throw new BadRequestError64("School not found.");
       }
       let totalStudentsProcessed = 0;
+      let sectionsGenerated = 0;
+      let sectionsSkipped = 0;
+      let teachingLoadsCreated = 0;
+      let teachingLoadsSkipped = 0;
+      let studentCreated = 0;
+      let studentSkipped = 0;
+      let subjectsAssigned = 0;
+      let subjectsSkipped = 0;
       for (let i = 0; i < sectionSizes.length; i++) {
         const size = sectionSizes[i];
-        const sectionName = value.set[i];
-        const section = await createSection(
+        const sectionName = String(i + 1);
+        const existingSection = await getSection({
+          gradeLevel: value.gradeLevel,
+          schoolYear: value.schoolYear,
+          name: sectionName,
+          school: value.school
+        });
+        let sectionId = "";
+        if (existingSection) {
+          sectionId = existingSection._id?.toString() || "";
+          sectionsSkipped++;
+          continue;
+        }
+        sectionId = await createSection(
           {
             school: value.school,
             schoolYear: value.schoolYear,
@@ -42903,6 +43116,10 @@ function useSectionService() {
           },
           session
         );
+        if (!sectionId) {
+          throw new InternalServerError21("Required section ID is missing.");
+        }
+        sectionsGenerated++;
         const skip = totalStudentsProcessed;
         const learners = await getLeanerByGradeLevel(
           {
@@ -42924,9 +43141,19 @@ function useSectionService() {
           if (!student.learnerInfo.lrn) {
             throw new BadRequestError64("Learner LRN is missing.");
           }
+          const existingStudent = await getStudent({
+            student: student._id.toString(),
+            schoolYear: value.schoolYear,
+            section: sectionId,
+            gradeLevel: value.gradeLevel
+          });
+          if (existingStudent) {
+            studentSkipped++;
+            continue;
+          }
           await assignStudent(
             {
-              section: section.toString(),
+              section: sectionId,
               lrn: student.learnerInfo.lrn,
               student: student._id?.toString(),
               studentName: `${student.learnerInfo.firstName} ${student.learnerInfo.lastName}`,
@@ -42939,37 +43166,50 @@ function useSectionService() {
             },
             session
           );
+          studentCreated++;
         }
-        const curriculumSubjects = await getAllCurriculumSubjects({
-          schoolYear: Number(value.schoolYear),
-          gradeLevel: value.gradeLevel,
-          limit: 20
-        });
-        for (const curriculumSubject of curriculumSubjects.items) {
-          await addSectionSubject(
-            {
-              curriculum: curriculumSubject.curriculum.toString(),
-              school: value.school,
-              schoolName: schoolData.name,
-              gradeLevel: value.gradeLevel,
-              educationLevel: gradeLevelData.educationLevel,
-              schoolYear: value.schoolYear,
-              section: section.toString(),
-              sectionName,
+        if (value.gradeLevel !== "kindergarten") {
+          const curriculumSubjects = await getAllCurriculumSubjects({
+            schoolYear: Number(value.schoolYear),
+            gradeLevel: value.gradeLevel,
+            limit: 20
+          });
+          for (const curriculumSubject of curriculumSubjects.items) {
+            const existingSectionSubject = await getSectionSubject({
+              section: sectionId,
               subjectCode: curriculumSubject.subjectCode,
-              subjectName: curriculumSubject.subjectName,
-              teacher: "",
-              teacherName: "",
-              schedule: "",
-              daysOfWeek: [],
-              classroom: "",
-              classroomName: "",
-              sessionDuration: curriculumSubject.sessionDuration,
-              sessionFrequency: curriculumSubject.sessionFrequency,
-              status: "draft"
-            },
-            session
-          );
+              schoolYear: value.schoolYear
+            });
+            if (existingSectionSubject && existingSectionSubject.length) {
+              subjectsSkipped++;
+              continue;
+            }
+            await addSectionSubject(
+              {
+                curriculum: curriculumSubject.curriculum.toString(),
+                school: value.school,
+                schoolName: schoolData.name,
+                gradeLevel: value.gradeLevel,
+                educationLevel: gradeLevelData.educationLevel,
+                schoolYear: value.schoolYear,
+                section: sectionId,
+                sectionName,
+                subjectCode: curriculumSubject.subjectCode,
+                subjectName: curriculumSubject.subjectName,
+                teacher: "",
+                teacherName: "",
+                schedule: "",
+                daysOfWeek: [],
+                classroom: "",
+                classroomName: "",
+                sessionDuration: curriculumSubject.sessionDuration,
+                sessionFrequency: curriculumSubject.sessionFrequency,
+                status: "draft"
+              },
+              session
+            );
+            subjectsAssigned++;
+          }
         }
       }
       let pageTeacher = 1;
@@ -42978,7 +43218,9 @@ function useSectionService() {
       do {
         const teachersData = await getAllPersonnel({
           school: value.school,
-          limit: 100
+          limit: 100,
+          gradeLevel: value.gradeLevel,
+          classification: "teaching"
         });
         pagesTeachers = teachersData.pages;
         teachers.push(...teachersData.items);
@@ -42990,11 +43232,19 @@ function useSectionService() {
         );
       }
       if (teachers.length) {
-        for (let index = 0; index < teachers.length; index++) {
-          const teacher = teachers[index];
+        for (const teacher of teachers) {
           if (!teacher._id) {
             throw new BadRequestError64("Teacher ID is missing.");
           }
+          const existingLoad = await getByTeacher({
+            teacher: teacher._id.toString(),
+            school: value.school,
+            schoolYear: value.schoolYear
+          });
+          if (existingLoad && existingLoad.length) {
+            teachingLoadsSkipped++;
+            continue;
+          }
           await addTeachingLoad(
             {
               school: value.school,
@@ -43006,10 +43256,26 @@ function useSectionService() {
             },
             session
           );
+          teachingLoadsCreated++;
         }
       }
       await session.commitTransaction();
-      return "Sections generated successfully.";
+      return {
+        message: "Sections generated successfully.",
+        summary: {
+          sectionsGenerated,
+          sectionsSkipped,
+          totalSections: sectionsGenerated + sectionsSkipped,
+          studentsProcessed: totalStudentsProcessed,
+          studentCreated,
+          studentSkipped,
+          subjectsAssigned,
+          subjectsSkipped,
+          teachingLoadsCreated,
+          teachingLoadsSkipped,
+          totalStudents: studentCount
+        }
+      };
     } catch (error2) {
       await session.abortTransaction();
       if (error2 instanceof AppError25) {
@@ -43047,12 +43313,6 @@ function useSectionService() {
       }
       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 BadRequestError64(
-          "Insufficient number of section names in set[]."
-        );
-      }
       const sectionSizes = distributeStudents(
         studentCount,
         minPerSection,
@@ -43062,7 +43322,7 @@ function useSectionService() {
         throw new BadRequestError64("Unable to compute section sizes.");
       }
       const sections = sectionSizes.map((size, index) => ({
-        name: value.set[index],
+        name: `${index + 1}`,
         value: size
       }));
       return {