@eeplatform/basic-edu 1.3.0 → 1.3.1

package/dist/index.mjs

@@ -4604,8 +4604,10 @@ var schemaSchool = Joi11.object({
   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, ""),
-  city: Joi11.string().max(100).optional().allow(null, ""),
+  cityMunicipality: Joi11.string().max(100).optional().allow(null, ""),
   province: Joi11.string().max(100).optional().allow(null, ""),
+  provincePSGC: Joi11.number().optional().allow(null, ""),
+  cityMunicipalityPSGC: Joi11.number().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, ""),
@@ -4626,8 +4628,10 @@ var schemaSchoolUpdate = Joi11.object({
   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, ""),
-  city: Joi11.string().max(100).optional().allow(null, ""),
+  cityMunicipality: Joi11.string().max(100).optional().allow(null, ""),
   province: Joi11.string().max(100).optional().allow(null, ""),
+  provincePSGC: Joi11.number().optional().allow(null, ""),
+  cityMunicipalityPSGC: Joi11.number().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, "")
@@ -4677,12 +4681,14 @@ function modelSchool(value) {
     principalName: value.principalName ?? "",
     street: value.street ?? "",
     barangay: value.barangay ?? "",
-    city: value.city ?? "",
+    cityMunicipality: value.cityMunicipality ?? "",
     province: value.province ?? "",
     postalCode: value.postalCode ?? "",
     contactNumber: value.contactNumber ?? "",
     email: value.email ?? "",
     status: value.status ?? "active",
+    provincePSGC: value.provincePSGC ?? 0,
+    cityMunicipalityPSGC: value.cityMunicipalityPSGC ?? 0,
     createdBy: value.createdBy ?? "",
     createdAt: value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
     updatedAt: value.updatedAt ?? "",
@@ -5057,7 +5063,12 @@ function useSchoolRepo() {
 
 // src/resources/school/school.service.ts
 import { BadRequestError as BadRequestError19, useAtlas as useAtlas9, logger as logger14 } from "@eeplatform/nodejs-utils";
-import { useRoleRepo as useRoleRepo2, useUserRepo, useMemberRepo } from "@eeplatform/core";
+import {
+  useRoleRepo as useRoleRepo2,
+  useUserRepo,
+  useMemberRepo,
+  usePSGCRepo
+} from "@eeplatform/core";
 
 // node_modules/xlsx/xlsx.mjs
 var XLSX = {};
@@ -33403,6 +33414,8 @@ function useSchoolService() {
       const rowNum = i + 1;
       const schoolId = (row.schoolId || row.id || "").toString().trim();
       const name = (row.name || "").toString().trim();
+      const province = (row.province || "").toString().trim();
+      const cityMunicipality = (row.cityMunicipality || "").toString().trim();
       if (!schoolId) {
         errors.push(`Row ${rowNum}: schoolId is required`);
         continue;
@@ -33411,6 +33424,14 @@ function useSchoolService() {
         errors.push(`Row ${rowNum}: name is required`);
         continue;
       }
+      if (!province) {
+        errors.push(`Row ${rowNum}: province is required`);
+        continue;
+      }
+      if (!cityMunicipality) {
+        errors.push(`Row ${rowNum}: city/municipality is required`);
+        continue;
+      }
       const school = {
         id: schoolId,
         name,
@@ -33418,6 +33439,8 @@ function useSchoolService() {
         regionName: payload.regionName,
         division: payload.division,
         divisionName: payload.divisionName,
+        province,
+        cityMunicipality,
         status: "active"
       };
       const { error } = schemaSchool.validate(school);
@@ -33440,6 +33463,7 @@ ${errors.slice(0, 5).join("\n")}${errors.length > 5 ? `
       skipped: 0,
       errors: []
     };
+    const { getByName: getPSGCByName } = usePSGCRepo();
     for (let i = 0; i < schools.length; i++) {
       const session = useAtlas9.getClient()?.startSession();
       if (!session) {
@@ -33448,6 +33472,27 @@ ${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"
+        });
+        if (!provincePSGC) {
+          throw new BadRequestError19(
+            `Province '${school.province}' not found in PSGC data.`
+          );
+        }
+        const cityMunPSGC = await getPSGCByName({
+          name: school.cityMunicipality ?? "",
+          cityMunicipality: true,
+          code: provincePSGC.code
+        });
+        if (!cityMunPSGC) {
+          throw new BadRequestError19(
+            `City/Municipality '${school.cityMunicipality}' not found in PSGC data.`
+          );
+        }
+        school.provincePSGC = provincePSGC.code ?? 0;
+        school.cityMunicipalityPSGC = cityMunPSGC.code ?? 0;
         const schoolId = await addSchool(school, session, false);
         await addRole(
           {