@eeplatform/basic-edu 1.3.11 → 1.3.12

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @eeplatform/basic-edu
 
+## 1.3.12
+
+### Patch Changes
+
+- f4c3853: Revise get all enrollment query
+
 ## 1.3.11
 
 ### Patch Changes

package/dist/index.d.ts

@@ -87,7 +87,8 @@ type BasicEducEnrForm = {
     cityMunicipality: string;
     division: string;
     divisionName?: string;
-    school: string;
+    schoolId: string;
+    school: ObjectId;
     schoolName?: string;
     schoolYear: string;
     gradeLevel: string;
@@ -176,7 +177,8 @@ declare function MEnrollment(value: BasicEducEnrForm): {
     cityMunicipality: string;
     division: string;
     divisionName: string;
-    school: string;
+    school: ObjectId;
+    schoolId: string;
     schoolName: string;
     schoolYear: string;
     gradeLevel: string;

package/dist/index.js

@@ -1904,9 +1904,11 @@ var schemaEnrollment = import_joi3.default.object({
   division: import_joi3.default.string().required(),
   // Changed from hex to string to match frontend
   divisionName: import_joi3.default.string().optional().allow("", null),
-  school: import_joi3.default.string().required(),
+  schoolId: import_joi3.default.string().required(),
   // Changed from hex to string to match frontend
-  schoolName: import_joi3.default.string().optional().allow("", null),
+  school: import_joi3.default.string().hex().required(),
+  // Added to match frontend
+  schoolName: import_joi3.default.string().required(),
   // Added to match frontend
   schoolYear: import_joi3.default.string().required(),
   gradeLevel: import_joi3.default.string().valid(...gradeLevels).required(),
@@ -1977,6 +1979,7 @@ function MEnrollment(value) {
     division: value.division,
     divisionName: value.divisionName ?? "",
     school: value.school,
+    schoolId: value.schoolId,
     schoolName: value.schoolName ?? "",
     // Added to match frontend
     schoolYear: value.schoolYear ?? "",
@@ -2109,7 +2112,11 @@ function useEnrollmentRepo() {
       status
     };
     if (school) {
-      query.school = school;
+      try {
+        query.school = new import_mongodb4.ObjectId(school);
+      } catch (error) {
+        throw new import_nodejs_utils5.BadRequestError("Invalid school ID.");
+      }
     }
     if (schoolYear) {
       query.schoolYear = schoolYear;
@@ -2156,41 +2163,13 @@ function useEnrollmentRepo() {
         });
         return cached;
       }
-      const items = await collection.aggregate([
-        { $match: query },
-        {
-          $lookup: {
-            from: "admin.schools",
-            localField: "school",
-            foreignField: "_id",
-            // School collection still uses ObjectId, we'll need to convert during lookup
-            as: "schoolInfo"
-          }
-        },
-        {
-          $lookup: {
-            from: "admin.regions",
-            localField: "region",
-            foreignField: "_id",
-            // Region collection still uses ObjectId, we'll need to convert during lookup
-            as: "regionInfo"
-          }
-        },
-        {
-          $lookup: {
-            from: "admin.divisions",
-            localField: "division",
-            // Changed from sdo to division to match frontend
-            foreignField: "_id",
-            // Division collection still uses ObjectId, we'll need to convert during lookup
-            as: "divisionInfo"
-            // Changed from sdoInfo to divisionInfo
-          }
-        },
-        { $sort: sort },
-        { $skip: page * limit },
-        { $limit: limit }
-      ]).toArray();
+      const pipeline = [{ $match: query }];
+      if (Object.keys(sort).length) {
+        pipeline.push({ $sort: sort });
+      }
+      pipeline.push({ $skip: page * limit });
+      pipeline.push({ $limit: limit });
+      const items = await collection.aggregate(pipeline).toArray();
       const length = await collection.countDocuments(query);
       const data = (0, import_nodejs_utils5.paginate)(items, page, limit, length);
       setCache(cacheKey, data, 600).then(() => {
@@ -2504,7 +2483,7 @@ function useEnrollmentService() {
         placeOfBirth: value.learnerInfo.placeOfBirth,
         gradeLevel: value.gradeLevel,
         schoolYear: value.schoolYear,
-        school: value.school
+        school: value.schoolId
       });
       if (applicantInfo.accepted) {
         throw new import_nodejs_utils6.BadRequestError(