@eeplatform/basic-edu 1.4.1 → 1.4.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eeplatform/basic-edu
 
+## 1.4.3
+
+### Patch Changes
+
+- e813099: Add createdBy filter to enrollment getAll()
+
+## 1.4.2
+
+### Patch Changes
+
+- e84952a: Parse createdBy, updatedBy, and deletedBy to ObjectId
+
 ## 1.4.1
 
 ### Patch Changes

package/dist/index.d.ts

@@ -105,9 +105,9 @@ type TLearner = {
     createdAt?: Date | string;
     updatedAt?: Date | string;
     deletedAt?: Date | string;
-    createdBy?: string;
-    updatedBy?: string;
-    deletedBy?: string;
+    createdBy?: string | ObjectId;
+    updatedBy?: string | ObjectId;
+    deletedBy?: string | ObjectId;
 };
 type TLearnerInfo = {
     psaBirthCertificateNo?: string;
@@ -195,15 +195,15 @@ declare function MLearner(value: TLearner): {
     createdAt: string | Date;
     updatedAt: string | Date;
     deletedAt: string | Date;
-    createdBy: string;
-    updatedBy: string;
-    deletedBy: string;
+    createdBy: string | ObjectId;
+    updatedBy: string | ObjectId;
+    deletedBy: string | ObjectId;
 };
 
 declare function useEnrollmentRepo(): {
     createIndexes: () => Promise<void>;
     add: (value: TLearner, session?: ClientSession) => Promise<ObjectId>;
-    getAll: ({ search, page, limit, sort, status, school, schoolYear, gradeLevelToEnroll, }?: {
+    getAll: ({ search, page, limit, sort, status, school, schoolYear, gradeLevelToEnroll, createdBy, }?: {
         search?: string | undefined;
         page?: number | undefined;
         limit?: number | undefined;
@@ -212,6 +212,7 @@ declare function useEnrollmentRepo(): {
         school?: string | undefined;
         schoolYear?: string | undefined;
         gradeLevelToEnroll?: string | undefined;
+        createdBy?: string | undefined;
     }) => Promise<Record<string, any> | {
         items: any[];
         pages: number;

package/dist/index.js

@@ -1986,6 +1986,27 @@ function MLearner(value) {
       throw new import_nodejs_utils4.BadRequestError("Invalid school format");
     }
   }
+  if (value.createdBy && typeof value.createdBy === "string") {
+    try {
+      value.createdBy = new import_mongodb3.ObjectId(value.createdBy);
+    } catch (error2) {
+      throw new import_nodejs_utils4.BadRequestError("Invalid createdBy format");
+    }
+  }
+  if (value.updatedBy && typeof value.updatedBy === "string") {
+    try {
+      value.updatedBy = new import_mongodb3.ObjectId(value.updatedBy);
+    } catch (error2) {
+      throw new import_nodejs_utils4.BadRequestError("Invalid updatedBy format");
+    }
+  }
+  if (value.deletedBy && typeof value.deletedBy === "string") {
+    try {
+      value.deletedBy = new import_mongodb3.ObjectId(value.deletedBy);
+    } catch (error2) {
+      throw new import_nodejs_utils4.BadRequestError("Invalid deletedBy format");
+    }
+  }
   return {
     _id: value._id ?? void 0,
     region: value.region,
@@ -2094,24 +2115,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 import_mongodb4.ObjectId(createdBy);
+        cacheParams.createdBy = createdBy;
+      } catch (error) {
+        throw new import_nodejs_utils5.BadRequestError("Invalid createdBy ID.");
+      }
+    }
     if (school) {
       try {
         query.school = new import_mongodb4.ObjectId(school);
+        cacheParams.school = school;
       } catch (error) {
         throw new import_nodejs_utils5.BadRequestError("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) {
@@ -2123,11 +2161,6 @@ function useEnrollmentRepo() {
         { gradeLevelToEnroll: { $regex: search, $options: "i" } }
       ];
     }
-    const cacheParams = {
-      page,
-      limit,
-      sort: JSON.stringify(sort)
-    };
     if (search)
       cacheParams.search = search;
     if (status !== "active")
@@ -3025,7 +3058,8 @@ function useEnrollmentController() {
       status: import_joi7.default.string().optional().allow("", null),
       school: import_joi7.default.string().hex().optional().allow("", null),
       schoolYear: import_joi7.default.string().optional().allow("", null),
-      gradeLevelToEnroll: import_joi7.default.string().optional().allow("", null)
+      gradeLevelToEnroll: import_joi7.default.string().optional().allow("", null),
+      createdBy: import_joi7.default.string().hex().optional().allow("", null)
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -3037,6 +3071,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++) {
@@ -3053,7 +3088,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;