@eeplatform/basic-edu 1.10.12 → 1.10.13

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @eeplatform/basic-edu
 
+## 1.10.13
+
+### Patch Changes
+
+- cc35ba8: Fix program management
+- ae32710: Fix curriculum management
+
 ## 1.10.12
 
 ### Patch Changes

package/dist/index.d.ts

@@ -6,6 +6,7 @@ import { Request, Response, NextFunction } from 'express';
 
 type TCurriculum = {
     _id?: ObjectId;
+    school: ObjectId;
     name: string;
     effectiveSchoolYear: string;
     maxTeachingHoursPerDay: number;
@@ -22,6 +23,7 @@ type TCurriculum = {
 declare const schemaCurriculum: Joi.ObjectSchema<any>;
 declare function MCurriculum(value: TCurriculum): {
     _id: ObjectId | undefined;
+    school: ObjectId;
     name: string;
     effectiveSchoolYear: string;
     maxTeachingHoursPerDay: number;
@@ -39,12 +41,13 @@ declare function MCurriculum(value: TCurriculum): {
 declare function useCurriculumRepo(): {
     createIndexes: () => Promise<void>;
     add: (value: TCurriculum, session?: ClientSession) => Promise<ObjectId>;
-    getAll: ({ search, page, limit, sort, status, }?: {
+    getAll: ({ search, page, limit, sort, status, school, }?: {
         search?: string | undefined;
         page?: number | undefined;
         limit?: number | undefined;
         sort?: {} | undefined;
         status?: string | undefined;
+        school?: string | undefined;
     }) => Promise<Record<string, any> | {
         items: any[];
         pages: number;
@@ -1629,7 +1632,7 @@ declare function modelProgram(value: TProgram): TProgram;
 declare function useProgramRepo(): {
     createIndexes: () => Promise<void>;
     add: (value: TProgram, session?: ClientSession) => Promise<ObjectId>;
-    getAll: ({ search, page, limit, sort, status, school, isDefault, }?: {
+    getAll: ({ search, page, limit, sort, status, school, isDefault, gradeLevel, }?: {
         search?: string;
         page?: number;
         limit?: number;
@@ -1637,6 +1640,7 @@ declare function useProgramRepo(): {
         status?: string;
         school?: string;
         isDefault?: boolean;
+        gradeLevel?: string[];
     }) => Promise<Record<string, any> | {
         items: any[];
         pages: number;

package/dist/index.js

@@ -1481,6 +1481,7 @@ var import_joi = __toESM(require("joi"));
 var import_mongodb = require("mongodb");
 var schemaCurriculum = import_joi.default.object({
   _id: import_joi.default.string().hex().optional(),
+  school: import_joi.default.string().hex().required(),
   name: import_joi.default.string().required(),
   effectiveSchoolYear: import_joi.default.string().required(),
   maxTeachingHoursPerDay: import_joi.default.number().integer().min(1).required(),
@@ -1507,8 +1508,14 @@ function MCurriculum(value) {
       throw new import_nodejs_utils.BadRequestError("Invalid _id format");
     }
   }
+  try {
+    value.school = new import_mongodb.ObjectId(value.school);
+  } catch (error2) {
+    throw new import_nodejs_utils.BadRequestError("Invalid school format");
+  }
   return {
     _id: value._id ?? void 0,
+    school: value.school,
     name: value.name ?? "",
     effectiveSchoolYear: value.effectiveSchoolYear ?? "",
     maxTeachingHoursPerDay: value.maxTeachingHoursPerDay ?? 0,
@@ -1541,6 +1548,7 @@ function useCurriculumRepo() {
         {
           key: {
             name: 1,
+            school: 1,
             effectiveSchoolYear: 1,
             status: 1
           },
@@ -1613,12 +1621,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 = [
@@ -1626,16 +1641,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 import_mongodb2.ObjectId(school);
+      } catch (error) {
+        throw new import_nodejs_utils2.BadRequestError("Invalid school ID format.");
+      }
+      cacheKeyOptions.school = school;
+    }
+    const cacheParams = cacheKeyOptions;
     const cacheKey = (0, import_nodejs_utils2.makeCacheKey)(namespace_collection, cacheParams);
     import_nodejs_utils2.logger.log({
       level: "info",
@@ -1985,6 +2001,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) => {
@@ -1999,7 +2016,8 @@ function useCurriculumController() {
         limit,
         sort: sortObj,
         status,
-        search
+        search,
+        school
       });
       res.json(curriculums);
       return;
@@ -5178,7 +5196,8 @@ function useProgramRepo() {
     sort = {},
     status = "active",
     school = "",
-    isDefault
+    isDefault,
+    gradeLevel = []
   } = {}) {
     page = page > 0 ? page - 1 : 0;
     const query = {
@@ -5208,6 +5227,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 = (0, import_nodejs_utils19.makeCacheKey)(namespace_collection, cacheKeyOptions);
     import_nodejs_utils19.logger.log({
       level: "info",
@@ -5457,7 +5480,8 @@ function useProgramController() {
       search: import_joi13.default.string().optional().allow("", null),
       status: import_joi13.default.string().optional().allow("", null),
       school: import_joi13.default.string().hex().optional().allow("", null),
-      isDefault: import_joi13.default.boolean().optional().allow("", null)
+      isDefault: import_joi13.default.boolean().optional().allow("", null),
+      gradeLevel: import_joi13.default.string().optional().allow("", null)
     });
     const { error } = validation.validate(query);
     const page = typeof req.query.page === "string" ? Number(req.query.page) : 1;
@@ -5466,6 +5490,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?.split(",") ?? [];
     const isPageNumber = isFinite(page);
     if (!isPageNumber) {
       next(new import_nodejs_utils20.BadRequestError("Invalid page number."));
@@ -5487,7 +5512,8 @@ function useProgramController() {
         search,
         status,
         school,
-        isDefault
+        isDefault,
+        gradeLevel
       });
       res.json(data);
       return;