@eeplatform/basic-edu 1.3.9 → 1.3.11

package/dist/index.mjs

@@ -1804,7 +1804,7 @@ var addressSchema = Joi3.object({
   sitio: Joi3.string().optional().allow("", null),
   barangay: Joi3.string().required(),
   municipalityCity: Joi3.string().required(),
-  province: Joi3.string().required(),
+  province: Joi3.string().optional().allow("", null),
   country: Joi3.string().optional().allow("", null),
   zipCode: Joi3.string().optional().allow("", null)
 });
@@ -1815,93 +1815,98 @@ var personContactSchema = Joi3.object({
   contactNumber: Joi3.string().optional().allow("", null)
 });
 var learnerInfoSchema = Joi3.object({
+  psaBirthCertificateNo: Joi3.string().optional().allow("", null),
   lrn: Joi3.string().optional().allow("", null),
   lastName: Joi3.string().required(),
   firstName: Joi3.string().required(),
   middleName: Joi3.string().optional().allow("", null),
   extensionName: Joi3.string().optional().allow("", null),
-  birthDate: Joi3.string().isoDate().required(),
-  sex: Joi3.string().valid("Male", "Female").required(),
+  birthDate: Joi3.string().required(),
+  sex: Joi3.string().required(),
+  // Changed to accept any string to match frontend
   age: Joi3.number().integer().min(0).max(150).required(),
-  placeOfBirth: Joi3.object({
-    municipalityCity: Joi3.string().required(),
-    province: Joi3.string().optional().allow("", null),
-    country: Joi3.string().optional().allow("", null)
-  }).optional(),
+  placeOfBirth: Joi3.string().required(),
+  // Made required to match frontend
   motherTongue: Joi3.string().optional().allow("", null),
-  hasDisability: Joi3.boolean().required(),
-  disabilityTypes: Joi3.array().items(
-    Joi3.string().valid(
-      "Visual Impairment",
-      "Visual Impairment(Blind)",
-      "Visual Impairment(Low Vision)",
-      "Hearing Impairment",
-      "Learning Disability",
-      "Intellectual Disability",
-      "Autism Spectrum Disorder",
-      "Emotional-Behavioral Disorder",
-      "Orthopedic/Physical Handicap",
-      "Speech/Language Disorder",
-      "Cerebral Palsy",
-      "Special Health Problem/Chronic Disease",
-      "Multiple Disorder",
-      "Cancer"
-    )
-  ).optional(),
-  otherDisabilityDetails: Joi3.string().optional().allow("", null),
-  isIndigenous: Joi3.boolean().optional(),
+  fourPsHouseholdId: Joi3.string().optional().allow("", null),
   indigenousCommunity: Joi3.string().optional().allow("", null),
-  is4PsBeneficiary: Joi3.boolean().optional(),
-  fourPsHouseholdId: Joi3.string().optional().allow("", null)
+  withDisability: Joi3.boolean().required(),
+  // Added to match frontend
+  disabilities: Joi3.array().items(Joi3.string()).optional(),
+  // Changed from disabilityTypes to disabilities
+  otherDisabilityDetails: Joi3.string().optional().allow("", null)
 });
+var gradeLevels = [
+  "K1",
+  "K2",
+  "grade-1",
+  "grade-2",
+  "grade-3",
+  "grade-4",
+  "grade-5",
+  "grade-6",
+  "grade-7",
+  "grade-8",
+  "grade-9",
+  "grade-10",
+  "grade-11",
+  "grade-12"
+];
 var schemaEnrollment = Joi3.object({
-  _id: Joi3.string().hex().optional(),
-  region: Joi3.string().hex().required(),
-  sdo: Joi3.string().hex().required(),
-  school: Joi3.string().hex().required(),
+  _id: Joi3.string().optional(),
+  region: Joi3.string().required(),
+  // Changed from hex to string to match frontend
+  regionName: Joi3.string().optional().allow("", null),
+  province: Joi3.string().optional().allow("", null),
+  // Made required to match frontend
+  cityMunicipality: Joi3.string().required(),
+  // Made required to match frontend
+  division: Joi3.string().required(),
+  // Changed from hex to string to match frontend
+  divisionName: Joi3.string().optional().allow("", null),
+  school: Joi3.string().required(),
+  // Changed from hex to string to match frontend
+  schoolName: Joi3.string().optional().allow("", null),
+  // Added to match frontend
   schoolYear: Joi3.string().required(),
-  gradeLevelToEnroll: Joi3.string().required(),
+  gradeLevel: Joi3.string().valid(...gradeLevels).required(),
+  returningLearner: Joi3.boolean().required(),
+  // Added to match frontend
   learnerInfo: learnerInfoSchema.required(),
   parentGuardianInfo: Joi3.object({
-    father: personContactSchema.optional(),
-    mother: personContactSchema.optional(),
-    legalGuardian: personContactSchema.optional()
+    father: personContactSchema.required(),
+    // Made required to match frontend
+    mother: personContactSchema.required(),
+    // Made required to match frontend
+    legalGuardian: personContactSchema.required()
+    // Made required to match frontend
   }).required(),
-  addressInfo: Joi3.object({
-    currentAddress: addressSchema.required(),
-    permanentAddress: addressSchema.optional(),
+  address: Joi3.object({
+    // Changed from addressInfo to address
+    current: addressSchema.required(),
+    // Changed from currentAddress to current
+    permanent: addressSchema.required(),
+    // Changed from permanentAddress to permanent and made required
     sameAsCurrent: Joi3.boolean().optional()
   }).required(),
   returningLearnerInfo: Joi3.object({
-    lastGradeLevelCompleted: Joi3.string().required(),
-    lastSchoolYearCompleted: Joi3.string().required(),
-    lastSchoolAttended: Joi3.string().required(),
-    lastSchoolId: Joi3.string().optional().allow("", null),
-    isReturningLearner: Joi3.boolean().required(),
-    isTransferIn: Joi3.boolean().required()
+    lastGradeLevelCompleted: Joi3.string().optional().allow("", null),
+    lastSchoolYearCompleted: Joi3.string().optional().allow("", null),
+    lastSchoolAttended: Joi3.string().optional().allow("", null),
+    lastSchoolId: Joi3.string().optional().allow("", null)
   }).optional(),
   seniorHighInfo: Joi3.object({
-    semester: Joi3.string().valid("1st", "2nd").required(),
-    track: Joi3.string().required(),
-    strand: Joi3.string().required()
+    semester: Joi3.string().optional().allow("", null),
+    track: Joi3.string().optional().allow("", null),
+    strand: Joi3.string().optional().allow("", null)
   }).optional(),
-  preferredLearningModalities: Joi3.array().items(
-    Joi3.string().valid(
-      "Modular (Print)",
-      "Modular (Digital)",
-      "Online",
-      "Radio-Based Instruction",
-      "Educational Television",
-      "Blended",
-      "Homeschooling"
-    )
-  ).optional(),
-  certification: Joi3.object({
-    certifiedBy: Joi3.string().required(),
-    date: Joi3.string().isoDate().required(),
-    consentGiven: Joi3.boolean().required()
-  }).required(),
+  alternativeLearningOptions: Joi3.array().items(Joi3.string()).optional(),
+  // Added to match frontend
+  isCertifiedAndConsented: Joi3.boolean().required(),
+  // Simplified certification to match frontend
   status: Joi3.string().optional().allow("", null),
+  remarks: Joi3.string().optional().allow("", null),
+  // Added to match frontend
   rejectionReason: Joi3.string().optional().allow("", null),
   createdAt: Joi3.date().optional().allow("", null),
   updatedAt: Joi3.date().optional().allow("", null),
@@ -1923,42 +1928,34 @@ function MEnrollment(value) {
       throw new BadRequestError4("Invalid _id format");
     }
   }
-  if (typeof value.region === "string") {
-    try {
-      value.region = new ObjectId3(value.region);
-    } catch (error2) {
-      throw new BadRequestError4("Invalid region format");
-    }
-  }
-  if (typeof value.sdo === "string") {
-    try {
-      value.sdo = new ObjectId3(value.sdo);
-    } catch (error2) {
-      throw new BadRequestError4("Invalid sdo format");
-    }
-  }
-  if (typeof value.school === "string") {
-    try {
-      value.school = new ObjectId3(value.school);
-    } catch (error2) {
-      throw new BadRequestError4("Invalid school format");
-    }
-  }
   return {
     _id: value._id ?? void 0,
     region: value.region,
-    sdo: value.sdo,
+    regionName: value.regionName ?? "",
+    province: value.province ?? "",
+    cityMunicipality: value.cityMunicipality ?? "",
+    division: value.division,
+    divisionName: value.divisionName ?? "",
     school: value.school,
+    schoolName: value.schoolName ?? "",
+    // Added to match frontend
     schoolYear: value.schoolYear ?? "",
-    gradeLevelToEnroll: value.gradeLevelToEnroll ?? "",
+    gradeLevel: value.gradeLevel ?? "",
+    returningLearner: value.returningLearner ?? false,
+    // Added to match frontend
     learnerInfo: value.learnerInfo,
     parentGuardianInfo: value.parentGuardianInfo,
-    addressInfo: value.addressInfo,
+    address: value.address,
+    // Changed from addressInfo to address
     returningLearnerInfo: value.returningLearnerInfo,
     seniorHighInfo: value.seniorHighInfo,
-    preferredLearningModalities: value.preferredLearningModalities ?? [],
-    certification: value.certification,
-    status: value.status ?? "active",
+    alternativeLearningOptions: value.alternativeLearningOptions ?? [],
+    // Added to match frontend
+    isCertifiedAndConsented: value.isCertifiedAndConsented ?? true,
+    // Simplified certification
+    status: value.status ?? "pending",
+    remarks: value.remarks ?? "",
+    // Added to match frontend
     rejectionReason: value.rejectionReason ?? "",
     createdAt: value.createdAt ?? /* @__PURE__ */ new Date(),
     updatedAt: value.updatedAt ?? "",
@@ -1981,28 +1978,18 @@ import {
   useCache as useCache2
 } from "@eeplatform/nodejs-utils";
 import { ObjectId as ObjectId4 } from "mongodb";
+import Joi4 from "joi";
 function useEnrollmentRepo() {
   const db = useAtlas2.getDb();
   if (!db) {
     throw new Error("Unable to connect to server.");
   }
-  const namespace_collection = "school.enrollments";
+  const namespace_collection = "deped.school.enrollments";
   const collection = db.collection(namespace_collection);
   const { getCache, setCache, delNamespace } = useCache2(namespace_collection);
   async function createIndexes() {
     try {
       await collection.createIndexes([
-        {
-          key: {
-            school: 1,
-            schoolYear: 1,
-            "learnerInfo.lrn": 1,
-            status: 1
-          },
-          unique: true,
-          partialFilterExpression: { status: "active" },
-          name: "unique_enrollment_index"
-        },
         { key: { status: 1 } },
         { key: { school: 1, status: 1 } },
         { key: { "learnerInfo.lrn": 1 } },
@@ -2091,11 +2078,7 @@ function useEnrollmentRepo() {
       status
     };
     if (school) {
-      try {
-        query.school = new ObjectId4(school);
-      } catch (error) {
-        throw new BadRequestError5("Invalid school ID format.");
-      }
+      query.school = school;
     }
     if (schoolYear) {
       query.schoolYear = schoolYear;
@@ -2149,6 +2132,7 @@ function useEnrollmentRepo() {
             from: "admin.schools",
             localField: "school",
             foreignField: "_id",
+            // School collection still uses ObjectId, we'll need to convert during lookup
             as: "schoolInfo"
           }
         },
@@ -2157,15 +2141,19 @@ function useEnrollmentRepo() {
             from: "admin.regions",
             localField: "region",
             foreignField: "_id",
+            // Region collection still uses ObjectId, we'll need to convert during lookup
             as: "regionInfo"
           }
         },
         {
           $lookup: {
             from: "admin.divisions",
-            localField: "sdo",
+            localField: "division",
+            // Changed from sdo to division to match frontend
             foreignField: "_id",
-            as: "sdoInfo"
+            // Division collection still uses ObjectId, we'll need to convert during lookup
+            as: "divisionInfo"
+            // Changed from sdoInfo to divisionInfo
           }
         },
         { $sort: sort },
@@ -2234,7 +2222,7 @@ function useEnrollmentRepo() {
   async function getByLrn(lrn, schoolYear) {
     const query = {
       "learnerInfo.lrn": lrn,
-      status: "active"
+      status: "accepted"
     };
     if (schoolYear) {
       query.schoolYear = schoolYear;
@@ -2304,12 +2292,8 @@ function useEnrollmentRepo() {
     }
   }
   async function getBySchoolAndYear(school, schoolYear) {
-    try {
-      if (typeof school === "string") {
-        school = new ObjectId4(school);
-      }
-    } catch (error) {
-      throw new BadRequestError5("Invalid school ID format.");
+    if (typeof school === "object") {
+      school = school.toString();
     }
     const query = {
       school,
@@ -2349,6 +2333,110 @@ function useEnrollmentRepo() {
       );
     }
   }
+  async function getByApplicantInfo({
+    school = "",
+    schoolYear = "",
+    gradeLevel = "",
+    firstName = "",
+    lastName = "",
+    middleName = "",
+    birthDate = "",
+    placeOfBirth = ""
+  } = {}) {
+    const validation = Joi4.object({
+      school: Joi4.string().required(),
+      schoolYear: Joi4.string().required(),
+      gradeLevel: Joi4.string().required(),
+      firstName: Joi4.string().required(),
+      lastName: Joi4.string().required(),
+      middleName: Joi4.string().optional().allow("", null),
+      birthDate: Joi4.string().required(),
+      placeOfBirth: Joi4.string().required()
+    });
+    const { error } = validation.validate({
+      school,
+      schoolYear,
+      gradeLevel,
+      firstName,
+      lastName,
+      middleName,
+      birthDate,
+      placeOfBirth
+    });
+    if (error) {
+      throw new BadRequestError5(`Validation error: ${error.message}`);
+    }
+    const query = {
+      school,
+      schoolYear,
+      gradeLevel,
+      "learnerInfo.firstName": {
+        $regex: `^${firstName}$`,
+        $options: "i"
+      },
+      "learnerInfo.lastName": {
+        $regex: `^${lastName}$`,
+        $options: "i"
+      },
+      "learnerInfo.birthDate": birthDate,
+      "learnerInfo.placeOfBirth": {
+        $regex: `^${placeOfBirth}$`,
+        $options: "i"
+      }
+    };
+    const cacheKeyOptions = {
+      school,
+      schoolYear,
+      gradeLevel,
+      firstName,
+      lastName,
+      birthDate,
+      placeOfBirth
+    };
+    if (middleName && middleName.trim() !== "") {
+      query["learnerInfo.middleName"] = {
+        $regex: `^${middleName}$`,
+        $options: "i"
+      };
+      cacheKeyOptions.middleName = middleName;
+    }
+    const cacheKey = makeCacheKey2(namespace_collection, cacheKeyOptions);
+    const cachedData = await getCache(cacheKey);
+    if (cachedData) {
+      logger5.log({
+        level: "info",
+        message: `Cache hit for enrollment by applicant info: ${cacheKey}`
+      });
+      return cachedData;
+    }
+    try {
+      const data = await collection.findOne({
+        ...query,
+        status: "accepted"
+      });
+      const length = await collection.countDocuments({
+        ...query,
+        status: { $nin: ["accepted", "deleted"] }
+      });
+      const result = { accepted: data ? true : false, length };
+      setCache(cacheKey, result, 600).then(() => {
+        logger5.log({
+          level: "info",
+          message: `Cache set for enrollment by applicant info: ${cacheKey}`
+        });
+      }).catch((err) => {
+        logger5.log({
+          level: "error",
+          message: `Failed to set cache for enrollment by applicant info: ${err.message}`
+        });
+      });
+      return result;
+    } catch (error2) {
+      throw new InternalServerError2(
+        "Failed to get enrollment by applicant info."
+      );
+    }
+  }
   return {
     createIndexes,
     add,
@@ -2357,6 +2445,7 @@ function useEnrollmentRepo() {
     getById,
     getByLrn,
     deleteById,
+    getByApplicantInfo,
     getBySchoolAndYear
   };
 }
@@ -2376,39 +2465,52 @@ function useEnrollmentService() {
     getById: _getById,
     getByLrn: _getByLrn,
     deleteById: _deleteById,
-    getBySchoolAndYear: _getBySchoolAndYear
+    getBySchoolAndYear: _getBySchoolAndYear,
+    getByApplicantInfo: _getByApplicantInfo
   } = useEnrollmentRepo();
   async function createEnrollment(value) {
     try {
-      if (value.learnerInfo.lrn) {
-        const existingEnrollment = await _getByLrn(
-          value.learnerInfo.lrn,
-          value.schoolYear
+      const applicantInfo = await _getByApplicantInfo({
+        firstName: value.learnerInfo.firstName,
+        lastName: value.learnerInfo.lastName,
+        middleName: value.learnerInfo.middleName,
+        birthDate: value.learnerInfo.birthDate,
+        placeOfBirth: value.learnerInfo.placeOfBirth,
+        gradeLevel: value.gradeLevel,
+        schoolYear: value.schoolYear,
+        school: value.school
+      });
+      if (applicantInfo.accepted) {
+        throw new BadRequestError6(
+          "This applicant already has an accepted application for the same school year and grade level."
         );
-        if (existingEnrollment) {
-          throw new BadRequestError6(
-            "Learner is already enrolled for this school year."
-          );
-        }
       }
-      const gradeLevel = value.gradeLevelToEnroll.toLowerCase();
+      if (applicantInfo.length >= 3) {
+        throw new BadRequestError6(
+          "This applicant has already submitted applications to 3 schools for the same school year and grade level. Maximum limit reached."
+        );
+      }
+      const gradeLevel = value.gradeLevel.toLowerCase();
       const age = value.learnerInfo.age;
-      if (gradeLevel.includes("kindergarten") && age < 5) {
+      if (["K1", "K2"].includes(gradeLevel) && age < 5) {
         throw new BadRequestError6("Learner is too young for Kindergarten.");
       }
-      if (gradeLevel.includes("grade 1") && age < 6) {
+      if (gradeLevel === "grade-1" && age < 6) {
         throw new BadRequestError6("Learner is too young for Grade 1.");
       }
       const { father, mother, legalGuardian } = value.parentGuardianInfo;
-      if (!father && !mother && !legalGuardian) {
+      const hasFatherInfo = father && (father.firstName || father.lastName);
+      const hasMotherInfo = mother && (mother.firstName || mother.lastName);
+      const hasGuardianInfo = legalGuardian && (legalGuardian.firstName || legalGuardian.lastName);
+      if (!hasFatherInfo && !hasMotherInfo && !hasGuardianInfo) {
         throw new BadRequestError6(
           "At least one parent or legal guardian information is required."
         );
       }
-      if (gradeLevel.includes("grade 11") || gradeLevel.includes("grade 12")) {
-        if (!value.seniorHighInfo) {
+      if (gradeLevel.includes("grade-11") || gradeLevel.includes("grade-12")) {
+        if (!value.seniorHighInfo || !value.seniorHighInfo.track || !value.seniorHighInfo.strand) {
           throw new BadRequestError6(
-            "Senior high school information is required for Grade 11 and 12."
+            "Senior high school information (track and strand) is required for Grade 11 and 12."
           );
         }
       }
@@ -2642,7 +2744,7 @@ function useEnrollmentService() {
 
 // src/resources/enrollment/enrollment.controller.ts
 import { BadRequestError as BadRequestError7, logger as logger7 } from "@eeplatform/nodejs-utils";
-import Joi4 from "joi";
+import Joi5 from "joi";
 function useEnrollmentController() {
   const {
     createEnrollment: _createEnrollment,
@@ -2674,18 +2776,18 @@ function useEnrollmentController() {
   async function updateById(req, res, next) {
     const value = req.body;
     const id = req.params.id ?? "";
-    const validation = Joi4.object({
-      id: Joi4.string().hex().required(),
-      value: Joi4.object({
-        learnerInfo: Joi4.object().optional(),
-        parentGuardianInfo: Joi4.object().optional(),
-        addressInfo: Joi4.object().optional(),
-        returningLearnerInfo: Joi4.object().optional(),
-        seniorHighInfo: Joi4.object().optional(),
-        preferredLearningModalities: Joi4.array().optional(),
-        certification: Joi4.object().optional(),
-        status: Joi4.string().valid("active", "pending", "approved", "rejected", "deleted").optional(),
-        rejectionReason: Joi4.string().optional().allow("", null)
+    const validation = Joi5.object({
+      id: Joi5.string().hex().required(),
+      value: Joi5.object({
+        learnerInfo: Joi5.object().optional(),
+        parentGuardianInfo: Joi5.object().optional(),
+        addressInfo: Joi5.object().optional(),
+        returningLearnerInfo: Joi5.object().optional(),
+        seniorHighInfo: Joi5.object().optional(),
+        preferredLearningModalities: Joi5.array().optional(),
+        certification: Joi5.object().optional(),
+        status: Joi5.string().valid("active", "pending", "approved", "rejected", "deleted").optional(),
+        rejectionReason: Joi5.string().optional().allow("", null)
       }).min(1)
     });
     const { error } = validation.validate({ id, value });
@@ -2704,14 +2806,14 @@ function useEnrollmentController() {
   }
   async function getAll(req, res, next) {
     const query = req.query;
-    const validation = Joi4.object({
-      page: Joi4.number().min(1).optional().allow("", null),
-      limit: Joi4.number().min(1).max(100).optional().allow("", null),
-      search: Joi4.string().optional().allow("", null),
-      status: Joi4.string().optional().allow("", null),
-      school: Joi4.string().hex().optional().allow("", null),
-      schoolYear: Joi4.string().optional().allow("", null),
-      gradeLevelToEnroll: Joi4.string().optional().allow("", null)
+    const validation = Joi5.object({
+      page: Joi5.number().min(1).optional().allow("", null),
+      limit: Joi5.number().min(1).max(100).optional().allow("", null),
+      search: Joi5.string().optional().allow("", null),
+      status: Joi5.string().optional().allow("", null),
+      school: Joi5.string().hex().optional().allow("", null),
+      schoolYear: Joi5.string().optional().allow("", null),
+      gradeLevelToEnroll: Joi5.string().optional().allow("", null)
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -2749,7 +2851,7 @@ function useEnrollmentController() {
   }
   async function getById(req, res, next) {
     const id = req.params.id ?? "";
-    const validation = Joi4.string().hex().required();
+    const validation = Joi5.string().hex().required();
     const { error } = validation.validate(id);
     if (error) {
       next(new BadRequestError7(error.message));
@@ -2766,9 +2868,9 @@ function useEnrollmentController() {
   async function getByLrn(req, res, next) {
     const lrn = req.params.lrn ?? "";
     const schoolYear = req.query.schoolYear;
-    const validation = Joi4.object({
-      lrn: Joi4.string().required(),
-      schoolYear: Joi4.string().optional().allow("", null)
+    const validation = Joi5.object({
+      lrn: Joi5.string().required(),
+      schoolYear: Joi5.string().optional().allow("", null)
     });
     const { error } = validation.validate({ lrn, schoolYear });
     if (error) {
@@ -2786,9 +2888,9 @@ function useEnrollmentController() {
   async function deleteById(req, res, next) {
     const id = req.params.id ?? "";
     const deletedBy = req.body.deletedBy;
-    const validation = Joi4.object({
-      id: Joi4.string().hex().required(),
-      deletedBy: Joi4.string().optional().allow("", null)
+    const validation = Joi5.object({
+      id: Joi5.string().hex().required(),
+      deletedBy: Joi5.string().optional().allow("", null)
     });
     const { error } = validation.validate({ id, deletedBy });
     if (error) {
@@ -2806,9 +2908,9 @@ function useEnrollmentController() {
   async function getBySchoolAndYear(req, res, next) {
     const school = req.params.school ?? "";
     const schoolYear = req.params.schoolYear ?? "";
-    const validation = Joi4.object({
-      school: Joi4.string().hex().required(),
-      schoolYear: Joi4.string().required()
+    const validation = Joi5.object({
+      school: Joi5.string().hex().required(),
+      schoolYear: Joi5.string().required()
     });
     const { error } = validation.validate({ school, schoolYear });
     if (error) {
@@ -2826,9 +2928,9 @@ function useEnrollmentController() {
   async function approve(req, res, next) {
     const id = req.params.id ?? "";
     const approvedBy = req.body.approvedBy;
-    const validation = Joi4.object({
-      id: Joi4.string().hex().required(),
-      approvedBy: Joi4.string().required()
+    const validation = Joi5.object({
+      id: Joi5.string().hex().required(),
+      approvedBy: Joi5.string().required()
     });
     const { error } = validation.validate({ id, approvedBy });
     if (error) {
@@ -2848,10 +2950,10 @@ function useEnrollmentController() {
     const id = req.params.id ?? "";
     const rejectedBy = req.body.rejectedBy;
     const rejectionReason = req.body.rejectionReason;
-    const validation = Joi4.object({
-      id: Joi4.string().hex().required(),
-      rejectedBy: Joi4.string().required(),
-      rejectionReason: Joi4.string().optional().allow("", null)
+    const validation = Joi5.object({
+      id: Joi5.string().hex().required(),
+      rejectedBy: Joi5.string().required(),
+      rejectionReason: Joi5.string().optional().allow("", null)
     });
     const { error } = validation.validate({ id, rejectedBy, rejectionReason });
     if (error) {
@@ -2870,9 +2972,9 @@ function useEnrollmentController() {
   async function getStatsBySchool(req, res, next) {
     const school = req.params.school ?? "";
     const schoolYear = req.query.schoolYear;
-    const validation = Joi4.object({
-      school: Joi4.string().hex().required(),
-      schoolYear: Joi4.string().optional().allow("", null)
+    const validation = Joi5.object({
+      school: Joi5.string().hex().required(),
+      schoolYear: Joi5.string().optional().allow("", null)
     });
     const { error } = validation.validate({ school, schoolYear });
     if (error) {
@@ -2939,26 +3041,26 @@ function useEnrollmentController() {
 
 // src/resources/grade-level/grade-level.model.ts
 import { BadRequestError as BadRequestError8, logger as logger8 } from "@eeplatform/nodejs-utils";
-import Joi5 from "joi";
+import Joi6 from "joi";
 import { ObjectId as ObjectId5 } from "mongodb";
-var schemaGradeLevel = Joi5.object({
-  _id: Joi5.string().hex().optional(),
-  school: Joi5.string().hex().optional(),
-  educationLevel: Joi5.string().required(),
-  gradeLevel: Joi5.string().required(),
-  tracks: Joi5.array().items(Joi5.string()).optional(),
-  trackStrands: Joi5.array().items(Joi5.string()).optional(),
-  teachingStyle: Joi5.string().required(),
-  maxNumberOfLearners: Joi5.number().required(),
-  defaultStartTime: Joi5.string().optional().allow("", null),
-  defaultEndTime: Joi5.string().optional().allow("", null),
-  status: Joi5.string().optional().allow("", null),
-  createdAt: Joi5.date().optional().allow("", null),
-  updatedAt: Joi5.date().optional().allow("", null),
-  deletedAt: Joi5.date().optional().allow("", null),
-  createdBy: Joi5.string().optional().allow("", null),
-  updatedBy: Joi5.string().optional().allow("", null),
-  deletedBy: Joi5.string().optional().allow("", null)
+var schemaGradeLevel = Joi6.object({
+  _id: Joi6.string().hex().optional(),
+  school: Joi6.string().hex().optional(),
+  educationLevel: Joi6.string().required(),
+  gradeLevel: Joi6.string().required(),
+  tracks: Joi6.array().items(Joi6.string()).optional(),
+  trackStrands: Joi6.array().items(Joi6.string()).optional(),
+  teachingStyle: Joi6.string().required(),
+  maxNumberOfLearners: Joi6.number().required(),
+  defaultStartTime: Joi6.string().optional().allow("", null),
+  defaultEndTime: Joi6.string().optional().allow("", null),
+  status: Joi6.string().optional().allow("", null),
+  createdAt: Joi6.date().optional().allow("", null),
+  updatedAt: Joi6.date().optional().allow("", null),
+  deletedAt: Joi6.date().optional().allow("", null),
+  createdBy: Joi6.string().optional().allow("", null),
+  updatedBy: Joi6.string().optional().allow("", null),
+  deletedBy: Joi6.string().optional().allow("", null)
 });
 function MGradeLevel(value) {
   const { error } = schemaGradeLevel.validate(value);
@@ -3370,7 +3472,7 @@ function useGradeLevelRepo() {
 
 // src/resources/grade-level/grade-level.controller.ts
 import { BadRequestError as BadRequestError10, logger as logger10 } from "@eeplatform/nodejs-utils";
-import Joi6 from "joi";
+import Joi7 from "joi";
 function useGradeLevelController() {
   const {
     getAll: _getAll,
@@ -3402,17 +3504,17 @@ function useGradeLevelController() {
   async function updateById(req, res, next) {
     const value = req.body;
     const id = req.params.id ?? "";
-    const validation = Joi6.object({
-      id: Joi6.string().hex().required(),
-      value: Joi6.object({
-        school: Joi6.string().hex().optional(),
-        educationLevel: Joi6.string().optional(),
-        gradeLevel: Joi6.string().optional(),
-        teachingStyle: Joi6.string().optional(),
-        maxTeachingHoursPerDay: Joi6.number().integer().min(0).optional(),
-        maxTeachingHoursPerWeek: Joi6.number().integer().min(0).optional(),
-        defaultStartTime: Joi6.string().optional().allow("", null),
-        defaultEndTime: Joi6.string().optional().allow("", null)
+    const validation = Joi7.object({
+      id: Joi7.string().hex().required(),
+      value: Joi7.object({
+        school: Joi7.string().hex().optional(),
+        educationLevel: Joi7.string().optional(),
+        gradeLevel: Joi7.string().optional(),
+        teachingStyle: Joi7.string().optional(),
+        maxTeachingHoursPerDay: Joi7.number().integer().min(0).optional(),
+        maxTeachingHoursPerWeek: Joi7.number().integer().min(0).optional(),
+        defaultStartTime: Joi7.string().optional().allow("", null),
+        defaultEndTime: Joi7.string().optional().allow("", null)
       }).min(1)
     });
     const { error } = validation.validate({ id, value });
@@ -3434,15 +3536,15 @@ function useGradeLevelController() {
   }
   async function getAll(req, res, next) {
     const query = req.query;
-    const validation = Joi6.object({
-      page: Joi6.number().min(1).optional().allow("", null),
-      limit: Joi6.number().min(1).optional().allow("", null),
-      search: Joi6.string().optional().allow("", null),
-      educationLevel: Joi6.string().optional().allow("", null),
-      gradeLevel: Joi6.string().optional().allow("", null),
-      teachingStyle: Joi6.string().optional().allow("", null),
-      school: Joi6.string().hex().optional().allow("", null),
-      status: Joi6.string().optional().allow("", null)
+    const validation = Joi7.object({
+      page: Joi7.number().min(1).optional().allow("", null),
+      limit: Joi7.number().min(1).optional().allow("", null),
+      search: Joi7.string().optional().allow("", null),
+      educationLevel: Joi7.string().optional().allow("", null),
+      gradeLevel: Joi7.string().optional().allow("", null),
+      teachingStyle: Joi7.string().optional().allow("", null),
+      school: Joi7.string().hex().optional().allow("", null),
+      status: Joi7.string().optional().allow("", null)
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -3467,7 +3569,7 @@ function useGradeLevelController() {
     const school = req.query.school ?? "";
     const search = req.query.search ?? "";
     try {
-      const gradeLevels = await _getAll({
+      const gradeLevels2 = await _getAll({
         page,
         limit,
         sort: sortObj,
@@ -3478,7 +3580,7 @@ function useGradeLevelController() {
         school,
         search
       });
-      res.json(gradeLevels);
+      res.json(gradeLevels2);
       return;
     } catch (error2) {
       next(error2);
@@ -3486,8 +3588,8 @@ function useGradeLevelController() {
   }
   async function getById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi6.object({
-      id: Joi6.string().hex().required()
+    const validation = Joi7.object({
+      id: Joi7.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
@@ -3507,8 +3609,8 @@ function useGradeLevelController() {
   }
   async function deleteById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi6.object({
-      id: Joi6.string().hex().required()
+    const validation = Joi7.object({
+      id: Joi7.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
@@ -3529,9 +3631,9 @@ function useGradeLevelController() {
   async function getByEducationLevel(req, res, next) {
     const educationLevel = req.params.educationLevel;
     const school = req.query.school;
-    const validation = Joi6.object({
-      educationLevel: Joi6.string().required(),
-      school: Joi6.string().hex().optional().allow("", null)
+    const validation = Joi7.object({
+      educationLevel: Joi7.string().required(),
+      school: Joi7.string().hex().optional().allow("", null)
     });
     const { error } = validation.validate({ educationLevel, school });
     if (error) {
@@ -3539,10 +3641,10 @@ function useGradeLevelController() {
       return;
     }
     try {
-      const gradeLevels = await _getByEducationLevel(educationLevel, school);
+      const gradeLevels2 = await _getByEducationLevel(educationLevel, school);
       res.json({
         message: "Successfully retrieved grade levels by education level.",
-        data: { gradeLevels }
+        data: { gradeLevels: gradeLevels2 }
       });
       return;
     } catch (error2) {
@@ -3561,14 +3663,14 @@ function useGradeLevelController() {
 
 // src/resources/region/region.model.ts
 import { BadRequestError as BadRequestError11 } from "@eeplatform/nodejs-utils";
-import Joi7 from "joi";
+import Joi8 from "joi";
 import { ObjectId as ObjectId7 } from "mongodb";
-var schemaRegion = Joi7.object({
-  _id: Joi7.string().hex().optional().allow(null, ""),
-  name: Joi7.string().min(1).max(100).required(),
-  createdAt: Joi7.string().isoDate().optional(),
-  updatedAt: Joi7.string().isoDate().optional(),
-  deletedAt: Joi7.string().isoDate().optional().allow(null, "")
+var schemaRegion = Joi8.object({
+  _id: Joi8.string().hex().optional().allow(null, ""),
+  name: Joi8.string().min(1).max(100).required(),
+  createdAt: Joi8.string().isoDate().optional(),
+  updatedAt: Joi8.string().isoDate().optional(),
+  deletedAt: Joi8.string().isoDate().optional().allow(null, "")
 });
 function modelRegion(value) {
   const { error } = schemaRegion.validate(value);
@@ -3856,7 +3958,7 @@ function useRegionRepo() {
 
 // src/resources/region/region.controller.ts
 import { BadRequestError as BadRequestError13 } from "@eeplatform/nodejs-utils";
-import Joi8 from "joi";
+import Joi9 from "joi";
 function useRegionController() {
   const {
     add: _add,
@@ -3886,11 +3988,11 @@ function useRegionController() {
   }
   async function getAll(req, res, next) {
     const query = req.query;
-    const validation = Joi8.object({
-      page: Joi8.number().min(1).optional().allow("", null),
-      limit: Joi8.number().min(1).optional().allow("", null),
-      search: Joi8.string().optional().allow("", null),
-      status: Joi8.string().optional().allow("", null)
+    const validation = Joi9.object({
+      page: Joi9.number().min(1).optional().allow("", null),
+      limit: Joi9.number().min(1).optional().allow("", null),
+      search: Joi9.string().optional().allow("", null),
+      status: Joi9.string().optional().allow("", null)
     });
     const { error } = validation.validate(query);
     const page = typeof req.query.page === "string" ? Number(req.query.page) : 1;
@@ -3921,8 +4023,8 @@ function useRegionController() {
   }
   async function getById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi8.object({
-      id: Joi8.string().hex().required()
+    const validation = Joi9.object({
+      id: Joi9.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
@@ -3942,8 +4044,8 @@ function useRegionController() {
   }
   async function getByName(req, res, next) {
     const name = req.params.name;
-    const validation = Joi8.object({
-      name: Joi8.string().required()
+    const validation = Joi9.object({
+      name: Joi9.string().required()
     });
     const { error } = validation.validate({ name });
     if (error) {
@@ -3964,10 +4066,10 @@ function useRegionController() {
   async function updateField(req, res, next) {
     const _id = req.params.id;
     const { field, value } = req.body;
-    const validation = Joi8.object({
-      _id: Joi8.string().hex().required(),
-      field: Joi8.string().valid("name", "director", "directorName").required(),
-      value: Joi8.string().required()
+    const validation = Joi9.object({
+      _id: Joi9.string().hex().required(),
+      field: Joi9.string().valid("name", "director", "directorName").required(),
+      value: Joi9.string().required()
     });
     const { error } = validation.validate({ _id, field, value });
     if (error) {
@@ -3984,8 +4086,8 @@ function useRegionController() {
   }
   async function deleteById(req, res, next) {
     const _id = req.params.id;
-    const validation = Joi8.object({
-      _id: Joi8.string().hex().required()
+    const validation = Joi9.object({
+      _id: Joi9.string().hex().required()
     });
     const { error } = validation.validate({ _id });
     if (error) {
@@ -4012,26 +4114,26 @@ function useRegionController() {
 
 // src/resources/division/division.model.ts
 import { BadRequestError as BadRequestError14 } from "@eeplatform/nodejs-utils";
-import Joi9 from "joi";
+import Joi10 from "joi";
 import { ObjectId as ObjectId9 } from "mongodb";
-var schemaDivision = Joi9.object({
-  _id: Joi9.string().hex().optional().allow(null, ""),
-  name: Joi9.string().min(1).max(100).required(),
-  region: Joi9.string().hex().required(),
-  regionName: Joi9.string().min(1).max(100).required(),
-  superintendent: Joi9.string().hex().optional().allow(null, ""),
-  superintendentName: Joi9.string().min(1).max(100).optional().allow(null, ""),
-  createdAt: Joi9.string().isoDate().optional(),
-  updatedAt: Joi9.string().isoDate().optional(),
-  deletedAt: Joi9.string().isoDate().optional().allow(null, "")
+var schemaDivision = Joi10.object({
+  _id: Joi10.string().hex().optional().allow(null, ""),
+  name: Joi10.string().min(1).max(100).required(),
+  region: Joi10.string().hex().required(),
+  regionName: Joi10.string().min(1).max(100).required(),
+  superintendent: Joi10.string().hex().optional().allow(null, ""),
+  superintendentName: Joi10.string().min(1).max(100).optional().allow(null, ""),
+  createdAt: Joi10.string().isoDate().optional(),
+  updatedAt: Joi10.string().isoDate().optional(),
+  deletedAt: Joi10.string().isoDate().optional().allow(null, "")
 });
-var schemaDivisionUpdate = Joi9.object({
-  _id: Joi9.string().hex().optional().allow(null, ""),
-  name: Joi9.string().min(1).max(100).required(),
-  region: Joi9.string().hex().required(),
-  regionName: Joi9.string().min(1).max(100).required(),
-  superintendent: Joi9.string().hex().optional().allow(null, ""),
-  superintendentName: Joi9.string().min(1).max(100).optional().allow(null, "")
+var schemaDivisionUpdate = Joi10.object({
+  _id: Joi10.string().hex().optional().allow(null, ""),
+  name: Joi10.string().min(1).max(100).required(),
+  region: Joi10.string().hex().required(),
+  regionName: Joi10.string().min(1).max(100).required(),
+  superintendent: Joi10.string().hex().optional().allow(null, ""),
+  superintendentName: Joi10.string().min(1).max(100).optional().allow(null, "")
 });
 function modelDivision(value) {
   const { error } = schemaDivision.validate(value);
@@ -4386,49 +4488,49 @@ import { useRoleRepo as useRoleRepo2 } from "@eeplatform/core";
 
 // src/resources/school/school.model.ts
 import { BadRequestError as BadRequestError16 } from "@eeplatform/nodejs-utils";
-import Joi10 from "joi";
+import Joi11 from "joi";
 import { ObjectId as ObjectId11 } from "mongodb";
-var schemaSchool = Joi10.object({
-  _id: Joi10.string().hex().optional().allow(null, ""),
-  id: Joi10.string().min(1).max(50).required(),
-  name: Joi10.string().min(1).max(100).required(),
-  region: Joi10.string().hex().required(),
-  regionName: Joi10.string().min(1).max(100).optional().allow(null, ""),
-  division: Joi10.string().hex().required(),
-  divisionName: Joi10.string().min(1).max(100).optional().allow(null, ""),
-  principal: Joi10.string().hex().optional().allow(null, ""),
-  principalName: Joi10.string().min(1).max(100).optional().allow(null, ""),
-  street: Joi10.string().max(200).optional().allow(null, ""),
-  barangay: Joi10.string().max(200).optional().allow(null, ""),
-  cityMunicipality: Joi10.string().max(100).optional().allow(null, ""),
-  province: Joi10.string().max(100).optional().allow(null, ""),
-  cityMunicipalityPSGC: Joi10.string().length(10).optional().allow(null, ""),
-  postalCode: Joi10.string().max(20).optional().allow(null, ""),
-  contactNumber: Joi10.string().max(20).optional().allow(null, ""),
-  email: Joi10.string().email().max(100).optional().allow(null, ""),
-  status: Joi10.string().optional().allow(null, ""),
-  createdBy: Joi10.string().optional().allow(null, ""),
-  createdAt: Joi10.string().isoDate().optional().allow(null, ""),
-  updatedAt: Joi10.string().isoDate().optional().allow(null, ""),
-  deletedAt: Joi10.string().isoDate().optional().allow(null, "")
+var schemaSchool = Joi11.object({
+  _id: Joi11.string().hex().optional().allow(null, ""),
+  id: Joi11.string().min(1).max(50).required(),
+  name: Joi11.string().min(1).max(100).required(),
+  region: Joi11.string().hex().required(),
+  regionName: Joi11.string().min(1).max(100).optional().allow(null, ""),
+  division: Joi11.string().hex().required(),
+  divisionName: Joi11.string().min(1).max(100).optional().allow(null, ""),
+  principal: Joi11.string().hex().optional().allow(null, ""),
+  principalName: Joi11.string().min(1).max(100).optional().allow(null, ""),
+  street: Joi11.string().max(200).optional().allow(null, ""),
+  barangay: Joi11.string().max(200).optional().allow(null, ""),
+  cityMunicipality: Joi11.string().max(100).optional().allow(null, ""),
+  province: Joi11.string().max(100).optional().allow(null, ""),
+  cityMunicipalityPSGC: Joi11.string().length(10).optional().allow(null, ""),
+  postalCode: Joi11.string().max(20).optional().allow(null, ""),
+  contactNumber: Joi11.string().max(20).optional().allow(null, ""),
+  email: Joi11.string().email().max(100).optional().allow(null, ""),
+  status: Joi11.string().optional().allow(null, ""),
+  createdBy: Joi11.string().optional().allow(null, ""),
+  createdAt: Joi11.string().isoDate().optional().allow(null, ""),
+  updatedAt: Joi11.string().isoDate().optional().allow(null, ""),
+  deletedAt: Joi11.string().isoDate().optional().allow(null, "")
 });
-var schemaSchoolUpdate = Joi10.object({
-  id: Joi10.string().min(1).max(50).required(),
-  name: Joi10.string().min(1).max(100).required(),
-  region: Joi10.string().hex().required(),
-  regionName: Joi10.string().min(1).max(100).optional().allow(null, ""),
-  division: Joi10.string().hex().required(),
-  divisionName: Joi10.string().min(1).max(100).optional().allow(null, ""),
-  principal: Joi10.string().hex().optional().allow(null, ""),
-  principalName: Joi10.string().min(1).max(100).optional().allow(null, ""),
-  street: Joi10.string().max(200).optional().allow(null, ""),
-  barangay: Joi10.string().max(200).optional().allow(null, ""),
-  cityMunicipality: Joi10.string().max(100).optional().allow(null, ""),
-  province: Joi10.string().max(100).optional().allow(null, ""),
-  cityMunicipalityPSGC: Joi10.string().length(10).optional().allow(null, ""),
-  postalCode: Joi10.string().max(20).optional().allow(null, ""),
-  contactNumber: Joi10.string().max(20).optional().allow(null, ""),
-  email: Joi10.string().email().max(100).optional().allow(null, "")
+var schemaSchoolUpdate = Joi11.object({
+  id: Joi11.string().min(1).max(50).required(),
+  name: Joi11.string().min(1).max(100).required(),
+  region: Joi11.string().hex().required(),
+  regionName: Joi11.string().min(1).max(100).optional().allow(null, ""),
+  division: Joi11.string().hex().required(),
+  divisionName: Joi11.string().min(1).max(100).optional().allow(null, ""),
+  principal: Joi11.string().hex().optional().allow(null, ""),
+  principalName: Joi11.string().min(1).max(100).optional().allow(null, ""),
+  street: Joi11.string().max(200).optional().allow(null, ""),
+  barangay: Joi11.string().max(200).optional().allow(null, ""),
+  cityMunicipality: Joi11.string().max(100).optional().allow(null, ""),
+  province: Joi11.string().max(100).optional().allow(null, ""),
+  cityMunicipalityPSGC: Joi11.string().length(10).optional().allow(null, ""),
+  postalCode: Joi11.string().max(20).optional().allow(null, ""),
+  contactNumber: Joi11.string().max(20).optional().allow(null, ""),
+  email: Joi11.string().email().max(100).optional().allow(null, "")
 });
 function modelSchool(value) {
   const { error } = schemaSchool.validate(value);
@@ -4515,7 +4617,6 @@ function useSchoolRepo() {
         { key: { name: 1 } },
         { key: { createdAt: 1 } },
         { key: { name: "text" } },
-        { key: { cityMunicipalityPSGC: 1 }, unique: true, name: "unique_psgc" },
         { key: { id: 1, status: 1 }, unique: true, name: "unique_school_id" }
       ]);
     } catch (error) {
@@ -33298,14 +33399,20 @@ ${errors.slice(0, 5).join("\n")}${errors.length > 5 ? `
       session.startTransaction();
       const school = schools[i];
       try {
-        const provincePSGC = await getPSGCByName({
-          name: school.province ?? "",
-          type: "Prov"
-        });
+        let provincePSGC = "";
+        if (school.province) {
+          const provinceData = await getPSGCByName({
+            name: school.province,
+            type: "Prov"
+          });
+          if (provinceData) {
+            provincePSGC = provinceData.code ?? "";
+          }
+        }
         const cityMunPSGC = await getPSGCByName({
           name: school.cityMunicipality ?? "",
           type: "City",
-          prefix: provincePSGC ? provincePSGC.code.toString().slice(0, 5) : ""
+          prefix: provincePSGC ? provincePSGC.toString().slice(0, 5) : ""
         });
         if (!cityMunPSGC) {
           throw new BadRequestError18(
@@ -33360,7 +33467,7 @@ ${errors.slice(0, 5).join("\n")}${errors.length > 5 ? `
 
 // src/resources/school/school.controller.ts
 import { BadRequestError as BadRequestError19 } from "@eeplatform/nodejs-utils";
-import Joi11 from "joi";
+import Joi12 from "joi";
 function useSchoolController() {
   const {
     getAll: _getAll,
@@ -33393,16 +33500,16 @@ function useSchoolController() {
     }
   }
   async function getAll(req, res, next) {
-    const validation = Joi11.object({
-      page: Joi11.number().optional().allow(null, ""),
-      limit: Joi11.number().optional().allow(null, ""),
-      sort: Joi11.string().optional().allow(null, ""),
-      sortOrder: Joi11.string().optional().allow(null, ""),
-      status: Joi11.string().optional().allow(null, ""),
-      org: Joi11.string().hex().optional().allow(null, ""),
-      app: Joi11.string().optional().allow(null, ""),
-      search: Joi11.string().optional().allow(null, ""),
-      psgc: Joi11.string().optional().allow(null, "")
+    const validation = Joi12.object({
+      page: Joi12.number().optional().allow(null, ""),
+      limit: Joi12.number().optional().allow(null, ""),
+      sort: Joi12.string().optional().allow(null, ""),
+      sortOrder: Joi12.string().optional().allow(null, ""),
+      status: Joi12.string().optional().allow(null, ""),
+      org: Joi12.string().hex().optional().allow(null, ""),
+      app: Joi12.string().optional().allow(null, ""),
+      search: Joi12.string().optional().allow(null, ""),
+      psgc: Joi12.string().optional().allow(null, "")
     });
     const { error } = validation.validate(req.query);
     if (error) {
@@ -33440,7 +33547,7 @@ function useSchoolController() {
   }
   async function getByCreatedBy(req, res, next) {
     const createdBy = req.params.createdBy;
-    const validation = Joi11.string().hex().required();
+    const validation = Joi12.string().hex().required();
     const { error } = validation.validate(createdBy);
     if (error) {
       next(new BadRequestError19(`Validation error: ${error.message}`));
@@ -33457,9 +33564,9 @@ function useSchoolController() {
   async function updateStatusById(req, res, next) {
     const schoolId = req.params.id;
     const status = req.params.status;
-    const validation = Joi11.object({
-      id: Joi11.string().hex().required(),
-      status: Joi11.string().valid("active", "deleted", "suspended").required()
+    const validation = Joi12.object({
+      id: Joi12.string().hex().required(),
+      status: Joi12.string().valid("active", "deleted", "suspended").required()
     });
     const { error } = validation.validate({ id: schoolId, status });
     if (error) {
@@ -33492,8 +33599,8 @@ function useSchoolController() {
   }
   async function approveSchool(req, res, next) {
     const schoolId = req.params.id;
-    const validation = Joi11.object({
-      id: Joi11.string().hex().required()
+    const validation = Joi12.object({
+      id: Joi12.string().hex().required()
     });
     const { error } = validation.validate({ id: schoolId });
     if (error) {
@@ -33516,11 +33623,11 @@ function useSchoolController() {
       return;
     }
     const { region, regionName, division, divisionName } = req.body;
-    const validation = Joi11.object({
-      region: Joi11.string().hex().required(),
-      regionName: Joi11.string().min(1).required(),
-      division: Joi11.string().hex().required(),
-      divisionName: Joi11.string().min(1).required()
+    const validation = Joi12.object({
+      region: Joi12.string().hex().required(),
+      regionName: Joi12.string().min(1).required(),
+      division: Joi12.string().hex().required(),
+      divisionName: Joi12.string().min(1).required()
     });
     const { error } = validation.validate({
       region,
@@ -33549,10 +33656,10 @@ function useSchoolController() {
   async function updateFieldById(req, res, next) {
     const _id = req.params.id;
     const { field, value } = req.body;
-    const validation = Joi11.object({
-      _id: Joi11.string().hex().required(),
-      field: Joi11.string().valid("name", "director", "directorName").required(),
-      value: Joi11.string().required()
+    const validation = Joi12.object({
+      _id: Joi12.string().hex().required(),
+      field: Joi12.string().valid("name", "director", "directorName").required(),
+      value: Joi12.string().required()
     });
     const { error } = validation.validate({ _id, field, value });
     if (error) {
@@ -33570,8 +33677,8 @@ function useSchoolController() {
   async function updateById(req, res, next) {
     const id = req.params.id;
     const payload = req.body;
-    const validation = Joi11.object({
-      id: Joi11.string().hex().required()
+    const validation = Joi12.object({
+      id: Joi12.string().hex().required()
     });
     const { error: idError } = validation.validate({ id });
     if (idError) {
@@ -33593,8 +33700,8 @@ function useSchoolController() {
   }
   async function deleteById(req, res, next) {
     const _id = req.params.id;
-    const validation = Joi11.object({
-      _id: Joi11.string().hex().required()
+    const validation = Joi12.object({
+      _id: Joi12.string().hex().required()
     });
     const { error } = validation.validate({ _id });
     if (error) {
@@ -33689,7 +33796,7 @@ function useDivisionService() {
 
 // src/resources/division/division.controller.ts
 import { BadRequestError as BadRequestError20 } from "@eeplatform/nodejs-utils";
-import Joi12 from "joi";
+import Joi13 from "joi";
 function useDivisionController() {
   const { add: _add, updateById: _updateById } = useDivisionService();
   const {
@@ -33719,12 +33826,12 @@ function useDivisionController() {
   }
   async function getAll(req, res, next) {
     const query = req.query;
-    const validation = Joi12.object({
-      page: Joi12.number().min(1).optional().allow("", null),
-      limit: Joi12.number().min(1).optional().allow("", null),
-      search: Joi12.string().optional().allow("", null),
-      status: Joi12.string().optional().allow("", null),
-      region: Joi12.string().hex().optional().allow("", null)
+    const validation = Joi13.object({
+      page: Joi13.number().min(1).optional().allow("", null),
+      limit: Joi13.number().min(1).optional().allow("", null),
+      search: Joi13.string().optional().allow("", null),
+      status: Joi13.string().optional().allow("", null),
+      region: Joi13.string().hex().optional().allow("", null)
     });
     const { error } = validation.validate(query);
     const page = typeof req.query.page === "string" ? Number(req.query.page) : 1;
@@ -33756,8 +33863,8 @@ function useDivisionController() {
   }
   async function getById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi12.object({
-      id: Joi12.string().hex().required()
+    const validation = Joi13.object({
+      id: Joi13.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
@@ -33777,8 +33884,8 @@ function useDivisionController() {
   }
   async function getByName(req, res, next) {
     const name = req.params.name;
-    const validation = Joi12.object({
-      name: Joi12.string().required()
+    const validation = Joi13.object({
+      name: Joi13.string().required()
     });
     const { error } = validation.validate({ name });
     if (error) {
@@ -33799,10 +33906,10 @@ function useDivisionController() {
   async function updateField(req, res, next) {
     const _id = req.params.id;
     const { field, value } = req.body;
-    const validation = Joi12.object({
-      _id: Joi12.string().hex().required(),
-      field: Joi12.string().valid("name", "director", "directorName").required(),
-      value: Joi12.string().required()
+    const validation = Joi13.object({
+      _id: Joi13.string().hex().required(),
+      field: Joi13.string().valid("name", "director", "directorName").required(),
+      value: Joi13.string().required()
     });
     const { error } = validation.validate({ _id, field, value });
     if (error) {
@@ -33835,8 +33942,8 @@ function useDivisionController() {
   }
   async function deleteById(req, res, next) {
     const _id = req.params.id;
-    const validation = Joi12.object({
-      _id: Joi12.string().hex().required()
+    const validation = Joi13.object({
+      _id: Joi13.string().hex().required()
     });
     const { error } = validation.validate({ _id });
     if (error) {
@@ -33864,48 +33971,48 @@ function useDivisionController() {
 
 // src/resources/asset/asset.model.ts
 import { BadRequestError as BadRequestError21 } from "@eeplatform/nodejs-utils";
-import Joi13 from "joi";
+import Joi14 from "joi";
 import { ObjectId as ObjectId13 } from "mongodb";
-var schemaAsset = Joi13.object({
-  _id: Joi13.string().hex().optional(),
-  school: Joi13.string().hex().required(),
-  asset_type: Joi13.string().required().allow("supply", "furniture-equipment", "fixed-asset"),
-  name: Joi13.string().required(),
-  category: Joi13.string().optional().allow("", null),
-  type: Joi13.string().optional().allow("", null),
-  brand: Joi13.string().optional().allow("", null),
-  unit: Joi13.string().required(),
-  status: Joi13.string().optional().allow("", null),
-  createdAt: Joi13.date().optional().allow("", null),
-  updatedAt: Joi13.date().optional().allow("", null),
-  deletedAt: Joi13.date().optional().allow("", null),
-  metadata: Joi13.object({
-    title: Joi13.string().optional().allow("", null),
-    isbn: Joi13.string().optional().allow("", null),
-    author: Joi13.string().optional().allow("", null),
-    edition: Joi13.string().optional().allow("", null),
-    subject: Joi13.string().optional().allow("", null),
-    grade_level: Joi13.number().integer().min(0).optional().allow("", null),
-    publisher: Joi13.string().optional().allow("", null),
-    language: Joi13.string().optional().allow("", null)
+var schemaAsset = Joi14.object({
+  _id: Joi14.string().hex().optional(),
+  school: Joi14.string().hex().required(),
+  asset_type: Joi14.string().required().allow("supply", "furniture-equipment", "fixed-asset"),
+  name: Joi14.string().required(),
+  category: Joi14.string().optional().allow("", null),
+  type: Joi14.string().optional().allow("", null),
+  brand: Joi14.string().optional().allow("", null),
+  unit: Joi14.string().required(),
+  status: Joi14.string().optional().allow("", null),
+  createdAt: Joi14.date().optional().allow("", null),
+  updatedAt: Joi14.date().optional().allow("", null),
+  deletedAt: Joi14.date().optional().allow("", null),
+  metadata: Joi14.object({
+    title: Joi14.string().optional().allow("", null),
+    isbn: Joi14.string().optional().allow("", null),
+    author: Joi14.string().optional().allow("", null),
+    edition: Joi14.string().optional().allow("", null),
+    subject: Joi14.string().optional().allow("", null),
+    grade_level: Joi14.number().integer().min(0).optional().allow("", null),
+    publisher: Joi14.string().optional().allow("", null),
+    language: Joi14.string().optional().allow("", null)
   }).optional().allow(null)
 });
-var schemaAssetUpdateOption = Joi13.object({
-  name: Joi13.string().optional().allow("", null),
-  category: Joi13.string().optional().allow("", null),
-  type: Joi13.string().optional().allow("", null),
-  brand: Joi13.string().optional().allow("", null),
-  qty: Joi13.number().integer().min(0).optional().allow("", null),
-  unit: Joi13.string().optional().allow("", null),
-  metadata: Joi13.object({
-    title: Joi13.string().optional().allow("", null),
-    isbn: Joi13.string().optional().allow("", null),
-    author: Joi13.string().optional().allow("", null),
-    edition: Joi13.string().optional().allow("", null),
-    subject: Joi13.string().optional().allow("", null),
-    grade_level: Joi13.number().integer().min(0).optional().allow("", null),
-    publisher: Joi13.string().optional().allow("", null),
-    language: Joi13.string().optional().allow("", null)
+var schemaAssetUpdateOption = Joi14.object({
+  name: Joi14.string().optional().allow("", null),
+  category: Joi14.string().optional().allow("", null),
+  type: Joi14.string().optional().allow("", null),
+  brand: Joi14.string().optional().allow("", null),
+  qty: Joi14.number().integer().min(0).optional().allow("", null),
+  unit: Joi14.string().optional().allow("", null),
+  metadata: Joi14.object({
+    title: Joi14.string().optional().allow("", null),
+    isbn: Joi14.string().optional().allow("", null),
+    author: Joi14.string().optional().allow("", null),
+    edition: Joi14.string().optional().allow("", null),
+    subject: Joi14.string().optional().allow("", null),
+    grade_level: Joi14.number().integer().min(0).optional().allow("", null),
+    publisher: Joi14.string().optional().allow("", null),
+    language: Joi14.string().optional().allow("", null)
   }).optional().allow(null)
 });
 function MAsset(value) {
@@ -34344,7 +34451,7 @@ function useAssetRepo() {
 
 // src/resources/asset/asset.controller.ts
 import { BadRequestError as BadRequestError23 } from "@eeplatform/nodejs-utils";
-import Joi14 from "joi";
+import Joi15 from "joi";
 function useAssetController() {
   const {
     add: _add,
@@ -34372,13 +34479,13 @@ function useAssetController() {
   }
   async function getAll(req, res, next) {
     const query = req.query;
-    const validation = Joi14.object({
-      page: Joi14.number().min(1).optional().allow("", null),
-      limit: Joi14.number().min(1).optional().allow("", null),
-      search: Joi14.string().optional().allow("", null),
-      status: Joi14.string().optional().allow("", null),
-      school: Joi14.string().hex().optional().allow("", null),
-      asset_type: Joi14.string().required().allow("supply", "furniture-equipment", "fixed-asset")
+    const validation = Joi15.object({
+      page: Joi15.number().min(1).optional().allow("", null),
+      limit: Joi15.number().min(1).optional().allow("", null),
+      search: Joi15.string().optional().allow("", null),
+      status: Joi15.string().optional().allow("", null),
+      school: Joi15.string().hex().optional().allow("", null),
+      asset_type: Joi15.string().required().allow("supply", "furniture-equipment", "fixed-asset")
     });
     const { error } = validation.validate(query);
     const page = typeof req.query.page === "string" ? Number(req.query.page) : 1;
@@ -34418,7 +34525,7 @@ function useAssetController() {
   }
   async function deleteById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi14.string().hex().required();
+    const validation = Joi15.string().hex().required();
     const { error } = validation.validate(id);
     if (error) {
       next(new BadRequestError23(error.message));
@@ -34433,7 +34540,7 @@ function useAssetController() {
   }
   async function getById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi14.string().hex().required();
+    const validation = Joi15.string().hex().required();
     const { error } = validation.validate(id);
     if (error) {
       next(new BadRequestError23(error.message));
@@ -34464,7 +34571,7 @@ function useAssetController() {
   async function getCategories(req, res, next) {
     const school = req.params.school;
     const asset_type = req.params.asset_type;
-    const validation = Joi14.string().hex().required();
+    const validation = Joi15.string().hex().required();
     const { error } = validation.validate(school);
     if (error) {
       next(new BadRequestError23(error.message));
@@ -34480,7 +34587,7 @@ function useAssetController() {
   async function getTypes(req, res, next) {
     const school = req.params.school;
     const asset_type = req.params.asset_type;
-    const validation = Joi14.string().hex().required();
+    const validation = Joi15.string().hex().required();
     const { error } = validation.validate(school);
     if (error) {
       next(new BadRequestError23(error.message));
@@ -34495,7 +34602,7 @@ function useAssetController() {
   }
   async function getUnitsBySchool(req, res, next) {
     const school = req.params.school;
-    const validation = Joi14.string().hex().required();
+    const validation = Joi15.string().hex().required();
     const { error } = validation.validate(school);
     if (error) {
       next(new BadRequestError23(error.message));
@@ -34522,26 +34629,26 @@ function useAssetController() {
 
 // src/resources/stock-card/stock-card.model.ts
 import { BadRequestError as BadRequestError24 } from "@eeplatform/nodejs-utils";
-import Joi15 from "joi";
+import Joi16 from "joi";
 import { ObjectId as ObjectId15 } from "mongodb";
-var schemaStockCard = Joi15.object({
-  _id: Joi15.string().hex().optional().allow("", null),
-  school: Joi15.string().hex().required(),
-  item: Joi15.string().hex().required(),
-  balance: Joi15.number().optional().allow(null, 0),
-  qty: Joi15.number().required(),
-  unitCost: Joi15.number().optional().allow(null, 0),
-  totalCost: Joi15.number().optional().allow(null, 0),
-  status: Joi15.string().optional().allow(null, ""),
-  condition: Joi15.string().required(),
-  supplier: Joi15.string().optional().allow("", null),
-  location: Joi15.string().optional().allow("", null),
-  locationName: Joi15.string().optional().allow("", null),
-  reason: Joi15.string().optional().allow("", null),
-  remarks: Joi15.string().optional().allow("", null),
-  createdAt: Joi15.date().optional().allow("", null),
-  updatedAt: Joi15.date().optional().allow("", null),
-  deletedAt: Joi15.date().optional().allow("", null)
+var schemaStockCard = Joi16.object({
+  _id: Joi16.string().hex().optional().allow("", null),
+  school: Joi16.string().hex().required(),
+  item: Joi16.string().hex().required(),
+  balance: Joi16.number().optional().allow(null, 0),
+  qty: Joi16.number().required(),
+  unitCost: Joi16.number().optional().allow(null, 0),
+  totalCost: Joi16.number().optional().allow(null, 0),
+  status: Joi16.string().optional().allow(null, ""),
+  condition: Joi16.string().required(),
+  supplier: Joi16.string().optional().allow("", null),
+  location: Joi16.string().optional().allow("", null),
+  locationName: Joi16.string().optional().allow("", null),
+  reason: Joi16.string().optional().allow("", null),
+  remarks: Joi16.string().optional().allow("", null),
+  createdAt: Joi16.date().optional().allow("", null),
+  updatedAt: Joi16.date().optional().allow("", null),
+  deletedAt: Joi16.date().optional().allow("", null)
 });
 function MStockCard(value) {
   const { error } = schemaStockCard.validate(value);
@@ -34840,7 +34947,7 @@ function useStockCardService() {
 
 // src/resources/stock-card/stock-card.controller.ts
 import { BadRequestError as BadRequestError27 } from "@eeplatform/nodejs-utils";
-import Joi16 from "joi";
+import Joi17 from "joi";
 function useStockCardController() {
   const {
     getAll: _getAll,
@@ -34864,11 +34971,11 @@ function useStockCardController() {
   }
   async function getAll(req, res, next) {
     const query = req.query;
-    const validation = Joi16.object({
-      page: Joi16.number().min(1).optional().allow("", null),
-      limit: Joi16.number().min(1).optional().allow("", null),
-      school: Joi16.string().hex().optional().allow("", null),
-      id: Joi16.string().hex().required()
+    const validation = Joi17.object({
+      page: Joi17.number().min(1).optional().allow("", null),
+      limit: Joi17.number().min(1).optional().allow("", null),
+      school: Joi17.string().hex().optional().allow("", null),
+      id: Joi17.string().hex().required()
     });
     const { error } = validation.validate(query);
     const page = typeof req.query.page === "string" ? Number(req.query.page) : 1;
@@ -34904,7 +35011,7 @@ function useStockCardController() {
   }
   async function getById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi16.string().hex().required();
+    const validation = Joi17.string().hex().required();
     const { error } = validation.validate(id);
     if (error) {
       next(new BadRequestError27(error.message));
@@ -34919,7 +35026,7 @@ function useStockCardController() {
   }
   async function getSuppliers(req, res, next) {
     const school = req.params.school;
-    const validation = Joi16.string().hex().required();
+    const validation = Joi17.string().hex().required();
     const { error } = validation.validate(school);
     if (error) {
       next(new BadRequestError27(error.message));
@@ -34942,30 +35049,30 @@ function useStockCardController() {
 
 // src/resources/plantilla/plantilla.model.ts
 import { BadRequestError as BadRequestError28 } from "@eeplatform/nodejs-utils";
-import Joi17 from "joi";
+import Joi18 from "joi";
 import { ObjectId as ObjectId17 } from "mongodb";
-var schemaPlantilla = Joi17.object({
-  _id: Joi17.string().hex().optional().allow(null, ""),
-  org: Joi17.string().hex().required(),
-  orgUnitCode: Joi17.string().optional().allow(null, ""),
-  employmentType: Joi17.string().optional().allow(null, ""),
-  personnelType: Joi17.string().required(),
-  itemNumber: Joi17.string().required(),
-  positionTitle: Joi17.string().required(),
-  positionCategory: Joi17.string().required(),
-  region: Joi17.string().hex().optional().allow(null, ""),
-  regionName: Joi17.string().optional().allow(null, ""),
-  division: Joi17.string().hex().optional().allow(null, ""),
-  divisionName: Joi17.string().optional().allow(null, ""),
-  salaryGrade: Joi17.number().required(),
-  employeeName: Joi17.string().optional().allow(null, ""),
-  annualSalary: Joi17.number().optional().allow(null, 0),
-  monthlySalary: Joi17.number().optional().allow(null, 0),
-  status: Joi17.string().required(),
-  employee: Joi17.string().hex().optional().allow(null, ""),
-  createdAt: Joi17.date().iso().optional().allow(null, ""),
-  updatedAt: Joi17.date().iso().optional().allow(null, ""),
-  deletedAt: Joi17.date().iso().optional().allow(null, "")
+var schemaPlantilla = Joi18.object({
+  _id: Joi18.string().hex().optional().allow(null, ""),
+  org: Joi18.string().hex().required(),
+  orgUnitCode: Joi18.string().optional().allow(null, ""),
+  employmentType: Joi18.string().optional().allow(null, ""),
+  personnelType: Joi18.string().required(),
+  itemNumber: Joi18.string().required(),
+  positionTitle: Joi18.string().required(),
+  positionCategory: Joi18.string().required(),
+  region: Joi18.string().hex().optional().allow(null, ""),
+  regionName: Joi18.string().optional().allow(null, ""),
+  division: Joi18.string().hex().optional().allow(null, ""),
+  divisionName: Joi18.string().optional().allow(null, ""),
+  salaryGrade: Joi18.number().required(),
+  employeeName: Joi18.string().optional().allow(null, ""),
+  annualSalary: Joi18.number().optional().allow(null, 0),
+  monthlySalary: Joi18.number().optional().allow(null, 0),
+  status: Joi18.string().required(),
+  employee: Joi18.string().hex().optional().allow(null, ""),
+  createdAt: Joi18.date().iso().optional().allow(null, ""),
+  updatedAt: Joi18.date().iso().optional().allow(null, ""),
+  deletedAt: Joi18.date().iso().optional().allow(null, "")
 });
 function MPlantilla(data) {
   const { error } = schemaPlantilla.validate(data);
@@ -35456,7 +35563,7 @@ ${errors.slice(0, 10).join("\n")}${errors.length > 10 ? `
 
 // src/resources/plantilla/plantilla.controller.ts
 import { BadRequestError as BadRequestError31 } from "@eeplatform/nodejs-utils";
-import Joi18 from "joi";
+import Joi19 from "joi";
 function usePlantillaController() {
   const {
     add: _addPlantilla,
@@ -35468,11 +35575,11 @@ function usePlantillaController() {
   const { addBulk: _addBulk } = usePlantillaService();
   async function createPlantilla(req, res, next) {
     const value = req.body;
-    const validation = Joi18.object({
-      itemNumber: Joi18.string().required(),
-      positionTitle: Joi18.string().required(),
-      positionCategory: Joi18.string().required(),
-      status: Joi18.string().required()
+    const validation = Joi19.object({
+      itemNumber: Joi19.string().required(),
+      positionTitle: Joi19.string().required(),
+      positionCategory: Joi19.string().required(),
+      status: Joi19.string().required()
     });
     const { error } = validation.validate(value);
     if (error) {
@@ -35502,11 +35609,11 @@ function usePlantillaController() {
       next(new BadRequestError31("Invalid limit number."));
       return;
     }
-    const validation = Joi18.object({
-      page: Joi18.number().min(1).optional().allow("", null),
-      limit: Joi18.number().min(1).optional().allow("", null),
-      search: Joi18.string().optional().allow("", null),
-      org: Joi18.string().optional().allow("", null)
+    const validation = Joi19.object({
+      page: Joi19.number().min(1).optional().allow("", null),
+      limit: Joi19.number().min(1).optional().allow("", null),
+      search: Joi19.string().optional().allow("", null),
+      org: Joi19.string().optional().allow("", null)
     });
     const { error } = validation.validate({ page, limit, search, org });
     if (error) {
@@ -35528,8 +35635,8 @@ function usePlantillaController() {
   }
   async function getPlantillaById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi18.object({
-      id: Joi18.string().hex().required()
+    const validation = Joi19.object({
+      id: Joi19.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
@@ -35551,12 +35658,12 @@ function usePlantillaController() {
   async function updatePlantilla(req, res, next) {
     const id = req.params.id;
     const value = req.body;
-    const validation = Joi18.object({
-      id: Joi18.string().hex().required(),
-      employee: Joi18.string().hex().optional().allow(null, ""),
-      status: Joi18.string().optional(),
-      positionTitle: Joi18.string().optional(),
-      positionCategory: Joi18.string().optional()
+    const validation = Joi19.object({
+      id: Joi19.string().hex().required(),
+      employee: Joi19.string().hex().optional().allow(null, ""),
+      status: Joi19.string().optional(),
+      positionTitle: Joi19.string().optional(),
+      positionCategory: Joi19.string().optional()
     });
     const { error } = validation.validate({ id, ...value });
     if (error) {
@@ -35577,8 +35684,8 @@ function usePlantillaController() {
   }
   async function deletePlantilla(req, res, next) {
     const id = req.params.id;
-    const validation = Joi18.object({
-      id: Joi18.string().hex().required()
+    const validation = Joi19.object({
+      id: Joi19.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
@@ -35603,9 +35710,9 @@ function usePlantillaController() {
       return;
     }
     const { region, division } = req.body;
-    const validation = Joi18.object({
-      region: Joi18.string().hex().optional(),
-      division: Joi18.string().hex().optional()
+    const validation = Joi19.object({
+      region: Joi19.string().hex().optional(),
+      division: Joi19.string().hex().optional()
     });
     const { error } = validation.validate({ region, division });
     if (error) {