@eeplatform/basic-edu 1.10.12 → 1.10.14

package/dist/index.mjs

@@ -1347,6 +1347,7 @@ import Joi from "joi";
 import { ObjectId } from "mongodb";
 var schemaCurriculum = Joi.object({
   _id: Joi.string().hex().optional(),
+  school: Joi.string().hex().required(),
   name: Joi.string().required(),
   effectiveSchoolYear: Joi.string().required(),
   maxTeachingHoursPerDay: Joi.number().integer().min(1).required(),
@@ -1373,8 +1374,14 @@ function MCurriculum(value) {
       throw new BadRequestError("Invalid _id format");
     }
   }
+  try {
+    value.school = new ObjectId(value.school);
+  } catch (error2) {
+    throw new BadRequestError("Invalid school format");
+  }
   return {
     _id: value._id ?? void 0,
+    school: value.school,
     name: value.name ?? "",
     effectiveSchoolYear: value.effectiveSchoolYear ?? "",
     maxTeachingHoursPerDay: value.maxTeachingHoursPerDay ?? 0,
@@ -1416,6 +1423,7 @@ function useCurriculumRepo() {
         {
           key: {
             name: 1,
+            school: 1,
             effectiveSchoolYear: 1,
             status: 1
           },
@@ -1488,12 +1496,19 @@ function useCurriculumRepo() {
     page = 1,
     limit = 10,
     sort = {},
-    status = "active"
+    status = "active",
+    school = ""
   } = {}) {
     page = page > 0 ? page - 1 : 0;
     const query = {
       status
     };
+    const cacheKeyOptions = {
+      page,
+      limit,
+      sort: JSON.stringify(sort),
+      status
+    };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     if (search) {
       query.$or = [
@@ -1501,16 +1516,17 @@ function useCurriculumRepo() {
         { effectiveSchoolYear: { $regex: search, $options: "i" } },
         { curriculumMemoRef: { $regex: search, $options: "i" } }
       ];
+      cacheKeyOptions.search = search;
     }
-    const cacheParams = {
-      page,
-      limit,
-      sort: JSON.stringify(sort)
-    };
-    if (search)
-      cacheParams.search = search;
-    if (status !== "active")
-      cacheParams.status = status;
+    if (school) {
+      try {
+        query.school = new ObjectId2(school);
+      } catch (error) {
+        throw new BadRequestError2("Invalid school ID format.");
+      }
+      cacheKeyOptions.school = school;
+    }
+    const cacheParams = cacheKeyOptions;
     const cacheKey = makeCacheKey(namespace_collection, cacheParams);
     logger2.log({
       level: "info",
@@ -1860,6 +1876,7 @@ function useCurriculumController() {
     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 school = req.query.school;
     const sortObj = {};
     if (sort && Array.isArray(sort) && sort.length && sortOrder && Array.isArray(sortOrder) && sortOrder.length) {
       sort.forEach((field, index) => {
@@ -1874,7 +1891,8 @@ function useCurriculumController() {
         limit,
         sort: sortObj,
         status,
-        search
+        search,
+        school
       });
       res.json(curriculums);
       return;
@@ -5116,11 +5134,11 @@ function useProgramRepo() {
     sort = {},
     status = "active",
     school = "",
-    isDefault
+    isDefault,
+    gradeLevel = []
   } = {}) {
     page = page > 0 ? page - 1 : 0;
     const query = {
-      deletedAt: { $in: ["", null] },
       status
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: 1 };
@@ -5146,6 +5164,10 @@ function useProgramRepo() {
       query.isDefault = isDefault;
       cacheKeyOptions.isDefault = isDefault;
     }
+    if (gradeLevel && Array.isArray(gradeLevel) && gradeLevel.length > 0) {
+      query.gradeLevels = { $in: gradeLevel };
+      cacheKeyOptions.gradeLevel = gradeLevel.join(",");
+    }
     const cacheKey = makeCacheKey7(namespace_collection, cacheKeyOptions);
     logger12.log({
       level: "info",
@@ -5395,7 +5417,8 @@ function useProgramController() {
       search: Joi13.string().optional().allow("", null),
       status: Joi13.string().optional().allow("", null),
       school: Joi13.string().hex().optional().allow("", null),
-      isDefault: Joi13.boolean().optional().allow("", null)
+      isDefault: Joi13.boolean().optional().allow("", null),
+      gradeLevel: Joi13.string().optional().allow("", null)
     });
     const { error } = validation.validate(query);
     const page = typeof req.query.page === "string" ? Number(req.query.page) : 1;
@@ -5404,6 +5427,7 @@ function useProgramController() {
     const status = req.query.status ?? "active";
     const school = req.query.school ?? "";
     const isDefault = req.query.isDefault === "true" ? true : req.query.isDefault === "false" ? false : void 0;
+    const gradeLevel = req.query.gradeLevel ? req.query.gradeLevel?.split(",") : [];
     const isPageNumber = isFinite(page);
     if (!isPageNumber) {
       next(new BadRequestError19("Invalid page number."));
@@ -5425,7 +5449,8 @@ function useProgramController() {
         search,
         status,
         school,
-        isDefault
+        isDefault,
+        gradeLevel
       });
       res.json(data);
       return;