@eeplatform/basic-edu 1.10.7 → 1.10.8

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @eeplatform/basic-edu
 
+## 1.10.8
+
+### Patch Changes
+
+- cf34525: Section management - fix section generation
+
 ## 1.10.7
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1012,6 +1012,7 @@ declare const schemaGenerateSections: Joi.ObjectSchema<any>;
 declare function modelSection(value: TSection): TSection;
 
 declare function useSectionRepo(): {
+    delCachedData: () => void;
     createIndexes: () => Promise<void>;
     add: (value: TSection, session?: ClientSession) => Promise<string>;
     getAll: ({ search, page, limit, sort, status, school, schoolYear, gradeLevel, }?: {
@@ -1023,7 +1024,7 @@ declare function useSectionRepo(): {
         school?: string | undefined;
         schoolYear?: string | undefined;
         gradeLevel?: string | undefined;
-    }) => Promise<Record<string, any> | {
+    }, session?: ClientSession) => Promise<Record<string, any> | {
         items: any[];
         pages: number;
         pageRange: string;
@@ -1044,8 +1045,9 @@ declare function useSectionRepo(): {
     }, session?: ClientSession) => Promise<string>;
     addStudentToSection: (_id: string | ObjectId, studentId: string, session?: ClientSession) => Promise<string>;
     removeStudentFromSection: (_id: string | ObjectId, studentId: string, session?: ClientSession) => Promise<string>;
-    deleteById: (_id: string | ObjectId) => Promise<string>;
+    deleteById: (_id: string | ObjectId, session?: ClientSession) => Promise<string>;
     updateSizeById: (_id: string | ObjectId, size: number, session?: ClientSession) => Promise<string>;
+    deleteByIds: (_id: string[] | ObjectId[], session?: ClientSession) => Promise<string>;
 };
 
 declare function useSectionController(): {
@@ -1095,7 +1097,11 @@ declare function useSectionStudentRepo(): {
         gradeLevel?: string;
         section?: string | ObjectId;
         schoolYear?: string;
-    }) => Promise<{}>;
+    }, session?: ClientSession) => Promise<{
+        items: any[];
+        pages: number;
+        pageRange: string;
+    }>;
     getStudent: (options: {
         schoolYear?: string;
         section?: string | ObjectId;

package/dist/index.js

@@ -40747,7 +40747,7 @@ function useSectionRepo() {
     school = "",
     schoolYear = "",
     gradeLevel = ""
-  } = {}) {
+  } = {}, session) {
     page = page > 0 ? page - 1 : 0;
     const query = {
       deletedAt: { $in: ["", null] },
@@ -40794,12 +40794,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 = (0, import_nodejs_utils59.paginate)(items, page, limit, length);
       setCache(cacheKey, data, 600).then(() => {
@@ -40864,7 +40867,10 @@ function useSectionRepo() {
   }
   async function getSection(options) {
     const query = {};
-    const cacheKeyOptions = { tag: "getSection" };
+    const cacheKeyOptions = {
+      tag: "getSection",
+      status: "notDeleted"
+    };
     try {
       query.school = new import_mongodb34.ObjectId(options.school);
       cacheKeyOptions.school = String(options.school);
@@ -41019,7 +41025,7 @@ function useSectionRepo() {
       const updateValue = field === "adviser" ? new import_mongodb34.ObjectId(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();
@@ -41039,7 +41045,7 @@ function useSectionRepo() {
         { _id, deletedAt: { $in: ["", null] } },
         {
           $addToSet: { students: studentId },
-          $set: { updatedAt: (/* @__PURE__ */ new Date()).toISOString() }
+          $set: { updatedAt: /* @__PURE__ */ new Date() }
         },
         { session }
       );
@@ -41061,7 +41067,7 @@ function useSectionRepo() {
         {
           // @ts-ignore
           $pull: { students: studentId },
-          $set: { updatedAt: (/* @__PURE__ */ new Date()).toISOString() }
+          $set: { updatedAt: /* @__PURE__ */ new Date() }
         },
         { session }
       );
@@ -41071,23 +41077,42 @@ function useSectionRepo() {
       throw new import_nodejs_utils59.InternalServerError("Failed to remove student from section.");
     }
   }
-  async function deleteById(_id) {
+  async function deleteById(_id, session) {
     try {
       _id = new import_mongodb34.ObjectId(_id);
     } catch (error) {
       throw new import_nodejs_utils59.BadRequestError(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 import_nodejs_utils59.InternalServerError("Failed to delete section.");
     }
   }
+  async function deleteByIds(_id, session) {
+    if (_id && Array.isArray(_id)) {
+      _id = _id.map((id) => {
+        try {
+          return new import_mongodb34.ObjectId(id);
+        } catch (error) {
+          throw new import_nodejs_utils59.BadRequestError(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 import_nodejs_utils59.InternalServerError("Failed to delete sections.");
+    }
+  }
   async function updateSizeById(_id, size, session) {
     try {
       _id = new import_mongodb34.ObjectId(_id);
@@ -41097,7 +41122,7 @@ function useSectionRepo() {
     try {
       await collection.updateOne(
         { _id },
-        { $set: { student: size, updateAt: /* @__PURE__ */ new Date() } },
+        { $set: { students: size, updateAt: /* @__PURE__ */ new Date() } },
         { session }
       );
       delCachedData();
@@ -41107,6 +41132,7 @@ function useSectionRepo() {
     }
   }
   return {
+    delCachedData,
     createIndexes,
     add,
     getAll,
@@ -41118,7 +41144,8 @@ function useSectionRepo() {
     addStudentToSection,
     removeStudentFromSection,
     deleteById,
-    updateSizeById
+    updateSizeById,
+    deleteByIds
   };
 }
 
@@ -41284,7 +41311,7 @@ function useSectionStudentRepo() {
     gradeLevel = "",
     section = "",
     schoolYear = ""
-  } = {}) {
+  } = {}, session) {
     const { error } = import_joi37.default.object({
       page: import_joi37.default.number().min(1).default(1),
       limit: import_joi37.default.number().min(1).max(100).default(10),
@@ -41346,11 +41373,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 = (0, import_nodejs_utils61.paginate)(items, page, limit, length);
     setCache(cacheKey, data, 600).then(() => {
@@ -41425,6 +41451,13 @@ function useSectionStudentRepo() {
     } catch (error) {
       throw new import_nodejs_utils61.BadRequestError("Invalid section student ID.");
     }
+    try {
+      if (typeof options.section === "string") {
+        options.section = new import_mongodb36.ObjectId(options.section);
+      }
+    } catch (error) {
+      throw new import_nodejs_utils61.BadRequestError("Invalid section ID.");
+    }
     try {
       await collection.updateMany({ _id }, { $set: options }, { session });
       delCachedData();
@@ -43308,11 +43341,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();
@@ -43416,6 +43458,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);
@@ -43430,11 +43475,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(
@@ -43476,14 +43517,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
               );
@@ -43557,6 +43597,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: {
@@ -43574,6 +43643,7 @@ function useSectionService() {
         }
       };
     } catch (error2) {
+      console.log(error2);
       await session.abortTransaction();
       if (error2 instanceof import_nodejs_utils72.AppError) {
         throw error2;