@eeplatform/basic-edu 1.10.7 → 1.10.8

package/dist/index.mjs

@@ -40788,7 +40788,7 @@ function useSectionRepo() {
     school = "",
     schoolYear = "",
     gradeLevel = ""
-  } = {}) {
+  } = {}, session) {
     page = page > 0 ? page - 1 : 0;
     const query = {
       deletedAt: { $in: ["", null] },
@@ -40835,12 +40835,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 +40908,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 +41066,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 +41086,7 @@ function useSectionRepo() {
         { _id, deletedAt: { $in: ["", null] } },
         {
           $addToSet: { students: studentId },
-          $set: { updatedAt: (/* @__PURE__ */ new Date()).toISOString() }
+          $set: { updatedAt: /* @__PURE__ */ new Date() }
         },
         { session }
       );
@@ -41102,7 +41108,7 @@ function useSectionRepo() {
         {
           // @ts-ignore
           $pull: { students: studentId },
-          $set: { updatedAt: (/* @__PURE__ */ new Date()).toISOString() }
+          $set: { updatedAt: /* @__PURE__ */ new Date() }
         },
         { session }
       );
@@ -41112,23 +41118,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 +41163,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 +41173,7 @@ function useSectionRepo() {
     }
   }
   return {
+    delCachedData,
     createIndexes,
     add,
     getAll,
@@ -41159,7 +41185,8 @@ function useSectionRepo() {
     addStudentToSection,
     removeStudentFromSection,
     deleteById,
-    updateSizeById
+    updateSizeById,
+    deleteByIds
   };
 }
 
@@ -41339,7 +41366,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 +41428,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 +41506,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();
@@ -43390,11 +43423,20 @@ 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();
@@ -43498,6 +43540,9 @@ function useSectionService() {
       let studentSkipped = 0;
       let subjectsAssigned = 0;
       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);
@@ -43512,11 +43557,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 +43599,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 +43679,35 @@ 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 session.commitTransaction();
       return {
         message: "Sections generated successfully.",
         summary: {
@@ -43656,6 +43725,7 @@ function useSectionService() {
         }
       };
     } catch (error2) {
+      console.log(error2);
       await session.abortTransaction();
       if (error2 instanceof AppError26) {
         throw error2;