@eeplatform/basic-edu 1.3.5 → 1.3.7

package/dist/index.mjs

@@ -4518,6 +4518,7 @@ 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) {
@@ -4574,20 +4575,25 @@ function useSchoolRepo() {
     page = 1,
     limit = 10,
     sort = {},
-    status = "active"
+    status = "active",
+    prefix = ""
   } = {}) {
     page = page > 0 ? page - 1 : 0;
     const query = {
       deletedAt: { $in: ["", null] },
       status
     };
-    sort = Object.keys(sort).length > 0 ? sort : { _id: 1 };
+    sort = Object.keys(sort).length > 0 ? sort : {};
     const cacheKeyOptions = {
       status,
       page,
       limit,
       sort: JSON.stringify(sort)
     };
+    if (prefix) {
+      query.cityMunicipalityPSGC = { $regex: `^${prefix}` };
+      cacheKeyOptions.prefix = prefix;
+    }
     if (search) {
       query.$text = { $search: search };
       cacheKeyOptions.search = search;
@@ -4606,12 +4612,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(() => {
@@ -33408,7 +33414,8 @@ function useSchoolController() {
       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, "")
+      search: Joi11.string().optional().allow(null, ""),
+      psgc: Joi11.string().optional().allow(null, "")
     });
     const { error } = validation.validate(req.query);
     if (error) {
@@ -33428,13 +33435,15 @@ function useSchoolController() {
     }
     const status = req.query.status ?? "active";
     const search = req.query.search ?? "";
+    const psgc = req.query.psgc ?? "";
     try {
       const schools = await _getAll({
         page,
         limit,
         sort: sortObj,
         status,
-        search
+        search,
+        prefix: psgc
       });
       res.status(200).json(schools);
       return;