@eeplatform/basic-edu 1.4.1 → 1.4.3

package/dist/index.mjs

@@ -1940,6 +1940,27 @@ function MLearner(value) {
       throw new BadRequestError4("Invalid school format");
     }
   }
+  if (value.createdBy && typeof value.createdBy === "string") {
+    try {
+      value.createdBy = new ObjectId3(value.createdBy);
+    } catch (error2) {
+      throw new BadRequestError4("Invalid createdBy format");
+    }
+  }
+  if (value.updatedBy && typeof value.updatedBy === "string") {
+    try {
+      value.updatedBy = new ObjectId3(value.updatedBy);
+    } catch (error2) {
+      throw new BadRequestError4("Invalid updatedBy format");
+    }
+  }
+  if (value.deletedBy && typeof value.deletedBy === "string") {
+    try {
+      value.deletedBy = new ObjectId3(value.deletedBy);
+    } catch (error2) {
+      throw new BadRequestError4("Invalid deletedBy format");
+    }
+  }
   return {
     _id: value._id ?? void 0,
     region: value.region,
@@ -2057,24 +2078,41 @@ function useEnrollmentRepo() {
     status = "active",
     school = "",
     schoolYear = "",
-    gradeLevelToEnroll = ""
+    gradeLevelToEnroll = "",
+    createdBy = ""
   } = {}) {
     page = page > 0 ? page - 1 : 0;
     const query = {
       status
     };
+    const cacheParams = {
+      page,
+      limit,
+      sort: JSON.stringify(sort)
+    };
+    if (createdBy) {
+      try {
+        query.createdBy = new ObjectId4(createdBy);
+        cacheParams.createdBy = createdBy;
+      } catch (error) {
+        throw new BadRequestError5("Invalid createdBy ID.");
+      }
+    }
     if (school) {
       try {
         query.school = new ObjectId4(school);
+        cacheParams.school = school;
       } catch (error) {
         throw new BadRequestError5("Invalid school ID.");
       }
     }
     if (schoolYear) {
       query.schoolYear = schoolYear;
+      cacheParams.schoolYear = schoolYear;
     }
     if (gradeLevelToEnroll) {
       query.gradeLevelToEnroll = gradeLevelToEnroll;
+      cacheParams.gradeLevelToEnroll = gradeLevelToEnroll;
     }
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     if (search) {
@@ -2086,11 +2124,6 @@ function useEnrollmentRepo() {
         { gradeLevelToEnroll: { $regex: search, $options: "i" } }
       ];
     }
-    const cacheParams = {
-      page,
-      limit,
-      sort: JSON.stringify(sort)
-    };
     if (search)
       cacheParams.search = search;
     if (status !== "active")
@@ -3010,7 +3043,8 @@ function useEnrollmentController() {
       status: Joi7.string().optional().allow("", null),
       school: Joi7.string().hex().optional().allow("", null),
       schoolYear: Joi7.string().optional().allow("", null),
-      gradeLevelToEnroll: Joi7.string().optional().allow("", null)
+      gradeLevelToEnroll: Joi7.string().optional().allow("", null),
+      createdBy: Joi7.string().hex().optional().allow("", null)
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -3022,6 +3056,7 @@ function useEnrollmentController() {
     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 createdBy = req.query.createdBy ?? "";
     const sortObj = {};
     if (sort && sort.length > 0 && sortOrder && sortOrder.length > 0 && sort.length === sortOrder.length) {
       for (let i = 0; i < sort.length; i++) {
@@ -3038,7 +3073,8 @@ function useEnrollmentController() {
         status: req.query.status,
         school: req.query.school,
         schoolYear: req.query.schoolYear,
-        gradeLevelToEnroll: req.query.gradeLevelToEnroll
+        gradeLevelToEnroll: req.query.gradeLevelToEnroll,
+        createdBy
       });
       res.json(result);
       return;