@eeplatform/core 1.8.0 → 1.8.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @eeplatform/core
 
+## 1.8.1
+
+### Patch Changes
+
+- aff1249: Revise PSGC implementation
+
 ## 1.8.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -876,7 +876,7 @@ declare const transactionSchema: Joi.ObjectSchema<any>;
 
 type TPSGC = {
     _id?: ObjectId;
-    code: number;
+    code: string;
     name: string;
     type: string;
 };
@@ -890,12 +890,13 @@ declare function modelPSGC(data: any): {
 declare function usePSGCRepo(): {
     createIndexes: () => Promise<void>;
     add: (value: TPSGC, session?: ClientSession) => Promise<ObjectId>;
-    getAll: ({ search, page, limit, sort, status, }?: {
+    getAll: ({ search, page, limit, sort, type, prefix, }?: {
         search?: string | undefined;
         page?: number | undefined;
         limit?: number | undefined;
         sort?: {} | undefined;
-        status?: string | undefined;
+        type?: string | undefined;
+        prefix?: string | undefined;
     }) => Promise<Record<string, any> | {
         items: any[];
         pages: number;
@@ -908,14 +909,22 @@ declare function usePSGCRepo(): {
         value: string;
     }, session?: ClientSession) => Promise<string>;
     deleteById: (_id: string | ObjectId) => Promise<string>;
-    getByName: ({ name, cityMunicipality, code, type }?: {
+    getByName: ({ name, prefix, type }?: {
         name: string;
-        cityMunicipality?: boolean;
-        code?: number;
+        prefix?: string;
         type?: string;
     }) => Promise<TPSGC | null>;
 };
 
+declare function usePSGCController(): {
+    add: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getByName: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    updateField: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    deleteById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+};
+
 declare const MONGO_URI: string;
 declare const MONGO_DB: string;
 declare const PORT: number;
@@ -955,4 +964,4 @@ declare const GEMINI_API_KEY: string;
 declare const ASSEMBLY_AI_API_KEY: string;
 declare const DOMAIN: string;
 
-export { ACCESS_TOKEN_EXPIRY, ACCESS_TOKEN_SECRET, APP_ACCOUNT, APP_MAIN, ASSEMBLY_AI_API_KEY, AudioFileData, AudioTranscriptionOptions, AudioTranscriptionResult, DEFAULT_USER_EMAIL, DEFAULT_USER_FIRST_NAME, DEFAULT_USER_LAST_NAME, DEFAULT_USER_PASSWORD, DOMAIN, GEMINI_API_KEY, MAILER_EMAIL, MAILER_PASSWORD, MAILER_TRANSPORT_HOST, MAILER_TRANSPORT_PORT, MAILER_TRANSPORT_SECURE, MAddress, MBuilding, MBuildingUnit, MFile, MMember, MONGO_DB, MONGO_URI, MOrg, MRole, MToken, MUser, MUserRole, MVerification, PAYPAL_API_URL, PAYPAL_CLIENT_ID, PAYPAL_CLIENT_SECRET, PORT, PhonemeMatchOptions, PhonemeMatchResult, REDIS_HOST, REDIS_PASSWORD, REDIS_PORT, REFRESH_TOKEN_EXPIRY, REFRESH_TOKEN_SECRET, SECRET_KEY, SPACES_ACCESS_KEY, SPACES_BUCKET, SPACES_ENDPOINT, SPACES_REGION, SPACES_SECRET_KEY, TAddress, TBuilding, TBuildingUnit, TCounter, TFile, TMember, TMiniRole, TOrg, TPSGC, TRole, TToken, TUser, TUserRole, TVerification, TVerificationMetadata, VERIFICATION_FORGET_PASSWORD_DURATION, VERIFICATION_USER_INVITE_DURATION, XENDIT_BASE_URL, XENDIT_SECRET_KEY, addressSchema, isDev, modelPSGC, schemaBuilding, schemaBuildingUnit, schemaOrg, schemaPSGC, schemaUpdateOptions, transactionSchema, useAddressController, useAddressRepo, useAudioTranscriptionController, useAuthController, useAuthService, useBuildingController, useBuildingRepo, useBuildingService, useBuildingUnitController, useBuildingUnitRepo, useBuildingUnitService, useCounterModel, useCounterRepo, useFileController, useFileRepo, useFileService, useGeminiAiService, useGitHubService, useMemberController, useMemberRepo, useOrgController, useOrgRepo, useOrgService, usePSGCRepo, useRoleController, useRoleRepo, useTokenRepo, useTranscribeService, useUserController, useUserRepo, useUserService, useUtilController, useVerificationController, useVerificationRepo, useVerificationService };
+export { ACCESS_TOKEN_EXPIRY, ACCESS_TOKEN_SECRET, APP_ACCOUNT, APP_MAIN, ASSEMBLY_AI_API_KEY, AudioFileData, AudioTranscriptionOptions, AudioTranscriptionResult, DEFAULT_USER_EMAIL, DEFAULT_USER_FIRST_NAME, DEFAULT_USER_LAST_NAME, DEFAULT_USER_PASSWORD, DOMAIN, GEMINI_API_KEY, MAILER_EMAIL, MAILER_PASSWORD, MAILER_TRANSPORT_HOST, MAILER_TRANSPORT_PORT, MAILER_TRANSPORT_SECURE, MAddress, MBuilding, MBuildingUnit, MFile, MMember, MONGO_DB, MONGO_URI, MOrg, MRole, MToken, MUser, MUserRole, MVerification, PAYPAL_API_URL, PAYPAL_CLIENT_ID, PAYPAL_CLIENT_SECRET, PORT, PhonemeMatchOptions, PhonemeMatchResult, REDIS_HOST, REDIS_PASSWORD, REDIS_PORT, REFRESH_TOKEN_EXPIRY, REFRESH_TOKEN_SECRET, SECRET_KEY, SPACES_ACCESS_KEY, SPACES_BUCKET, SPACES_ENDPOINT, SPACES_REGION, SPACES_SECRET_KEY, TAddress, TBuilding, TBuildingUnit, TCounter, TFile, TMember, TMiniRole, TOrg, TPSGC, TRole, TToken, TUser, TUserRole, TVerification, TVerificationMetadata, VERIFICATION_FORGET_PASSWORD_DURATION, VERIFICATION_USER_INVITE_DURATION, XENDIT_BASE_URL, XENDIT_SECRET_KEY, addressSchema, isDev, modelPSGC, schemaBuilding, schemaBuildingUnit, schemaOrg, schemaPSGC, schemaUpdateOptions, transactionSchema, useAddressController, useAddressRepo, useAudioTranscriptionController, useAuthController, useAuthService, useBuildingController, useBuildingRepo, useBuildingService, useBuildingUnitController, useBuildingUnitRepo, useBuildingUnitService, useCounterModel, useCounterRepo, useFileController, useFileRepo, useFileService, useGeminiAiService, useGitHubService, useMemberController, useMemberRepo, useOrgController, useOrgRepo, useOrgService, usePSGCController, usePSGCRepo, useRoleController, useRoleRepo, useTokenRepo, useTranscribeService, useUserController, useUserRepo, useUserService, useUtilController, useVerificationController, useVerificationRepo, useVerificationService };

package/dist/index.js

@@ -110,6 +110,7 @@ __export(src_exports, {
   useOrgController: () => useOrgController,
   useOrgRepo: () => useOrgRepo,
   useOrgService: () => useOrgService,
+  usePSGCController: () => usePSGCController,
   usePSGCRepo: () => usePSGCRepo,
   useRoleController: () => useRoleController,
   useRoleRepo: () => useRoleRepo,
@@ -7026,10 +7027,10 @@ var transactionSchema = import_joi17.default.object({
   deletedAt: import_joi17.default.string().optional().allow("", null)
 });
 
-// src/resources/phillipine-std-geo-code/psgc.model.ts
+// src/resources/psgc/psgc.model.ts
 var import_joi18 = __toESM(require("joi"));
 var schemaPSGC = import_joi18.default.object({
-  code: import_joi18.default.number().required(),
+  code: import_joi18.default.string().length(10).required(),
   name: import_joi18.default.string().required(),
   type: import_joi18.default.string().valid("Reg", "Prov", "City", "Mun", "Bgy").required()
 });
@@ -7045,7 +7046,7 @@ function modelPSGC(data) {
   };
 }
 
-// src/resources/phillipine-std-geo-code/psgc.repository.ts
+// src/resources/psgc/psgc.repository.ts
 var import_nodejs_utils39 = require("@eeplatform/nodejs-utils");
 var import_mongodb21 = require("mongodb");
 function usePSGCRepo() {
@@ -7053,7 +7054,7 @@ function usePSGCRepo() {
   if (!db) {
     throw new Error("Unable to connect to server.");
   }
-  const namespace_collection = "philippine.standard.geographic.codes";
+  const namespace_collection = "psgc";
   const collection = db.collection(namespace_collection);
   const { getCache, setCache, delNamespace } = (0, import_nodejs_utils39.useCache)(namespace_collection);
   async function createIndexes() {
@@ -7107,20 +7108,27 @@ function usePSGCRepo() {
     page = 1,
     limit = 10,
     sort = {},
-    status = "active"
+    type = "",
+    prefix = ""
   } = {}) {
     page = page > 0 ? page - 1 : 0;
     const query = {
-      deletedAt: { $in: ["", null] },
-      status
+      type
     };
-    sort = Object.keys(sort).length > 0 ? sort : { _id: 1 };
     const cacheKeyOptions = {
-      status,
+      type,
       page,
       limit,
       sort: JSON.stringify(sort)
     };
+    if (prefix) {
+      query.code = { $regex: `^${prefix}` };
+      cacheKeyOptions.prefix = prefix;
+    }
+    if (type === "City" || type === "Mun") {
+      query.type = { $in: ["City", "Mun"] };
+    }
+    sort = Object.keys(sort).length > 0 ? sort : { _id: 1 };
     if (search) {
       query.$text = { $search: search };
       cacheKeyOptions.search = search;
@@ -7207,23 +7215,16 @@ function usePSGCRepo() {
       }
     }
   }
-  async function getByName({ name, cityMunicipality = false, code = 0, type = "" } = {}) {
+  async function getByName({ name, prefix = "", type = "" } = {}) {
     const query = { $text: { $search: name } };
     const cacheKeyOptions = { name };
-    if (cityMunicipality) {
+    if (["City", "Mun"].includes(type)) {
       query.type = { $in: ["City", "Mun"] };
-      cacheKeyOptions.type = cityMunicipality;
-    }
-    if (type && !cityMunicipality) {
-      query.type = type;
       cacheKeyOptions.type = type;
     }
-    if (code) {
-      query.code = { $gt: code };
-      if (cityMunicipality) {
-        query.code.$lt = code + 1e6;
-      }
-      cacheKeyOptions.code = code;
+    if (prefix) {
+      query.code = { $regex: `^${prefix}` };
+      cacheKeyOptions.prefix = prefix;
     }
     const cacheKey = (0, import_nodejs_utils39.makeCacheKey)(namespace_collection, { name });
     try {
@@ -7307,6 +7308,170 @@ function usePSGCRepo() {
     getByName
   };
 }
+
+// src/resources/psgc/psgc.controller.ts
+var import_nodejs_utils40 = require("@eeplatform/nodejs-utils");
+var import_joi19 = __toESM(require("joi"));
+function usePSGCController() {
+  const {
+    add: _add,
+    getAll: _getAll,
+    getById: _getById,
+    getByName: _getByName,
+    updateFieldById: _updateFieldById,
+    deleteById: _deleteById
+  } = usePSGCRepo();
+  async function add(req, res, next) {
+    const value = req.body;
+    const { error } = schemaPSGC.validate(value);
+    if (error) {
+      next(new import_nodejs_utils40.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const data = await _add(value);
+      res.json({
+        message: "Successfully created region.",
+        data
+      });
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
+  async function getAll(req, res, next) {
+    const query = req.query;
+    const validation = import_joi19.default.object({
+      page: import_joi19.default.number().min(1).optional().allow("", null),
+      limit: import_joi19.default.number().min(1).optional().allow("", null),
+      search: import_joi19.default.string().optional().allow("", null),
+      type: import_joi19.default.string().valid("Reg", "Prov", "City", "Mun", "Bgy").required(),
+      prefix: import_joi19.default.string().optional().allow("", null)
+    });
+    const { error } = validation.validate(query);
+    const page = typeof req.query.page === "string" ? Number(req.query.page) : 1;
+    const limit = typeof req.query.limit === "string" ? Number(req.query.limit) : 10;
+    const search = req.query.search ?? "";
+    const type = req.query.type ?? "";
+    const prefix = req.query.prefix ? String(req.query.prefix) : "";
+    const isPageNumber = isFinite(page);
+    if (!isPageNumber) {
+      next(new import_nodejs_utils40.BadRequestError("Invalid page number."));
+      return;
+    }
+    const isLimitNumber = isFinite(limit);
+    if (!isLimitNumber) {
+      next(new import_nodejs_utils40.BadRequestError("Invalid limit number."));
+      return;
+    }
+    if (error) {
+      next(new import_nodejs_utils40.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const data = await _getAll({
+        page,
+        limit,
+        search,
+        type,
+        prefix
+      });
+      res.json(data);
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
+  async function getById(req, res, next) {
+    const id = req.params.id;
+    const validation = import_joi19.default.object({
+      id: import_joi19.default.string().hex().required()
+    });
+    const { error } = validation.validate({ id });
+    if (error) {
+      next(new import_nodejs_utils40.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const data = await _getById(id);
+      res.json({
+        message: "Successfully retrieved region.",
+        data
+      });
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
+  async function getByName(req, res, next) {
+    const name = req.params.name;
+    const validation = import_joi19.default.object({
+      name: import_joi19.default.string().required()
+    });
+    const { error } = validation.validate({ name });
+    if (error) {
+      next(new import_nodejs_utils40.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const data = await _getByName({ name });
+      res.json({
+        message: "Successfully retrieved region.",
+        data
+      });
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
+  async function updateField(req, res, next) {
+    const _id = req.params.id;
+    const { field, value } = req.body;
+    const validation = import_joi19.default.object({
+      _id: import_joi19.default.string().hex().required(),
+      field: import_joi19.default.string().valid("name", "director", "directorName").required(),
+      value: import_joi19.default.string().required()
+    });
+    const { error } = validation.validate({ _id, field, value });
+    if (error) {
+      next(new import_nodejs_utils40.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const message = await _updateFieldById({ _id, field, value });
+      res.json({ message });
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
+  async function deleteById(req, res, next) {
+    const _id = req.params.id;
+    const validation = import_joi19.default.object({
+      _id: import_joi19.default.string().hex().required()
+    });
+    const { error } = validation.validate({ _id });
+    if (error) {
+      next(new import_nodejs_utils40.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const message = await _deleteById(_id);
+      res.json({ message });
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
+  return {
+    add,
+    getAll,
+    getById,
+    getByName,
+    updateField,
+    deleteById
+  };
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ACCESS_TOKEN_EXPIRY,
@@ -7389,6 +7554,7 @@ function usePSGCRepo() {
   useOrgController,
   useOrgRepo,
   useOrgService,
+  usePSGCController,
   usePSGCRepo,
   useRoleController,
   useRoleRepo,