@eeplatform/basic-edu 1.3.0 → 1.3.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @eeplatform/basic-edu
 
+## 1.3.1
+
+### Patch Changes
+
+- cdc678a: Update dependencies
+
 ## 1.3.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -469,8 +469,10 @@ type TSchool = {
     principalName?: string;
     street?: string;
     barangay?: string;
-    city?: string;
+    cityMunicipality?: string;
     province?: string;
+    provincePSGC?: number;
+    cityMunicipalityPSGC?: number;
     postalCode?: string;
     contactNumber?: string;
     email?: string;

package/dist/index.js

@@ -4603,8 +4603,10 @@ var schemaSchool = import_joi11.default.object({
   principalName: import_joi11.default.string().min(1).max(100).optional().allow(null, ""),
   street: import_joi11.default.string().max(200).optional().allow(null, ""),
   barangay: import_joi11.default.string().max(200).optional().allow(null, ""),
-  city: import_joi11.default.string().max(100).optional().allow(null, ""),
+  cityMunicipality: import_joi11.default.string().max(100).optional().allow(null, ""),
   province: import_joi11.default.string().max(100).optional().allow(null, ""),
+  provincePSGC: import_joi11.default.number().optional().allow(null, ""),
+  cityMunicipalityPSGC: import_joi11.default.number().optional().allow(null, ""),
   postalCode: import_joi11.default.string().max(20).optional().allow(null, ""),
   contactNumber: import_joi11.default.string().max(20).optional().allow(null, ""),
   email: import_joi11.default.string().email().max(100).optional().allow(null, ""),
@@ -4625,8 +4627,10 @@ var schemaSchoolUpdate = import_joi11.default.object({
   principalName: import_joi11.default.string().min(1).max(100).optional().allow(null, ""),
   street: import_joi11.default.string().max(200).optional().allow(null, ""),
   barangay: import_joi11.default.string().max(200).optional().allow(null, ""),
-  city: import_joi11.default.string().max(100).optional().allow(null, ""),
+  cityMunicipality: import_joi11.default.string().max(100).optional().allow(null, ""),
   province: import_joi11.default.string().max(100).optional().allow(null, ""),
+  provincePSGC: import_joi11.default.number().optional().allow(null, ""),
+  cityMunicipalityPSGC: import_joi11.default.number().optional().allow(null, ""),
   postalCode: import_joi11.default.string().max(20).optional().allow(null, ""),
   contactNumber: import_joi11.default.string().max(20).optional().allow(null, ""),
   email: import_joi11.default.string().email().max(100).optional().allow(null, "")
@@ -4676,12 +4680,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 ?? "",
@@ -33393,6 +33399,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;
@@ -33401,6 +33409,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,
@@ -33408,6 +33424,8 @@ function useSchoolService() {
         regionName: payload.regionName,
         division: payload.division,
         divisionName: payload.divisionName,
+        province,
+        cityMunicipality,
         status: "active"
       };
       const { error } = schemaSchool.validate(school);
@@ -33430,6 +33448,7 @@ ${errors.slice(0, 5).join("\n")}${errors.length > 5 ? `
       skipped: 0,
       errors: []
     };
+    const { getByName: getPSGCByName } = (0, import_core2.usePSGCRepo)();
     for (let i = 0; i < schools.length; i++) {
       const session = import_nodejs_utils20.useAtlas.getClient()?.startSession();
       if (!session) {
@@ -33438,6 +33457,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 import_nodejs_utils20.BadRequestError(
+            `Province '${school.province}' not found in PSGC data.`
+          );
+        }
+        const cityMunPSGC = await getPSGCByName({
+          name: school.cityMunicipality ?? "",
+          cityMunicipality: true,
+          code: provincePSGC.code
+        });
+        if (!cityMunPSGC) {
+          throw new import_nodejs_utils20.BadRequestError(
+            `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(
           {