@eeplatform/basic-edu 1.9.1 → 1.9.2

package/dist/index.mjs

@@ -3140,17 +3140,19 @@ function useEnrollmentRepo() {
     status = "active",
     school = "",
     schoolYear = "",
-    gradeLevelToEnroll = "",
-    createdBy = ""
+    createdBy = "",
+    gradeLevel = ""
   } = {}) {
     page = page > 0 ? page - 1 : 0;
     const query = {
       status
     };
     const cacheParams = {
+      status,
       page,
       limit,
-      sort: JSON.stringify(sort)
+      sort: JSON.stringify(sort),
+      tag: "getAll"
     };
     if (createdBy) {
       try {
@@ -3172,30 +3174,11 @@ function useEnrollmentRepo() {
       query.schoolYear = schoolYear;
       cacheParams.schoolYear = schoolYear;
     }
-    if (gradeLevelToEnroll) {
-      query.gradeLevelToEnroll = gradeLevelToEnroll;
-      cacheParams.gradeLevelToEnroll = gradeLevelToEnroll;
+    if (gradeLevel) {
+      query.gradeLevel = gradeLevel;
+      cacheParams.gradeLevel = gradeLevel;
     }
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
-    if (search) {
-      query.$or = [
-        { "learnerInfo.firstName": { $regex: search, $options: "i" } },
-        { "learnerInfo.lastName": { $regex: search, $options: "i" } },
-        { "learnerInfo.lrn": { $regex: search, $options: "i" } },
-        { schoolYear: { $regex: search, $options: "i" } },
-        { gradeLevelToEnroll: { $regex: search, $options: "i" } }
-      ];
-    }
-    if (search)
-      cacheParams.search = search;
-    if (status !== "active")
-      cacheParams.status = status;
-    if (school)
-      cacheParams.school = school;
-    if (schoolYear)
-      cacheParams.schoolYear = schoolYear;
-    if (gradeLevelToEnroll)
-      cacheParams.gradeLevelToEnroll = gradeLevelToEnroll;
     const cacheKey = makeCacheKey3(namespace_collection, cacheParams);
     logger8.log({
       level: "info",
@@ -35245,7 +35228,8 @@ function useEnrollmentController() {
       school: Joi16.string().hex().optional().allow("", null),
       schoolYear: Joi16.string().optional().allow("", null),
       gradeLevelToEnroll: Joi16.string().optional().allow("", null),
-      createdBy: Joi16.string().hex().optional().allow("", null)
+      createdBy: Joi16.string().hex().optional().allow("", null),
+      gradeLevel: Joi16.string().optional().allow("", null)
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -35258,6 +35242,7 @@ function useEnrollmentController() {
     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 gradeLevel = req.query.gradeLevel ?? "";
     const sortObj = {};
     if (sort && sort.length > 0 && sortOrder && sortOrder.length > 0 && sort.length === sortOrder.length) {
       for (let i = 0; i < sort.length; i++) {
@@ -35274,8 +35259,8 @@ function useEnrollmentController() {
         status: req.query.status,
         school: req.query.school,
         schoolYear: req.query.schoolYear,
-        gradeLevelToEnroll: req.query.gradeLevelToEnroll,
-        createdBy
+        createdBy,
+        gradeLevel
       });
       res.json(result);
       return;