@goweekdays/core 2.1.4 → 2.2.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @goweekdays/core
 
+## 2.2.0
+
+### Minor Changes
+
+- 5f5ef8e: Implemented role services
+
 ## 2.1.4
 
 ### Patch Changes

package/dist/index.d.ts

@@ -319,6 +319,7 @@ declare function useMemberRepo(): {
     createTextIndex: () => Promise<void>;
     add: (value: TMember, session?: ClientSession) => Promise<string>;
     getById: (_id: string | ObjectId) => Promise<TMember | null>;
+    getByRole: (role: string | ObjectId) => Promise<TMember | null>;
     getAll: ({ search, limit, page, user, org, type, status }?: {
         search: string;
         limit: number;
@@ -505,14 +506,18 @@ declare function useRoleRepo(): {
         pageRange: string;
     } | TRole[]>;
     getRoleByUserId: (value: ObjectId | string) => Promise<TRole | null>;
-    getRoleById: (_id: ObjectId | string) => Promise<mongodb.WithId<bson.Document> | TRole | null>;
+    getById: (_id: ObjectId | string) => Promise<mongodb.WithId<bson.Document> | TRole | null>;
     getRoleByName: (name: string) => Promise<mongodb.WithId<bson.Document> | TRole | null>;
     updateRole: (_id: string | ObjectId, value: TMiniRole, session?: ClientSession) => Promise<string>;
-    deleteRole: (_id: ObjectId | string, session?: ClientSession) => Promise<string>;
+    deleteById: (_id: ObjectId | string, session?: ClientSession) => Promise<string>;
     updatePermissionsById: (_id: string | ObjectId, permissions: TRole["permissions"], session?: ClientSession) => Promise<string>;
     delCachedData: () => void;
 };
 
+declare function useRoleService(): {
+    deleteById: (id: string) => Promise<void>;
+};
+
 declare function useRoleController(): {
     createRole: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getRoles: (req: Request, res: Response, next: NextFunction) => Promise<void>;
@@ -965,4 +970,4 @@ declare const XENDIT_SECRET_KEY: string;
 declare const XENDIT_BASE_URL: string;
 declare const DOMAIN: string;
 
-export { ACCESS_TOKEN_EXPIRY, ACCESS_TOKEN_SECRET, APP_ACCOUNT, APP_MAIN, DEFAULT_USER_EMAIL, DEFAULT_USER_FIRST_NAME, DEFAULT_USER_LAST_NAME, DEFAULT_USER_PASSWORD, DOMAIN, MAILER_EMAIL, MAILER_PASSWORD, MAILER_TRANSPORT_HOST, MAILER_TRANSPORT_PORT, MAILER_TRANSPORT_SECURE, MAddress, MBuilding, MBuildingUnit, MFile, MMember, MONGO_DB, MONGO_URI, MOrg, MUser, MUserRole, MVerification, OrgTypes, PAYPAL_API_URL, PAYPAL_CLIENT_ID, PAYPAL_CLIENT_SECRET, PORT, 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, TApp, TBuilding, TBuildingUnit, TCounter, TFile, TMember, TMiniRole, TOrg, TPSGC, TPermission, TPermissionGroup, TRole, TUser, TUserRole, TVerification, TVerificationMetadata, VERIFICATION_FORGET_PASSWORD_DURATION, VERIFICATION_USER_INVITE_DURATION, XENDIT_BASE_URL, XENDIT_SECRET_KEY, addressSchema, isDev, modelApp, modelPSGC, modelPermission, modelPermissionGroup, modelRole, schemaApp, schemaAppUpdate, schemaBuilding, schemaBuildingUnit, schemaOrg, schemaPSGC, schemaPermission, schemaPermissionGroup, schemaPermissionGroupUpdate, schemaPermissionUpdate, schemaRole, schemaUpdateOptions, transactionSchema, useAddressController, useAddressRepo, useAppController, useAppRepo, useAppService, useAuthController, useAuthService, useBuildingController, useBuildingRepo, useBuildingService, useBuildingUnitController, useBuildingUnitRepo, useBuildingUnitService, useCounterModel, useCounterRepo, useFileController, useFileRepo, useFileService, useGitHubService, useMemberController, useMemberRepo, useOrgController, useOrgRepo, useOrgService, usePSGCController, usePSGCRepo, usePermissionController, usePermissionGroupController, usePermissionGroupRepo, usePermissionGroupService, usePermissionRepo, usePermissionService, useRoleController, useRoleRepo, useUserController, useUserRepo, useUserService, useUtilController, useVerificationController, useVerificationRepo, useVerificationService };
+export { ACCESS_TOKEN_EXPIRY, ACCESS_TOKEN_SECRET, APP_ACCOUNT, APP_MAIN, DEFAULT_USER_EMAIL, DEFAULT_USER_FIRST_NAME, DEFAULT_USER_LAST_NAME, DEFAULT_USER_PASSWORD, DOMAIN, MAILER_EMAIL, MAILER_PASSWORD, MAILER_TRANSPORT_HOST, MAILER_TRANSPORT_PORT, MAILER_TRANSPORT_SECURE, MAddress, MBuilding, MBuildingUnit, MFile, MMember, MONGO_DB, MONGO_URI, MOrg, MUser, MUserRole, MVerification, OrgTypes, PAYPAL_API_URL, PAYPAL_CLIENT_ID, PAYPAL_CLIENT_SECRET, PORT, 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, TApp, TBuilding, TBuildingUnit, TCounter, TFile, TMember, TMiniRole, TOrg, TPSGC, TPermission, TPermissionGroup, TRole, TUser, TUserRole, TVerification, TVerificationMetadata, VERIFICATION_FORGET_PASSWORD_DURATION, VERIFICATION_USER_INVITE_DURATION, XENDIT_BASE_URL, XENDIT_SECRET_KEY, addressSchema, isDev, modelApp, modelPSGC, modelPermission, modelPermissionGroup, modelRole, schemaApp, schemaAppUpdate, schemaBuilding, schemaBuildingUnit, schemaOrg, schemaPSGC, schemaPermission, schemaPermissionGroup, schemaPermissionGroupUpdate, schemaPermissionUpdate, schemaRole, schemaUpdateOptions, transactionSchema, useAddressController, useAddressRepo, useAppController, useAppRepo, useAppService, useAuthController, useAuthService, useBuildingController, useBuildingRepo, useBuildingService, useBuildingUnitController, useBuildingUnitRepo, useBuildingUnitService, useCounterModel, useCounterRepo, useFileController, useFileRepo, useFileService, useGitHubService, useMemberController, useMemberRepo, useOrgController, useOrgRepo, useOrgService, usePSGCController, usePSGCRepo, usePermissionController, usePermissionGroupController, usePermissionGroupRepo, usePermissionGroupService, usePermissionRepo, usePermissionService, useRoleController, useRoleRepo, useRoleService, useUserController, useUserRepo, useUserService, useUtilController, useVerificationController, useVerificationRepo, useVerificationService };

package/dist/index.js

@@ -129,6 +129,7 @@ __export(src_exports, {
   usePermissionService: () => usePermissionService,
   useRoleController: () => useRoleController,
   useRoleRepo: () => useRoleRepo,
+  useRoleService: () => useRoleService,
   useUserController: () => useUserController,
   useUserRepo: () => useUserRepo,
   useUserService: () => useUserService,
@@ -1579,6 +1580,43 @@ function useMemberRepo() {
       );
     }
   }
+  async function getByRole(role) {
+    try {
+      role = new import_mongodb9.ObjectId(role);
+    } catch (error) {
+      throw new import_utils10.BadRequestError("Invalid role ID.");
+    }
+    try {
+      const cacheKey = (0, import_utils10.makeCacheKey)(namespace_collection, {
+        role: role.toString()
+      });
+      const cached = await getCache(cacheKey);
+      if (cached) {
+        import_utils10.logger.log({
+          level: "info",
+          message: `Cache hit for getById member: ${cacheKey}`
+        });
+        return cached;
+      }
+      const data = await collection.findOne({ role });
+      setCache(cacheKey, data, 300).then(() => {
+        import_utils10.logger.log({
+          level: "info",
+          message: `Cache set for member by role: ${cacheKey}`
+        });
+      }).catch((err) => {
+        import_utils10.logger.log({
+          level: "error",
+          message: `Failed to set cache for member by role: ${err.message}`
+        });
+      });
+      return data;
+    } catch (error) {
+      throw new import_utils10.InternalServerError(
+        "Internal server error, failed to retrieve member."
+      );
+    }
+  }
   async function getByUserId(user) {
     try {
       user = new import_mongodb9.ObjectId(user);
@@ -2029,6 +2067,7 @@ function useMemberRepo() {
     createTextIndex,
     add,
     getById,
+    getByRole,
     getAll,
     getOrgsByUserId,
     updateStatusByUserId,
@@ -2531,7 +2570,7 @@ function useRoleRepo() {
       throw new import_utils12.InternalServerError("Failed to retrieve role by user ID.");
     }
   }
-  async function getRoleById(_id) {
+  async function getById(_id) {
     try {
       _id = new import_mongodb11.ObjectId(_id);
     } catch (error) {
@@ -2545,7 +2584,7 @@ function useRoleRepo() {
       if (cached) {
         import_utils12.logger.log({
           level: "info",
-          message: `Cache hit for getRoleById role: ${cacheKey}`
+          message: `Cache hit for getById role: ${cacheKey}`
         });
         return cached;
       }
@@ -2728,7 +2767,7 @@ function useRoleRepo() {
       throw new import_utils12.InternalServerError("Failed to update role permissions.");
     }
   }
-  async function deleteRole(_id, session) {
+  async function deleteById(_id, session) {
     try {
       _id = new import_mongodb11.ObjectId(_id);
     } catch (error) {
@@ -2754,10 +2793,10 @@ function useRoleRepo() {
     addRole,
     getRoles,
     getRoleByUserId,
-    getRoleById,
+    getById,
     getRoleByName,
     updateRole,
-    deleteRole,
+    deleteById,
     updatePermissionsById,
     delCachedData
   };
@@ -3968,6 +4007,12 @@ function useAppService() {
         description: "Administrative application.",
         type: "default"
       },
+      {
+        code: "org",
+        name: "Organization",
+        description: "Organization application.",
+        type: "standard"
+      },
       {
         code: "marketplace",
         name: "Marketplace",
@@ -7307,7 +7352,7 @@ function useOrgService() {
     try {
       const org = await addOrg(value, session);
       const allPermissions = await getAllPermission({
-        app: value.type,
+        app: "org",
         limit: 100
       });
       let permissions = [];
@@ -7956,24 +8001,49 @@ function usePSGCController() {
   };
 }
 
+// src/resources/role/role.service.ts
+var import_utils45 = require("@goweekdays/utils");
+function useRoleService() {
+  const { getByRole } = useMemberRepo();
+  const { deleteById: _deleteById } = useRoleRepo();
+  async function deleteById(id) {
+    try {
+      const role = await getByRole(id);
+      if (role) {
+        throw new import_utils45.BadRequestError("Cannot delete role assigned to members.");
+      }
+      await _deleteById(id);
+    } catch (error) {
+      if (error instanceof import_utils45.AppError) {
+        throw error;
+      } else {
+        throw new import_utils45.InternalServerError("Failed to delete role.");
+      }
+    }
+  }
+  return {
+    deleteById
+  };
+}
+
 // src/resources/role/role.controller.ts
 var import_joi25 = __toESM(require("joi"));
-var import_utils45 = require("@goweekdays/utils");
+var import_utils46 = require("@goweekdays/utils");
 function useRoleController() {
   const {
     addRole: _createRole,
-    getRoleById: _getRoleById,
+    getById,
     getRoleByUserId: _getRoleByUserId,
     getRoles: _getRoles,
     updateRole: _updateRole,
-    deleteRole: _deleteRole,
     updatePermissionsById: _updatePermissionsById
   } = useRoleRepo();
+  const { deleteById: _deleteById } = useRoleService();
   async function createRole(req, res, next) {
     const payload = req.body;
     const { error } = schemaRole.validate(payload);
     if (error) {
-      next(new import_utils45.BadRequestError(error.message));
+      next(new import_utils46.BadRequestError(error.message));
       return;
     }
     try {
@@ -7999,7 +8069,7 @@ function useRoleController() {
     });
     const { error } = validation.validate({ search, page, limit, type, id });
     if (error) {
-      next(new import_utils45.BadRequestError(error.message));
+      next(new import_utils46.BadRequestError(error.message));
       return;
     }
     try {
@@ -8017,7 +8087,7 @@ function useRoleController() {
     });
     const { error } = validation.validate({ userId });
     if (error) {
-      next(new import_utils45.BadRequestError(error.message));
+      next(new import_utils46.BadRequestError(error.message));
       return;
     }
     try {
@@ -8035,11 +8105,11 @@ function useRoleController() {
     });
     const { error } = validation.validate({ _id });
     if (error) {
-      next(new import_utils45.BadRequestError(error.message));
+      next(new import_utils46.BadRequestError(error.message));
       return;
     }
     try {
-      const data = await _getRoleById(_id);
+      const data = await getById(_id);
       res.json(data);
       return;
     } catch (error2) {
@@ -8057,7 +8127,7 @@ function useRoleController() {
     });
     const { error } = validation.validate({ _id, name, permissions });
     if (error) {
-      next(new import_utils45.BadRequestError(error.message));
+      next(new import_utils46.BadRequestError(error.message));
       return;
     }
     try {
@@ -8077,7 +8147,7 @@ function useRoleController() {
     });
     const { error } = validation.validate({ _id, permissions });
     if (error) {
-      next(new import_utils45.BadRequestError(error.message));
+      next(new import_utils46.BadRequestError(error.message));
       return;
     }
     try {
@@ -8095,11 +8165,11 @@ function useRoleController() {
     });
     const { error } = validation.validate({ _id });
     if (error) {
-      next(new import_utils45.BadRequestError(error.message));
+      next(new import_utils46.BadRequestError(error.message));
       return;
     }
     try {
-      const message = await _deleteRole(_id);
+      const message = await _deleteById(_id);
       res.json({ message });
       return;
     } catch (error2) {
@@ -8118,7 +8188,7 @@ function useRoleController() {
 }
 
 // src/resources/utils/github.service.ts
-var import_utils46 = require("@goweekdays/utils");
+var import_utils47 = require("@goweekdays/utils");
 var import_rest = require("@octokit/rest");
 var import_libsodium_wrappers = __toESM(require("libsodium-wrappers"));
 function useGitHubService() {
@@ -8132,23 +8202,23 @@ function useGitHubService() {
     try {
       const { data: repoData } = await octokit.repos.get({ owner, repo });
       if (!repoData.permissions?.admin) {
-        throw new import_utils46.BadRequestError(
+        throw new import_utils47.BadRequestError(
           "You do not have admin access to this repository."
         );
       }
     } catch (error) {
       if (error.status === 404) {
-        throw new import_utils46.BadRequestError(
+        throw new import_utils47.BadRequestError(
           "Repository not found or you don't have access to it."
         );
       } else if (error.status === 401) {
-        throw new import_utils46.BadRequestError(
+        throw new import_utils47.BadRequestError(
           "Invalid GitHub token or insufficient permissions."
         );
       } else if (error.message.includes("admin access")) {
         throw error;
       } else {
-        throw new import_utils46.BadRequestError(
+        throw new import_utils47.BadRequestError(
           `Failed to check repository permissions: ${error.message}`
         );
       }
@@ -8197,7 +8267,7 @@ function useGitHubService() {
               key_id: publicKeyRes.key_id
             });
           } catch (encryptionError) {
-            throw new import_utils46.BadRequestError(
+            throw new import_utils47.BadRequestError(
               `Failed to encrypt secret '${key}': ${encryptionError.message}`
             );
           }
@@ -8227,22 +8297,22 @@ function useGitHubService() {
       }
       return `Successfully set ${lines.length} ${type} variables/secrets in environment '${environment}'`;
     } catch (error) {
-      if (error instanceof import_utils46.AppError)
+      if (error instanceof import_utils47.AppError)
         throw error;
       if (error.status === 422) {
-        throw new import_utils46.BadRequestError(
+        throw new import_utils47.BadRequestError(
           `GitHub API validation error: ${error.message}`
         );
       } else if (error.status === 404) {
-        throw new import_utils46.BadRequestError("Environment or repository not found.");
+        throw new import_utils47.BadRequestError("Environment or repository not found.");
       } else if (error.status === 403) {
-        throw new import_utils46.BadRequestError(
+        throw new import_utils47.BadRequestError(
           "Forbidden: Insufficient permissions or rate limit exceeded."
         );
       } else if (error.message.includes("admin access") || error.message.includes("permissions")) {
         throw error;
       } else {
-        throw new import_utils46.BadRequestError(
+        throw new import_utils47.BadRequestError(
           `Failed to set GitHub variables: ${error.message}`
         );
       }
@@ -8255,7 +8325,7 @@ function useGitHubService() {
 
 // src/resources/utils/util.controller.ts
 var import_joi26 = __toESM(require("joi"));
-var import_utils47 = require("@goweekdays/utils");
+var import_utils48 = require("@goweekdays/utils");
 function useUtilController() {
   async function healthCheck(req, res, next) {
     try {
@@ -8271,8 +8341,8 @@ function useUtilController() {
         }
       });
     } catch (error) {
-      import_utils47.logger.error("Health check failed", { error: error.message });
-      next(new import_utils47.InternalServerError("Health check failed"));
+      import_utils48.logger.error("Health check failed", { error: error.message });
+      next(new import_utils48.InternalServerError("Health check failed"));
     }
   }
   async function setGitHubVariables(req, res, next) {
@@ -8309,13 +8379,13 @@ function useUtilController() {
         keyValues
       });
       if (error) {
-        next(new import_utils47.BadRequestError(error.message));
+        next(new import_utils48.BadRequestError(error.message));
         return;
       }
       const repoUrlPattern = /github\.com[:\/]([^\/]+)\/(.+)\.git$/;
       if (!repoUrlPattern.test(repoUrl)) {
         next(
-          new import_utils47.BadRequestError(
+          new import_utils48.BadRequestError(
             "Invalid GitHub repository URL format. Expected format: https://github.com/owner/repo.git"
           )
         );
@@ -8327,7 +8397,7 @@ function useUtilController() {
       );
       if (invalidLines.length > 0) {
         next(
-          new import_utils47.BadRequestError(
+          new import_utils48.BadRequestError(
             "Invalid key-value format. Each pair should be in format: KEY=value. Pairs should be separated by semicolons."
           )
         );
@@ -8341,7 +8411,7 @@ function useUtilController() {
         type,
         keyValues
       });
-      import_utils47.logger.info(`GitHub variables set successfully`, {
+      import_utils48.logger.info(`GitHub variables set successfully`, {
         repoUrl,
         environment,
         type,
@@ -8358,15 +8428,15 @@ function useUtilController() {
         }
       });
     } catch (error) {
-      import_utils47.logger.error("Failed to set GitHub variables", {
+      import_utils48.logger.error("Failed to set GitHub variables", {
         error: error.message,
         stack: error.stack
       });
-      if (error instanceof import_utils47.AppError) {
+      if (error instanceof import_utils48.AppError) {
         next(error);
       } else {
         next(
-          new import_utils47.InternalServerError(
+          new import_utils48.InternalServerError(
             `Failed to set GitHub variables: ${error.message}`
           )
         );
@@ -8403,7 +8473,7 @@ var transactionSchema = import_joi27.default.object({
 });
 
 // src/resources/verification/verification.controller.ts
-var import_utils48 = require("@goweekdays/utils");
+var import_utils49 = require("@goweekdays/utils");
 var import_joi28 = __toESM(require("joi"));
 function useVerificationController() {
   const {
@@ -8424,7 +8494,7 @@ function useVerificationController() {
     });
     const { error } = validation.validate(req.body);
     if (error) {
-      next(new import_utils48.BadRequestError(error.message));
+      next(new import_utils49.BadRequestError(error.message));
       return;
     }
     const email = req.body.email ?? "";
@@ -8455,7 +8525,7 @@ function useVerificationController() {
     const validation = import_joi28.default.string().email().required();
     const { error } = validation.validate(email);
     if (error) {
-      next(new import_utils48.BadRequestError(error.message));
+      next(new import_utils49.BadRequestError(error.message));
       return;
     }
     try {
@@ -8465,10 +8535,10 @@ function useVerificationController() {
       });
       return;
     } catch (error2) {
-      if (error2 instanceof import_utils48.AppError) {
+      if (error2 instanceof import_utils49.AppError) {
         next(error2);
       } else {
-        next(new import_utils48.InternalServerError("An unexpected error occurred"));
+        next(new import_utils49.InternalServerError("An unexpected error occurred"));
       }
     }
   }
@@ -8483,7 +8553,7 @@ function useVerificationController() {
     });
     const { error } = validation.validate(req.query);
     if (error) {
-      next(new import_utils48.BadRequestError(error.message));
+      next(new import_utils49.BadRequestError(error.message));
       return;
     }
     const status = req.query.status ?? "";
@@ -8517,7 +8587,7 @@ function useVerificationController() {
     const validation = import_joi28.default.string().hex().required();
     const { error } = validation.validate(id);
     if (error) {
-      next(new import_utils48.BadRequestError(error.message));
+      next(new import_utils49.BadRequestError(error.message));
       return;
     }
     try {
@@ -8533,7 +8603,7 @@ function useVerificationController() {
     const validation = import_joi28.default.string().hex().required();
     const { error } = validation.validate(otpId);
     if (error) {
-      next(new import_utils48.BadRequestError(error.message));
+      next(new import_utils49.BadRequestError(error.message));
       return;
     }
     try {
@@ -8654,6 +8724,7 @@ function useVerificationController() {
   usePermissionService,
   useRoleController,
   useRoleRepo,
+  useRoleService,
   useUserController,
   useUserRepo,
   useUserService,