@eeplatform/basic-edu 1.9.1 → 1.9.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @eeplatform/basic-edu
 
+## 1.9.2
+
+### Patch Changes
+
+- d156fe7: Revise get all query
+
 ## 1.9.1
 
 ### Patch Changes

package/dist/index.d.ts

@@ -336,7 +336,7 @@ declare function MLearner(value: TEnrollment): {
 declare function useEnrollmentRepo(): {
     createIndexes: () => Promise<void>;
     add: (value: TLearner, session?: ClientSession) => Promise<ObjectId>;
-    getAll: ({ search, page, limit, sort, status, school, schoolYear, gradeLevelToEnroll, createdBy, }?: {
+    getAll: ({ search, page, limit, sort, status, school, schoolYear, createdBy, gradeLevel, }?: {
         search?: string | undefined;
         page?: number | undefined;
         limit?: number | undefined;
@@ -344,8 +344,8 @@ declare function useEnrollmentRepo(): {
         status?: string | undefined;
         school?: string | undefined;
         schoolYear?: string | undefined;
-        gradeLevelToEnroll?: string | undefined;
         createdBy?: string | undefined;
+        gradeLevel?: string | undefined;
     }) => Promise<Record<string, any> | {
         items: any[];
         pages: number;

package/dist/index.js

@@ -3224,17 +3224,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 {
@@ -3256,30 +3258,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 = (0, import_nodejs_utils9.makeCacheKey)(namespace_collection, cacheParams);
     import_nodejs_utils9.logger.log({
       level: "info",
@@ -35275,7 +35258,8 @@ function useEnrollmentController() {
       school: import_joi16.default.string().hex().optional().allow("", null),
       schoolYear: import_joi16.default.string().optional().allow("", null),
       gradeLevelToEnroll: import_joi16.default.string().optional().allow("", null),
-      createdBy: import_joi16.default.string().hex().optional().allow("", null)
+      createdBy: import_joi16.default.string().hex().optional().allow("", null),
+      gradeLevel: import_joi16.default.string().optional().allow("", null)
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -35288,6 +35272,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++) {
@@ -35304,8 +35289,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;