@eeplatform/basic-edu 1.3.6 → 1.3.8

package/dist/index.mjs

@@ -4402,7 +4402,6 @@ var schemaSchool = Joi10.object({
   barangay: Joi10.string().max(200).optional().allow(null, ""),
   cityMunicipality: Joi10.string().max(100).optional().allow(null, ""),
   province: Joi10.string().max(100).optional().allow(null, ""),
-  provincePSGC: Joi10.string().length(10).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, ""),
@@ -4426,7 +4425,6 @@ var schemaSchoolUpdate = Joi10.object({
   barangay: Joi10.string().max(200).optional().allow(null, ""),
   cityMunicipality: Joi10.string().max(100).optional().allow(null, ""),
   province: Joi10.string().max(100).optional().allow(null, ""),
-  provincePSGC: Joi10.string().length(10).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, ""),
@@ -4483,7 +4481,6 @@ function modelSchool(value) {
     contactNumber: value.contactNumber ?? "",
     email: value.email ?? "",
     status: value.status ?? "active",
-    provincePSGC: value.provincePSGC ?? "",
     cityMunicipalityPSGC: value.cityMunicipalityPSGC ?? "",
     createdBy: value.createdBy ?? "",
     createdAt: value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
@@ -4583,7 +4580,7 @@ function useSchoolRepo() {
       deletedAt: { $in: ["", null] },
       status
     };
-    sort = Object.keys(sort).length > 0 ? sort : { _id: 1 };
+    sort = Object.keys(sort).length > 0 ? sort : {};
     const cacheKeyOptions = {
       status,
       page,
@@ -4612,12 +4609,12 @@ function useSchoolRepo() {
         });
         return cached;
       }
-      const items = await collection.aggregate([
-        { $match: query },
-        { $sort: sort },
-        { $skip: page * limit },
-        { $limit: limit }
-      ]).toArray();
+      const pipeline = [{ $match: query }];
+      if (Object.keys(sort).length > 0) {
+        pipeline.push({ $sort: sort });
+      }
+      pipeline.push({ $skip: page * limit }, { $limit: limit });
+      const items = await collection.aggregate(pipeline).toArray();
       const length = await collection.countDocuments(query);
       const data = paginate6(items, page, limit, length);
       setCache(cacheKey, data, 600).then(() => {
@@ -33309,22 +33306,16 @@ ${errors.slice(0, 5).join("\n")}${errors.length > 5 ? `
           name: school.province ?? "",
           type: "Prov"
         });
-        if (!provincePSGC) {
-          throw new BadRequestError18(
-            `Province '${school.province}' not found in PSGC data.`
-          );
-        }
         const cityMunPSGC = await getPSGCByName({
           name: school.cityMunicipality ?? "",
           type: "City",
-          prefix: provincePSGC.code.toString().slice(0, 5)
+          prefix: provincePSGC ? provincePSGC.code.toString().slice(0, 5) : ""
         });
         if (!cityMunPSGC) {
           throw new BadRequestError18(
             `City/Municipality '${school.cityMunicipality}' not found in PSGC data.`
           );
         }
-        school.provincePSGC = provincePSGC.code ?? "";
         school.cityMunicipalityPSGC = cityMunPSGC.code ?? "";
         const schoolId = await addSchool(school, session, false);
         await addRole(