@eeplatform/core 1.8.9 → 1.8.10

package/dist/index.mjs

@@ -643,24 +643,24 @@ function useAuthService() {
 }
 
 // src/resources/auth/auth.controller.ts
-import Joi2 from "joi";
+import Joi3 from "joi";
 import {
-  AppError as AppError3,
-  BadRequestError as BadRequestError11,
+  AppError as AppError4,
+  BadRequestError as BadRequestError12,
   InternalServerError as InternalServerError10,
   logger as logger9
 } from "@eeplatform/nodejs-utils";
 
 // src/resources/user/user.service.ts
 import {
-  BadRequestError as BadRequestError10,
+  BadRequestError as BadRequestError11,
   InternalServerError as InternalServerError9,
   NotFoundError as NotFoundError3,
   hashPassword,
   logger as logger8,
   makeCacheKey as makeCacheKey7,
-  useAtlas as useAtlas8,
-  useCache as useCache8,
+  useAtlas as useAtlas7,
+  useCache as useCache7,
   useS3
 } from "@eeplatform/nodejs-utils";
 
@@ -1264,6 +1264,43 @@ function useMemberRepo() {
       );
     }
   }
+  async function getByRole(role) {
+    try {
+      role = new ObjectId8(role);
+    } catch (error) {
+      throw new BadRequestError7("Invalid role ID.");
+    }
+    try {
+      const cacheKey = makeCacheKey5(namespace_collection, {
+        role: role.toString()
+      });
+      const cached = await getCache(cacheKey);
+      if (cached) {
+        logger5.log({
+          level: "info",
+          message: `Cache hit for getById member: ${cacheKey}`
+        });
+        return cached;
+      }
+      const data = await collection.findOne({ role });
+      setCache(cacheKey, data, 300).then(() => {
+        logger5.log({
+          level: "info",
+          message: `Cache set for member by role: ${cacheKey}`
+        });
+      }).catch((err) => {
+        logger5.log({
+          level: "error",
+          message: `Failed to set cache for member by role: ${err.message}`
+        });
+      });
+      return data;
+    } catch (error) {
+      throw new InternalServerError6(
+        "Internal server error, failed to retrieve member."
+      );
+    }
+  }
   async function getByOrg(org) {
     try {
       org = new ObjectId8(org);
@@ -1747,6 +1784,7 @@ function useMemberRepo() {
     createIndexes,
     add,
     getById,
+    getByRole,
     getByOrg,
     getAll,
     getOrgsByUserId,
@@ -2095,134 +2133,121 @@ import { ObjectId as ObjectId11 } from "mongodb";
 
 // src/resources/role/role.repository.ts
 import {
-  BadRequestError as BadRequestError9,
+  BadRequestError as BadRequestError10,
   InternalServerError as InternalServerError8,
-  useAtlas as useAtlas7,
   paginate as paginate4,
   logger as logger7,
   makeCacheKey as makeCacheKey6,
-  useCache as useCache7
+  AppError as AppError3,
+  useRepo
 } from "@eeplatform/nodejs-utils";
 
 // src/resources/role/role.model.ts
+import { BadRequestError as BadRequestError9 } from "@eeplatform/nodejs-utils";
+import Joi2 from "joi";
 import { ObjectId as ObjectId9 } from "mongodb";
-var MRole = class {
-  constructor(value) {
-    if (typeof value._id === "string") {
-      try {
-        value._id = new ObjectId9(value._id);
-      } catch (error) {
-        throw new Error("Invalid _id.");
-      }
+var schemaRole = Joi2.object({
+  name: Joi2.string().required(),
+  description: Joi2.string().max(1024).optional().allow("", null),
+  permissions: Joi2.array().items(Joi2.string()).required(),
+  org: Joi2.string().hex().optional().allow("", null),
+  app: Joi2.string().required(),
+  createdBy: Joi2.string().hex().required()
+});
+var schemaRoleUpdate = Joi2.object({
+  name: Joi2.string().optional().allow("", null),
+  description: Joi2.string().max(1024).optional().allow("", null),
+  permissions: Joi2.array().items(Joi2.string()).optional().allow("", null)
+});
+function modelRole(value) {
+  const { error } = schemaRole.validate(value);
+  if (error) {
+    throw new BadRequestError9(error.message);
+  }
+  if (value._id && typeof value._id === "string") {
+    try {
+      value._id = new ObjectId9(value._id);
+    } catch (error2) {
+      throw new BadRequestError9("Invalid _id.");
     }
-    if (typeof value.id === "string" && value.id.length === 24) {
-      try {
-        value.id = new ObjectId9(value.id);
-      } catch (error) {
-        throw new Error("Invalid id.");
-      }
+  }
+  if (value.org && typeof value.org === "string" && value.org.length === 24) {
+    try {
+      value.org = new ObjectId9(value.org);
+    } catch (error2) {
+      throw new BadRequestError9("Invalid org.");
     }
-    this.id = value.id ?? "";
-    this._id = value._id ?? new ObjectId9();
-    this.name = value.name ?? "";
-    this.description = value.description ?? "";
-    this.permissions = value.permissions ?? [];
-    this.type = value.type ? value.type : "account";
-    this.status = value.status ?? "active";
-    this.default = value.default ?? false;
-    if (value.createdBy) {
-      try {
-        value.createdBy = new ObjectId9(value.createdBy);
-      } catch (error) {
-        throw new Error("Invalid createdBy.");
-      }
+  }
+  if (value.createdBy && typeof value.createdBy === "string" && value.createdBy.length === 24) {
+    try {
+      value.createdBy = new ObjectId9(value.createdBy);
+    } catch (error2) {
+      throw new BadRequestError9("Invalid createdBy.");
     }
-    this.createdBy = value.createdBy ?? "";
-    this.createdAt = value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString();
-    this.updatedAt = value.updatedAt ?? "";
-    this.deletedAt = value.deletedAt ?? "";
   }
-};
+  return {
+    _id: value._id,
+    name: value.name,
+    description: value.description ?? "",
+    permissions: value.permissions,
+    org: value.org,
+    app: value.app,
+    status: value.status ?? "active",
+    createdBy: value.createdBy,
+    createdAt: value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+    updatedAt: "",
+    deletedAt: ""
+  };
+}
 
 // src/resources/role/role.repository.ts
 import { ObjectId as ObjectId10 } from "mongodb";
 function useRoleRepo() {
-  const db = useAtlas7.getDb();
-  if (!db) {
-    throw new InternalServerError8("Unable to connect to server.");
-  }
   const namespace_collection = "roles";
-  const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = useCache7(namespace_collection);
-  function delCachedData() {
-    delNamespace().then(() => {
-      logger7.log({
-        level: "info",
-        message: `Cache namespace cleared for ${namespace_collection}`
-      });
-    }).catch((err) => {
-      logger7.log({
-        level: "error",
-        message: `Failed to clear cache namespace for ${namespace_collection}: ${err.message}`
-      });
-    });
-  }
+  const repo = useRepo(namespace_collection);
   async function createIndexes() {
     try {
-      await collection.createIndexes([
-        {
-          key: {
-            name: "text"
-          },
-          name: "text_index"
-        },
-        {
-          key: { name: 1, type: 1, status: 1, id: 1 },
-          unique: true
-        }
+      await repo.collection.createIndexes([
+        { key: { name: 1 } },
+        { key: { status: 1 } },
+        { key: { name: "text" } },
+        { key: { name: 1, app: 1, org: 1, status: 1 }, unique: true }
       ]);
     } catch (error) {
-      throw new InternalServerError8("Failed to create role indexes.");
-    }
-  }
-  async function createUniqueIndex() {
-    try {
-      await collection.createIndex(
-        { name: 1, type: 1, id: 1 },
-        { unique: true }
-      );
-    } catch (error) {
-      throw new InternalServerError8("Failed to create unique index on role.");
     }
   }
   async function addRole(value, session, clearCache = true) {
-    value = new MRole(value);
     try {
-      const res = await collection.insertOne(value, { session });
+      value = modelRole(value);
+      const res = await repo.collection.insertOne(value, { session });
       if (clearCache) {
-        delCachedData();
+        repo.delCachedData();
       }
       return res.insertedId;
     } catch (error) {
       logger7.log({ level: "error", message: `${error}` });
       const isDuplicated = error.message.includes("duplicate");
       if (isDuplicated) {
-        throw new BadRequestError9("Role already exists");
+        throw new BadRequestError10("Role already exists");
+      }
+      if (error instanceof AppError3) {
+        throw error;
+      } else {
+        throw new InternalServerError8("Failed to create role.");
       }
-      throw new InternalServerError8("Failed to create role.");
     }
   }
   async function getRoleByUserId(value) {
     try {
       value = new ObjectId10(value);
     } catch (error) {
-      throw new BadRequestError9("Invalid user ID.");
+      throw new BadRequestError10("Invalid user ID.");
     }
     try {
       const cacheKey = makeCacheKey6(namespace_collection, {
         user: String(value)
       });
-      const cached = await getCache(cacheKey);
+      const cached = await repo.getCache(cacheKey);
       if (cached) {
         logger7.log({
           level: "info",
@@ -2230,8 +2255,8 @@ function useRoleRepo() {
         });
         return cached;
       }
-      const data = await collection.findOne({ user: value });
-      setCache(cacheKey, data, 300).then(() => {
+      const data = await repo.collection.findOne({ user: value });
+      repo.setCache(cacheKey, data, 300).then(() => {
         logger7.log({
           level: "info",
           message: `Cache set for role by user ID: ${cacheKey}`
@@ -2247,26 +2272,26 @@ function useRoleRepo() {
       throw new InternalServerError8("Failed to retrieve role by user ID.");
     }
   }
-  async function getRoleById(_id) {
+  async function getById(_id) {
     try {
       _id = new ObjectId10(_id);
     } catch (error) {
-      throw new BadRequestError9("Invalid ID.");
+      throw new BadRequestError10("Invalid ID.");
     }
     try {
       const cacheKey = makeCacheKey6(namespace_collection, {
         id: _id.toString()
       });
-      const cached = await getCache(cacheKey);
+      const cached = await repo.getCache(cacheKey);
       if (cached) {
         logger7.log({
           level: "info",
-          message: `Cache hit for getRoleById role: ${cacheKey}`
+          message: `Cache hit for getById role: ${cacheKey}`
         });
         return cached;
       }
-      const data = await collection.findOne({ _id });
-      setCache(cacheKey, data, 300).then(() => {
+      const data = await repo.collection.findOne({ _id });
+      repo.setCache(cacheKey, data, 300).then(() => {
         logger7.log({
           level: "info",
           message: `Cache set for role by id: ${cacheKey}`
@@ -2284,13 +2309,13 @@ function useRoleRepo() {
   }
   async function getRoleByName(name) {
     if (!name) {
-      throw new BadRequestError9("Role name is required.");
+      throw new BadRequestError10("Role name is required.");
     }
     try {
       const cacheKey = makeCacheKey6(namespace_collection, {
         name
       });
-      const cached = await getCache(cacheKey);
+      const cached = await repo.getCache(cacheKey);
       if (cached) {
         logger7.log({
           level: "info",
@@ -2298,8 +2323,8 @@ function useRoleRepo() {
         });
         return cached;
       }
-      const data = await collection.findOne({ name });
-      setCache(cacheKey, data, 300).then(() => {
+      const data = await repo.collection.findOne({ name });
+      repo.setCache(cacheKey, data, 300).then(() => {
         logger7.log({
           level: "info",
           message: `Cache set for role by name: ${cacheKey}`
@@ -2320,34 +2345,29 @@ function useRoleRepo() {
     page = 1,
     limit = 10,
     sort = {},
-    type = "",
-    id = ""
+    app = "",
+    org = ""
   } = {}) {
     limit = limit > 0 ? limit : 10;
     search = search || "";
     page = page > 0 ? page - 1 : 0;
-    if (id && typeof id === "string" && id.length === 24) {
-      try {
-        id = new ObjectId10(id);
-      } catch (error) {
-        throw new BadRequestError9("Invalid ID.");
-      }
-    }
     const query = { status: "active" };
-    if (id) {
-      query.id = id;
-    }
     const cacheKeyOptions = {
       status: "active",
       limit,
       page
     };
-    if (id) {
-      cacheKeyOptions.id = String(id);
+    if (org && typeof org === "string" && org.length === 24) {
+      try {
+        query.org = new ObjectId10(org);
+      } catch (error) {
+        throw new BadRequestError10("Invalid ID.");
+      }
+      cacheKeyOptions.org = org;
     }
-    if (type) {
-      cacheKeyOptions.type = type;
-      query.type = type;
+    if (app) {
+      cacheKeyOptions.app = app;
+      query.app = app;
     }
     if (search) {
       cacheKeyOptions.search = search;
@@ -2356,7 +2376,7 @@ function useRoleRepo() {
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     cacheKeyOptions.sort = JSON.stringify(sort);
     const cacheKey = makeCacheKey6(namespace_collection, cacheKeyOptions);
-    const cached = await getCache(cacheKey);
+    const cached = await repo.getCache(cacheKey);
     if (cached) {
       logger7.log({
         level: "info",
@@ -2365,15 +2385,15 @@ function useRoleRepo() {
       return cached;
     }
     try {
-      const items = await collection.aggregate([
+      const items = await repo.collection.aggregate([
         { $match: query },
         { $sort: sort },
         { $skip: page * limit },
         { $limit: limit }
       ]).toArray();
-      const length = await collection.countDocuments(query);
+      const length = await repo.collection.countDocuments(query);
       const data = paginate4(items, page, limit, length);
-      setCache(cacheKey, data, 600).then(() => {
+      repo.setCache(cacheKey, data, 600).then(() => {
         logger7.log({
           level: "info",
           message: `Cache set for getRoles: ${cacheKey}`
@@ -2391,74 +2411,64 @@ function useRoleRepo() {
     }
   }
   async function updateRole(_id, value, session) {
-    if (!_id) {
-      throw new BadRequestError9("Role ID is required.");
+    const { error } = schemaRoleUpdate.validate(value);
+    if (error) {
+      throw new BadRequestError10(error.message);
     }
     try {
       _id = new ObjectId10(_id);
-    } catch (error) {
-      throw new BadRequestError9("Invalid role ID.");
-    }
-    if (!value.name) {
-      delete value.name;
-    }
-    if (!value.permissions) {
-      delete value.permissions;
+    } catch (error2) {
+      throw new BadRequestError10("Invalid role ID.");
     }
-    if (value.name || value.permissions) {
-      try {
-        await collection.updateOne({ _id }, { $set: value }, { session });
-        delCachedData();
-        return "Successfully updated role.";
-      } catch (error) {
-        throw new InternalServerError8("Failed to update role.");
-      }
-    } else {
-      throw new BadRequestError9("No fields to update.");
+    try {
+      await repo.collection.updateOne({ _id }, { $set: value }, { session });
+      repo.delCachedData();
+      return "Successfully updated role.";
+    } catch (error2) {
+      throw new InternalServerError8("Failed to update role.");
     }
   }
   async function updatePermissionsById(_id, permissions, session) {
     if (!_id) {
-      throw new BadRequestError9("Role ID is required.");
+      throw new BadRequestError10("Role ID is required.");
     }
     try {
       _id = new ObjectId10(_id);
     } catch (error) {
-      throw new BadRequestError9("Invalid role ID.");
+      throw new BadRequestError10("Invalid role ID.");
     }
     if (!permissions) {
-      throw new BadRequestError9("Permissions are required.");
+      throw new BadRequestError10("Permissions are required.");
     }
     if (permissions.length === 0) {
-      throw new BadRequestError9("Permissions cannot be empty.");
+      throw new BadRequestError10("Permissions cannot be empty.");
     }
     try {
-      await collection.updateOne(
+      await repo.collection.updateOne(
         { _id },
         { $set: { permissions } },
         { session }
       );
-      delCachedData();
+      repo.delCachedData();
       return "Successfully updated role permissions.";
     } catch (error) {
       throw new InternalServerError8("Failed to update role permissions.");
     }
   }
-  async function deleteRole(_id, session) {
+  async function deleteById(_id, session) {
     try {
       _id = new ObjectId10(_id);
     } catch (error) {
-      throw new BadRequestError9("Invalid ID.");
+      throw new BadRequestError10("Invalid ID.");
     }
     try {
-      await collection.updateOne(
+      await repo.collection.deleteOne(
         { _id },
-        { $set: { status: "deleted", updateAt: /* @__PURE__ */ new Date() } },
         {
           session
         }
       );
-      delCachedData();
+      repo.delCachedData();
       return "Successfully deleted role.";
     } catch (error) {
       throw new InternalServerError8("Failed to delete role.");
@@ -2466,16 +2476,15 @@ function useRoleRepo() {
   }
   return {
     createIndexes,
-    createUniqueIndex,
     addRole,
     getRoles,
     getRoleByUserId,
-    getRoleById,
+    getById,
     getRoleByName,
     updateRole,
-    deleteRole,
+    deleteById,
     updatePermissionsById,
-    delCachedData
+    delCachedData: repo.delCachedData
   };
 }
 
@@ -2493,12 +2502,12 @@ function useUserService() {
   const { addRole } = useRoleRepo();
   const { add: addMember } = useMemberRepo();
   async function createDefaultUser() {
-    const session = useAtlas8.getClient()?.startSession();
+    const session = useAtlas7.getClient()?.startSession();
     try {
       session?.startTransaction();
       const _user = await getUserByEmail(DEFAULT_USER_EMAIL);
       if (_user) {
-        throw new BadRequestError10(
+        throw new BadRequestError11(
           `User already exists: ${DEFAULT_USER_EMAIL}.`
         );
       }
@@ -2519,10 +2528,9 @@ function useUserService() {
         {
           id: "",
           name: "Super Admin",
-          type: "admin",
+          app: "admin",
           permissions: ["*"],
-          status: "active",
-          default: true
+          status: "active"
         },
         session
       );
@@ -2559,12 +2567,12 @@ function useUserService() {
     }
   }
   async function createUser(value) {
-    const session = useAtlas8.getClient()?.startSession();
+    const session = useAtlas7.getClient()?.startSession();
     session?.startTransaction();
     try {
       const _user = await getUserByEmail(value.email);
       if (_user) {
-        throw new BadRequestError10(`User already exists: ${value.email}.`);
+        throw new BadRequestError11(`User already exists: ${value.email}.`);
       }
       const hashedPassword = await hashPassword(value.password);
       const userId = new ObjectId11();
@@ -2598,19 +2606,19 @@ function useUserService() {
     lastName = "",
     password = ""
   } = {}) {
-    const session = useAtlas8.getClient()?.startSession();
+    const session = useAtlas7.getClient()?.startSession();
     session?.startTransaction();
     try {
       const invitation = await _getVerificationById(id);
       if (!invitation || !invitation.metadata?.app || !invitation.metadata?.role) {
-        throw new BadRequestError10("Invalid invitation.");
+        throw new BadRequestError11("Invalid invitation.");
       }
       if (invitation.status === "complete") {
-        throw new BadRequestError10("Invitation already used.");
+        throw new BadRequestError11("Invitation already used.");
       }
       const expired = new Date(invitation.expireAt) < /* @__PURE__ */ new Date();
       if (invitation.status === "expired" || expired) {
-        throw new BadRequestError10("Invitation expired.");
+        throw new BadRequestError11("Invitation expired.");
       }
       const email = invitation.email;
       const _user = await getUserByEmail(invitation.email);
@@ -2657,26 +2665,26 @@ function useUserService() {
     lastName = "",
     password = ""
   } = {}) {
-    const session = useAtlas8.getClient()?.startSession();
+    const session = useAtlas7.getClient()?.startSession();
     session?.startTransaction();
     try {
       const signUp = await _getVerificationById(id);
       if (!signUp) {
-        throw new BadRequestError10("Invalid sign up link.");
+        throw new BadRequestError11("Invalid sign up link.");
       }
       if (signUp.status === "complete") {
-        throw new BadRequestError10(
+        throw new BadRequestError11(
           "You have already an account created using this link."
         );
       }
       const expired = new Date(signUp.expireAt) < /* @__PURE__ */ new Date();
       if (signUp.status === "expired" || expired) {
-        throw new BadRequestError10("Sign up link expired.");
+        throw new BadRequestError11("Sign up link expired.");
       }
       const email = signUp.email;
       const _user = await getUserByEmail(signUp.email);
       if (_user) {
-        throw new BadRequestError10(`User already exists: ${email}.`);
+        throw new BadRequestError11(`User already exists: ${email}.`);
       }
       const hashedPassword = await hashPassword(password);
       const userId = new ObjectId11();
@@ -2710,7 +2718,7 @@ function useUserService() {
       throw error;
     }
     if (newPassword !== passwordConfirmation) {
-      throw new BadRequestError10("Passwords do not match.");
+      throw new BadRequestError11("Passwords do not match.");
     }
     let hashedPassword = "";
     try {
@@ -2724,7 +2732,7 @@ function useUserService() {
         throw new NotFoundError3("You are using an invalid reset link.");
       }
       if (otpDoc.status === "used") {
-        throw new BadRequestError10("This link has already been invalidated.");
+        throw new BadRequestError11("This link has already been invalidated.");
       }
       await updateStatusById(id, "used");
       return "Successfully reset password.";
@@ -2735,19 +2743,19 @@ function useUserService() {
   const { updateName: updateMemberName } = useMemberRepo();
   async function updateName(_id, firstName, lastName) {
     if (!_id) {
-      throw new BadRequestError10("Invalid user ID");
+      throw new BadRequestError11("Invalid user ID");
     }
     if (!firstName) {
-      throw new BadRequestError10("Invalid firstName");
+      throw new BadRequestError11("Invalid firstName");
     }
     if (!lastName) {
-      throw new BadRequestError10("Invalid lastName");
+      throw new BadRequestError11("Invalid lastName");
     }
-    const session = useAtlas8.getClient()?.startSession();
+    const session = useAtlas7.getClient()?.startSession();
     session?.startTransaction();
     const cacheKey = makeCacheKey7("users", { user: _id });
     try {
-      useCache8().delCache(cacheKey).then(() => {
+      useCache7().delCache(cacheKey).then(() => {
         logger8.info(`Cache cleared for user: ${_id}`);
       }).catch((error) => {
         logger8.error(`Failed to clear cache for user: ${_id}`, error);
@@ -2768,16 +2776,16 @@ function useUserService() {
   }
   async function updateBirthday(_id, month, day, year) {
     if (!_id) {
-      throw new BadRequestError10("Invalid user ID");
+      throw new BadRequestError11("Invalid user ID");
     }
     if (!month) {
-      throw new BadRequestError10("Invalid birth month.");
+      throw new BadRequestError11("Invalid birth month.");
     }
     if (!day) {
-      throw new BadRequestError10("Invalid birthday.");
+      throw new BadRequestError11("Invalid birthday.");
     }
     if (!year) {
-      throw new BadRequestError10("Invalid birth year.");
+      throw new BadRequestError11("Invalid birth year.");
     }
     try {
       await _updateBirthday({ _id, month, day, year });
@@ -2802,7 +2810,7 @@ function useUserService() {
     bucket: SPACES_BUCKET
   });
   async function updateUserProfile({ file, user, previousProfile } = {}) {
-    const session = useAtlas8.getClient()?.startSession();
+    const session = useAtlas7.getClient()?.startSession();
     session?.startTransaction();
     const _file = {
       name: file.originalname,
@@ -2852,13 +2860,13 @@ function useAuthController() {
   async function login(req, res, next) {
     const email = req.body.email;
     const password = req.body.password;
-    const validation = Joi2.object({
-      email: Joi2.string().email().required(),
-      password: Joi2.string().required()
+    const validation = Joi3.object({
+      email: Joi3.string().email().required(),
+      password: Joi3.string().required()
     });
     const { error } = validation.validate({ email, password });
     if (error) {
-      next(new BadRequestError11(error.message));
+      next(new BadRequestError12(error.message));
       return;
     }
     try {
@@ -2878,7 +2886,7 @@ function useAuthController() {
         level: "error",
         message: `Error during login: ${error2.message}`
       });
-      if (error2 instanceof AppError3) {
+      if (error2 instanceof AppError4) {
         next(error2);
       } else {
         next(new InternalServerError10("An unexpected error occurred"));
@@ -2889,14 +2897,14 @@ function useAuthController() {
   async function refreshToken(req, res, next) {
     const refreshToken2 = req.body.token;
     if (!refreshToken2) {
-      next(new BadRequestError11("Refresh token is required"));
+      next(new BadRequestError12("Refresh token is required"));
       return;
     }
     try {
       const newRefreshToken = await useAuthService().refreshToken(refreshToken2);
       res.json({ token: newRefreshToken });
     } catch (error) {
-      if (error instanceof AppError3) {
+      if (error instanceof AppError4) {
         next(error);
       } else {
         next(new InternalServerError10("An unexpected error occurred"));
@@ -2906,14 +2914,14 @@ function useAuthController() {
   async function logout(req, res, next) {
     const sid = req.headers["authorization"] ?? "";
     if (!sid) {
-      next(new BadRequestError11("Session ID is required"));
+      next(new BadRequestError12("Session ID is required"));
       return;
     }
     try {
       await useAuthService().logout(sid);
       res.json({ message: "Logged out successfully" });
     } catch (error) {
-      if (error instanceof AppError3) {
+      if (error instanceof AppError4) {
         next(error);
       } else {
         next(new InternalServerError10("An unexpected error occurred"));
@@ -2924,10 +2932,10 @@ function useAuthController() {
     const otp = req.body.otp || "";
     const newPassword = req.body.newPassword || "";
     const passwordConfirmation = req.body.passwordConfirmation || "";
-    const validation = Joi2.object({
-      otp: Joi2.string().hex().required(),
-      newPassword: Joi2.string().required().min(8),
-      passwordConfirmation: Joi2.string().required().min(8)
+    const validation = Joi3.object({
+      otp: Joi3.string().hex().required(),
+      newPassword: Joi3.string().required().min(8),
+      passwordConfirmation: Joi3.string().required().min(8)
     });
     const { error } = validation.validate({
       otp,
@@ -2935,7 +2943,7 @@ function useAuthController() {
       passwordConfirmation
     });
     if (error) {
-      next(new BadRequestError11(error.message));
+      next(new BadRequestError12(error.message));
       return;
     }
     try {
@@ -2953,13 +2961,13 @@ function useAuthController() {
   async function signUp(req, res, next) {
     const email = req.body.email;
     const referralCode = req.body.referral ?? "";
-    const validation = Joi2.object({
-      email: Joi2.string().email().required(),
-      referralCode: Joi2.string().min(4).optional().allow("", null)
+    const validation = Joi3.object({
+      email: Joi3.string().email().required(),
+      referralCode: Joi3.string().min(4).optional().allow("", null)
     });
     const { error } = validation.validate({ email, referralCode });
     if (error) {
-      next(new BadRequestError11(error.message));
+      next(new BadRequestError12(error.message));
       return;
     }
     try {
@@ -2986,11 +2994,11 @@ function useAuthController() {
 
 // src/resources/user/user.controller.ts
 import {
-  AppError as AppError4,
-  BadRequestError as BadRequestError12,
+  AppError as AppError5,
+  BadRequestError as BadRequestError13,
   InternalServerError as InternalServerError11
 } from "@eeplatform/nodejs-utils";
-import Joi3 from "joi";
+import Joi4 from "joi";
 function useUserController() {
   const {
     updateName: _updateName,
@@ -3006,14 +3014,14 @@ function useUserController() {
     const status = req.query.status ?? "";
     const search = req.query.search ?? "";
     const page = Number(req.query.page) ?? 1;
-    const validation = Joi3.object({
-      status: Joi3.string().required(),
-      search: Joi3.string().optional().allow("", null),
-      page: Joi3.number().required()
+    const validation = Joi4.object({
+      status: Joi4.string().required(),
+      search: Joi4.string().optional().allow("", null),
+      page: Joi4.number().required()
     });
     const { error } = validation.validate({ status, search, page });
     if (error) {
-      next(new BadRequestError12(error.message));
+      next(new BadRequestError13(error.message));
       return;
     }
     try {
@@ -3026,14 +3034,14 @@ function useUserController() {
   }
   async function getUserById(req, res, next) {
     const id = req.params.id || "";
-    const validation = Joi3.string().hex().validate(id);
+    const validation = Joi4.string().hex().validate(id);
     if (validation.error) {
-      throw new BadRequestError12("Invalid id.");
+      throw new BadRequestError13("Invalid id.");
     }
     try {
       const user = await _getUserById(id);
       if (!user) {
-        throw new BadRequestError12("User not found.");
+        throw new BadRequestError13("User not found.");
       }
       res.json(user);
     } catch (error) {
@@ -3044,13 +3052,13 @@ function useUserController() {
     const id = req.headers.user ?? "";
     const firstName = req.body.firstName ?? "";
     const lastName = req.body.lastName ?? "";
-    const validation = Joi3.object({
-      firstName: Joi3.string().required(),
-      lastName: Joi3.string().required()
+    const validation = Joi4.object({
+      firstName: Joi4.string().required(),
+      lastName: Joi4.string().required()
     });
     const { error } = validation.validate({ firstName, lastName });
     if (error) {
-      next(new BadRequestError12(error.message));
+      next(new BadRequestError13(error.message));
       return;
     }
     try {
@@ -3066,14 +3074,14 @@ function useUserController() {
     const month = req.body.month ?? "";
     const day = req.body.day ?? 0;
     const year = req.body.year ?? 0;
-    const validation = Joi3.object({
-      month: Joi3.string().required(),
-      day: Joi3.number().integer().min(1).max(31).required(),
-      year: Joi3.number().integer().min(1900).max((/* @__PURE__ */ new Date()).getFullYear()).required()
+    const validation = Joi4.object({
+      month: Joi4.string().required(),
+      day: Joi4.number().integer().min(1).max(31).required(),
+      year: Joi4.number().integer().min(1900).max((/* @__PURE__ */ new Date()).getFullYear()).required()
     });
     const { error } = validation.validate({ month, day, year });
     if (error) {
-      next(new BadRequestError12(error.message));
+      next(new BadRequestError13(error.message));
       return;
     }
     try {
@@ -3087,18 +3095,18 @@ function useUserController() {
   async function updateUserFieldById(req, res, next) {
     const _id = req.params.id;
     const { field, value } = req.body;
-    const validation = Joi3.object({
-      _id: Joi3.string().hex().required(),
-      field: Joi3.string().valid("gender", "email", "contact", "profile").required(),
-      value: Joi3.alternatives().conditional("field", {
+    const validation = Joi4.object({
+      _id: Joi4.string().hex().required(),
+      field: Joi4.string().valid("gender", "email", "contact", "profile").required(),
+      value: Joi4.alternatives().conditional("field", {
         is: "email",
-        then: Joi3.string().email().required(),
-        otherwise: Joi3.string().required()
+        then: Joi4.string().email().required(),
+        otherwise: Joi4.string().required()
       })
     });
     const { error } = validation.validate({ _id, field, value });
     if (error) {
-      next(new BadRequestError12(error.message));
+      next(new BadRequestError13(error.message));
       return;
     }
     try {
@@ -3114,12 +3122,12 @@ function useUserController() {
       return;
     }
     const previousProfile = req.body.previousProfile ?? "";
-    const validation = Joi3.object({
-      previousProfile: Joi3.string().hex().optional().allow("", null)
+    const validation = Joi4.object({
+      previousProfile: Joi4.string().hex().optional().allow("", null)
     });
     const { error } = validation.validate({ previousProfile });
     if (error) {
-      next(new BadRequestError12(error.message));
+      next(new BadRequestError13(error.message));
       return;
     }
     const user = req.headers["user"] ?? "";
@@ -3132,7 +3140,7 @@ function useUserController() {
       res.json({ message: "Successfully updated profile picture." });
       return;
     } catch (error2) {
-      if (error2 instanceof AppError4) {
+      if (error2 instanceof AppError5) {
         next(error2);
       } else {
         next(new InternalServerError11(error2));
@@ -3145,12 +3153,12 @@ function useUserController() {
     const password = req.body.password ?? "";
     const id = req.params.id ?? "";
     const type = req.body.type ?? "";
-    const validation = Joi3.object({
-      firstName: Joi3.string().required(),
-      lastName: Joi3.string().required(),
-      password: Joi3.string().required(),
-      id: Joi3.string().hex().required(),
-      type: Joi3.string().required()
+    const validation = Joi4.object({
+      firstName: Joi4.string().required(),
+      lastName: Joi4.string().required(),
+      password: Joi4.string().required(),
+      id: Joi4.string().hex().required(),
+      type: Joi4.string().required()
     });
     const { error } = validation.validate({
       firstName,
@@ -3160,7 +3168,7 @@ function useUserController() {
       type
     });
     if (error) {
-      next(new BadRequestError12(error.message));
+      next(new BadRequestError13(error.message));
       return;
     }
     try {
@@ -3193,43 +3201,43 @@ function useUserController() {
 }
 
 // src/resources/organization/organization.model.ts
-import { BadRequestError as BadRequestError13 } from "@eeplatform/nodejs-utils";
-import Joi4 from "joi";
+import { BadRequestError as BadRequestError14 } from "@eeplatform/nodejs-utils";
+import Joi5 from "joi";
 import { ObjectId as ObjectId12 } from "mongodb";
-var schemaOrg = Joi4.object({
-  _id: Joi4.string().hex().optional().allow("", null),
-  name: Joi4.string().required(),
-  email: Joi4.string().email().required(),
-  contact: Joi4.string().required(),
-  type: Joi4.string().required(),
-  sector: Joi4.string().required(),
-  sectorName: Joi4.string().optional().allow("", null),
-  sectorType: Joi4.string().allow("public", "private").required(),
-  category: Joi4.string().required(),
-  region: Joi4.string().optional().allow("", null),
-  regionName: Joi4.string().optional().allow("", null),
-  province: Joi4.string().optional().allow("", null),
-  provinceName: Joi4.string().optional().allow("", null),
-  cityMunicipality: Joi4.string().optional().allow("", null),
-  cityMunicipalityName: Joi4.string().optional().allow("", null),
-  barangay: Joi4.string().optional().allow("", null),
-  barangayName: Joi4.string().optional().allow("", null),
-  description: Joi4.string().optional().allow("", null),
-  status: Joi4.string().optional().allow("", null),
-  createdAt: Joi4.string().optional().allow("", null),
-  updatedAt: Joi4.string().optional().allow("", null),
-  deletedAt: Joi4.string().optional().allow("", null)
+var schemaOrg = Joi5.object({
+  _id: Joi5.string().hex().optional().allow("", null),
+  name: Joi5.string().required(),
+  email: Joi5.string().email().required(),
+  contact: Joi5.string().required(),
+  type: Joi5.string().required(),
+  sector: Joi5.string().required(),
+  sectorName: Joi5.string().optional().allow("", null),
+  sectorType: Joi5.string().allow("public", "private").required(),
+  category: Joi5.string().required(),
+  region: Joi5.string().optional().allow("", null),
+  regionName: Joi5.string().optional().allow("", null),
+  province: Joi5.string().optional().allow("", null),
+  provinceName: Joi5.string().optional().allow("", null),
+  cityMunicipality: Joi5.string().optional().allow("", null),
+  cityMunicipalityName: Joi5.string().optional().allow("", null),
+  barangay: Joi5.string().optional().allow("", null),
+  barangayName: Joi5.string().optional().allow("", null),
+  description: Joi5.string().optional().allow("", null),
+  status: Joi5.string().optional().allow("", null),
+  createdAt: Joi5.string().optional().allow("", null),
+  updatedAt: Joi5.string().optional().allow("", null),
+  deletedAt: Joi5.string().optional().allow("", null)
 });
 function MOrg(value) {
   const { error } = schemaOrg.validate(value);
   if (error) {
-    throw new BadRequestError13(error.message);
+    throw new BadRequestError14(error.message);
   }
   if (value._id) {
     try {
       value._id = new ObjectId12(value._id);
     } catch (error2) {
-      throw new BadRequestError13("Invalid ID.");
+      throw new BadRequestError14("Invalid ID.");
     }
   }
   return {
@@ -3260,24 +3268,24 @@ function MOrg(value) {
 
 // src/resources/organization/organization.repository.ts
 import {
-  AppError as AppError5,
-  BadRequestError as BadRequestError14,
+  AppError as AppError6,
+  BadRequestError as BadRequestError15,
   InternalServerError as InternalServerError12,
   logger as logger10,
   makeCacheKey as makeCacheKey8,
   paginate as paginate5,
-  useAtlas as useAtlas9,
-  useCache as useCache9
+  useAtlas as useAtlas8,
+  useCache as useCache8
 } from "@eeplatform/nodejs-utils";
 import { ObjectId as ObjectId13 } from "mongodb";
 function useOrgRepo() {
-  const db = useAtlas9.getDb();
+  const db = useAtlas8.getDb();
   if (!db) {
     throw new Error("Unable to connect to server.");
   }
   const namespace_collection = "organizations";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = useCache9(namespace_collection);
+  const { getCache, setCache, delNamespace } = useCache8(namespace_collection);
   async function createIndexes() {
     try {
       await collection.createIndexes([
@@ -3315,12 +3323,12 @@ function useOrgRepo() {
         level: "error",
         message: error.message
       });
-      if (error instanceof AppError5) {
+      if (error instanceof AppError6) {
         throw error;
       } else {
         const isDuplicated = error.message.includes("duplicate");
         if (isDuplicated) {
-          throw new BadRequestError14("Organization already exist.");
+          throw new BadRequestError15("Organization already exist.");
         }
         throw new Error("Failed to create organization.");
       }
@@ -3397,7 +3405,7 @@ function useOrgRepo() {
     try {
       _id = new ObjectId13(_id);
     } catch (error) {
-      throw new BadRequestError14("Invalid ID.");
+      throw new BadRequestError15("Invalid ID.");
     }
     const cacheKey = makeCacheKey8(namespace_collection, { _id: String(_id) });
     try {
@@ -3411,7 +3419,7 @@ function useOrgRepo() {
       }
       const result = await collection.findOne({ _id });
       if (!result) {
-        throw new BadRequestError14("Organization not found.");
+        throw new BadRequestError15("Organization not found.");
       }
       setCache(cacheKey, result, 300).then(() => {
         logger10.log({
@@ -3426,7 +3434,7 @@ function useOrgRepo() {
       });
       return result;
     } catch (error) {
-      if (error instanceof AppError5) {
+      if (error instanceof AppError6) {
         throw error;
       } else {
         throw new InternalServerError12("Failed to get organization.");
@@ -3446,7 +3454,7 @@ function useOrgRepo() {
       }
       const result = await collection.findOne({ name });
       if (!result) {
-        throw new BadRequestError14("Organization not found.");
+        throw new BadRequestError15("Organization not found.");
       }
       setCache(cacheKey, result, 300).then(() => {
         logger10.log({
@@ -3461,7 +3469,7 @@ function useOrgRepo() {
       });
       return result;
     } catch (error) {
-      if (error instanceof AppError5) {
+      if (error instanceof AppError6) {
         throw error;
       } else {
         throw new InternalServerError12("Failed to get organization.");
@@ -3471,14 +3479,14 @@ function useOrgRepo() {
   async function updateFieldById({ _id, field, value } = {}, session) {
     const allowedFields = ["name", "description"];
     if (!allowedFields.includes(field)) {
-      throw new BadRequestError14(
+      throw new BadRequestError15(
         `Field "${field}" is not allowed to be updated.`
       );
     }
     try {
       _id = new ObjectId13(_id);
     } catch (error) {
-      throw new BadRequestError14("Invalid ID.");
+      throw new BadRequestError15("Invalid ID.");
     }
     try {
       await collection.updateOne(
@@ -3497,7 +3505,7 @@ function useOrgRepo() {
     try {
       _id = new ObjectId13(_id);
     } catch (error) {
-      throw new BadRequestError14("Invalid ID.");
+      throw new BadRequestError15("Invalid ID.");
     }
     try {
       await collection.updateOne(
@@ -3522,18 +3530,19 @@ function useOrgRepo() {
 }
 
 // src/resources/organization/organization.service.ts
-import { useAtlas as useAtlas10 } from "@eeplatform/nodejs-utils";
+import { useAtlas as useAtlas9 } from "@eeplatform/nodejs-utils";
 function useOrgService() {
   const { add: addOrg } = useOrgRepo();
   const { addRole } = useRoleRepo();
   async function add(value) {
-    const session = useAtlas10.getClient()?.startSession();
+    const session = useAtlas9.getClient()?.startSession();
     session?.startTransaction();
     try {
       const org = await addOrg(value, session);
       const role = await addRole(
         {
-          id: org,
+          app: "org",
+          org,
           name: "Owner",
           description: "Owner of the organization",
           permissions: ["all"]
@@ -3555,8 +3564,8 @@ function useOrgService() {
 }
 
 // src/resources/organization/organization.controller.ts
-import { BadRequestError as BadRequestError15 } from "@eeplatform/nodejs-utils";
-import Joi5 from "joi";
+import { BadRequestError as BadRequestError16 } from "@eeplatform/nodejs-utils";
+import Joi6 from "joi";
 function useOrgController() {
   const { add: _add } = useOrgService();
   const { getOrgsByMembership } = useMemberRepo();
@@ -3569,7 +3578,7 @@ function useOrgController() {
     const value = req.body;
     const { error } = schemaOrg.validate(value);
     if (error) {
-      next(new BadRequestError15(error.message));
+      next(new BadRequestError16(error.message));
       return;
     }
     try {
@@ -3587,23 +3596,23 @@ function useOrgController() {
     const user = req.params.user ?? "";
     const isPageNumber = isFinite(page);
     if (!isPageNumber) {
-      next(new BadRequestError15("Invalid page number."));
+      next(new BadRequestError16("Invalid page number."));
       return;
     }
     const isLimitNumber = isFinite(limit);
     if (!isLimitNumber) {
-      next(new BadRequestError15("Invalid limit number."));
+      next(new BadRequestError16("Invalid limit number."));
       return;
     }
-    const validation = Joi5.object({
-      user: Joi5.string().hex().required(),
-      page: Joi5.number().min(1).optional().allow("", null),
-      limit: Joi5.number().min(1).optional().allow("", null),
-      search: Joi5.string().optional().allow("", null)
+    const validation = Joi6.object({
+      user: Joi6.string().hex().required(),
+      page: Joi6.number().min(1).optional().allow("", null),
+      limit: Joi6.number().min(1).optional().allow("", null),
+      search: Joi6.string().optional().allow("", null)
     });
     const { error } = validation.validate({ user, page, limit, search });
     if (error) {
-      next(new BadRequestError15(error.message));
+      next(new BadRequestError16(error.message));
       return;
     }
     try {
@@ -3616,11 +3625,11 @@ function useOrgController() {
   }
   async function getAll(req, res, next) {
     const query = req.query;
-    const validation = Joi5.object({
-      page: Joi5.number().min(1).optional().allow("", null),
-      limit: Joi5.number().min(1).optional().allow("", null),
-      search: Joi5.string().optional().allow("", null),
-      status: Joi5.string().valid("active", "suspended", "inactive", "deleted").optional()
+    const validation = Joi6.object({
+      page: Joi6.number().min(1).optional().allow("", null),
+      limit: Joi6.number().min(1).optional().allow("", null),
+      search: Joi6.string().optional().allow("", null),
+      status: Joi6.string().valid("active", "suspended", "inactive", "deleted").optional()
     });
     const { error } = validation.validate(query);
     const page = typeof req.query.page === "string" ? Number(req.query.page) : 1;
@@ -3629,16 +3638,16 @@ function useOrgController() {
     const status = req.query.status ?? "active";
     const isPageNumber = isFinite(page);
     if (!isPageNumber) {
-      next(new BadRequestError15("Invalid page number."));
+      next(new BadRequestError16("Invalid page number."));
       return;
     }
     const isLimitNumber = isFinite(limit);
     if (!isLimitNumber) {
-      next(new BadRequestError15("Invalid limit number."));
+      next(new BadRequestError16("Invalid limit number."));
       return;
     }
     if (error) {
-      next(new BadRequestError15(error.message));
+      next(new BadRequestError16(error.message));
       return;
     }
     try {
@@ -3651,12 +3660,12 @@ function useOrgController() {
   }
   async function getByName(req, res, next) {
     const name = req.params.name;
-    const validation = Joi5.object({
-      name: Joi5.string().required()
+    const validation = Joi6.object({
+      name: Joi6.string().required()
     });
     const { error } = validation.validate({ name });
     if (error) {
-      next(new BadRequestError15(error.message));
+      next(new BadRequestError16(error.message));
       return;
     }
     try {
@@ -3669,12 +3678,12 @@ function useOrgController() {
   }
   async function getById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi5.object({
-      id: Joi5.string().hex().required()
+    const validation = Joi6.object({
+      id: Joi6.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError15(error.message));
+      next(new BadRequestError16(error.message));
       return;
     }
     try {
@@ -3695,23 +3704,23 @@ function useOrgController() {
 }
 
 // src/resources/app/app.model.ts
-import { BadRequestError as BadRequestError16 } from "@eeplatform/nodejs-utils";
-import Joi6 from "joi";
-var schemaApp = Joi6.object({
-  code: Joi6.string().alphanum().max(20).required(),
-  name: Joi6.string().max(255).required(),
-  description: Joi6.string().max(1024).optional().allow("", null),
-  type: Joi6.string().allow("default", "standard").optional().allow("", null)
+import { BadRequestError as BadRequestError17 } from "@eeplatform/nodejs-utils";
+import Joi7 from "joi";
+var schemaApp = Joi7.object({
+  code: Joi7.string().max(20).required(),
+  name: Joi7.string().max(255).required(),
+  description: Joi7.string().max(1024).optional().allow("", null),
+  type: Joi7.string().allow("default", "standard").optional().allow("", null)
 });
-var schemaAppUpdate = Joi6.object({
-  code: Joi6.string().alphanum().max(20).optional().allow("", null),
-  name: Joi6.string().max(255).optional().allow("", null),
-  description: Joi6.string().max(1024).optional().allow("", null)
+var schemaAppUpdate = Joi7.object({
+  code: Joi7.string().max(20).optional().allow("", null),
+  name: Joi7.string().max(255).optional().allow("", null),
+  description: Joi7.string().max(1024).optional().allow("", null)
 });
 function modelApp(value) {
   const { error } = schemaApp.validate(value);
   if (error) {
-    throw new BadRequestError16(error.message);
+    throw new BadRequestError17(error.message);
   }
   return {
     _id: value._id,
@@ -3728,19 +3737,19 @@ function modelApp(value) {
 
 // src/resources/app/app.repository.ts
 import {
-  AppError as AppError6,
-  BadRequestError as BadRequestError17,
+  AppError as AppError7,
+  BadRequestError as BadRequestError18,
   InternalServerError as InternalServerError13,
   logger as logger11,
   makeCacheKey as makeCacheKey9,
   paginate as paginate6,
-  useRepo
+  useRepo as useRepo2
 } from "@eeplatform/nodejs-utils";
 import { ObjectId as ObjectId14 } from "mongodb";
-import Joi7 from "joi";
+import Joi8 from "joi";
 function useAppRepo() {
   const namespace_collection = "apps";
-  const repo = useRepo(namespace_collection);
+  const repo = useRepo2(namespace_collection);
   async function createIndexes() {
     try {
       await repo.collection.createIndexes([
@@ -3778,12 +3787,12 @@ function useAppRepo() {
         level: "error",
         message: error.message
       });
-      if (error instanceof AppError6) {
+      if (error instanceof AppError7) {
         throw error;
       } else {
         const isDuplicated = error.message.includes("duplicate");
         if (isDuplicated) {
-          throw new BadRequestError17("App already exists.");
+          throw new BadRequestError18("App already exists.");
         }
         throw new Error("Failed to create app.");
       }
@@ -3793,7 +3802,7 @@ function useAppRepo() {
     try {
       _id = new ObjectId14(_id);
     } catch (error) {
-      throw new BadRequestError17("Invalid ID.");
+      throw new BadRequestError18("Invalid ID.");
     }
     try {
       const res = await repo.collection.updateOne(
@@ -3808,7 +3817,7 @@ function useAppRepo() {
         level: "error",
         message: error.message
       });
-      if (error instanceof AppError6) {
+      if (error instanceof AppError7) {
         throw error;
       } else {
         throw new Error("Failed to update app.");
@@ -3889,7 +3898,7 @@ function useAppRepo() {
     try {
       _id = new ObjectId14(_id);
     } catch (error) {
-      throw new BadRequestError17("Invalid ID.");
+      throw new BadRequestError18("Invalid ID.");
     }
     const cacheKey = makeCacheKey9(namespace_collection, { _id: String(_id) });
     try {
@@ -3917,7 +3926,7 @@ function useAppRepo() {
       });
       return result;
     } catch (error) {
-      if (error instanceof AppError6) {
+      if (error instanceof AppError7) {
         throw error;
       } else {
         throw new InternalServerError13("Failed to get app.");
@@ -3925,10 +3934,10 @@ function useAppRepo() {
     }
   }
   async function getByCode(code) {
-    const validate = Joi7.string().required();
+    const validate = Joi8.string().required();
     const { error } = validate.validate(code);
     if (error) {
-      throw new BadRequestError17("Invalid code.");
+      throw new BadRequestError18("Invalid code.");
     }
     const cacheKey = makeCacheKey9(namespace_collection, {
       code,
@@ -3959,7 +3968,7 @@ function useAppRepo() {
       });
       return result;
     } catch (error2) {
-      if (error2 instanceof AppError6) {
+      if (error2 instanceof AppError7) {
         throw error2;
       } else {
         throw new InternalServerError13("Failed to get app.");
@@ -3970,7 +3979,7 @@ function useAppRepo() {
     try {
       _id = new ObjectId14(_id);
     } catch (error) {
-      throw new BadRequestError17("Invalid ID.");
+      throw new BadRequestError18("Invalid ID.");
     }
     try {
       const res = await repo.collection.updateOne(
@@ -3984,7 +3993,7 @@ function useAppRepo() {
         level: "error",
         message: error.message
       });
-      if (error instanceof AppError6) {
+      if (error instanceof AppError7) {
         throw error;
       } else {
         throw new InternalServerError13("Failed to delete app.");
@@ -4003,7 +4012,7 @@ function useAppRepo() {
 }
 
 // src/resources/app/app.service.ts
-import { logger as logger12, useAtlas as useAtlas11 } from "@eeplatform/nodejs-utils";
+import { logger as logger12, useAtlas as useAtlas10 } from "@eeplatform/nodejs-utils";
 function useAppService() {
   const {
     updateById: _updateById,
@@ -4036,7 +4045,7 @@ function useAppService() {
         description: "Basic Education School application."
       }
     ];
-    const session = useAtlas11.getClient()?.startSession();
+    const session = useAtlas10.getClient()?.startSession();
     if (!session) {
       throw new Error("Failed to start database session.");
     }
@@ -4080,8 +4089,8 @@ function useAppService() {
 }
 
 // src/resources/app/app.controller.ts
-import { BadRequestError as BadRequestError18 } from "@eeplatform/nodejs-utils";
-import Joi8 from "joi";
+import { BadRequestError as BadRequestError19 } from "@eeplatform/nodejs-utils";
+import Joi9 from "joi";
 function useAppController() {
   const {
     getAll: _getAll,
@@ -4094,7 +4103,7 @@ function useAppController() {
     const value = req.body;
     const { error } = schemaApp.validate(value);
     if (error) {
-      next(new BadRequestError18(error.message));
+      next(new BadRequestError19(error.message));
       return;
     }
     try {
@@ -4107,15 +4116,15 @@ function useAppController() {
   }
   async function updateById(req, res, next) {
     const id = req.params.id ?? "";
-    const { error: errorId } = Joi8.string().hex().required().validate(id);
+    const { error: errorId } = Joi9.string().hex().required().validate(id);
     if (errorId) {
-      next(new BadRequestError18(errorId.message));
+      next(new BadRequestError19(errorId.message));
       return;
     }
     const value = req.body;
     const { error } = schemaAppUpdate.validate(value);
     if (error) {
-      next(new BadRequestError18(error.message));
+      next(new BadRequestError19(error.message));
       return;
     }
     try {
@@ -4128,16 +4137,16 @@ function useAppController() {
   }
   async function getAll(req, res, next) {
     const query = req.query;
-    const validation = Joi8.object({
-      page: Joi8.number().min(1).optional().allow("", null),
-      limit: Joi8.number().min(1).optional().allow("", null),
-      search: Joi8.string().optional().allow("", null),
-      status: Joi8.string().optional().allow("", null),
-      type: Joi8.string().optional().allow("", null)
+    const validation = Joi9.object({
+      page: Joi9.number().min(1).optional().allow("", null),
+      limit: Joi9.number().min(1).optional().allow("", null),
+      search: Joi9.string().optional().allow("", null),
+      status: Joi9.string().optional().allow("", null),
+      type: Joi9.string().optional().allow("", null)
     });
     const { error } = validation.validate(query);
     if (error) {
-      next(new BadRequestError18(error.message));
+      next(new BadRequestError19(error.message));
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
@@ -4171,12 +4180,12 @@ function useAppController() {
   }
   async function getById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi8.object({
-      id: Joi8.string().hex().required()
+    const validation = Joi9.object({
+      id: Joi9.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError18(error.message));
+      next(new BadRequestError19(error.message));
       return;
     }
     try {
@@ -4192,12 +4201,12 @@ function useAppController() {
   }
   async function deleteById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi8.object({
-      id: Joi8.string().hex().required()
+    const validation = Joi9.object({
+      id: Joi9.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError18(error.message));
+      next(new BadRequestError19(error.message));
       return;
     }
     try {
@@ -4218,26 +4227,26 @@ function useAppController() {
 }
 
 // src/resources/permission/permission.model.ts
-import { BadRequestError as BadRequestError19 } from "@eeplatform/nodejs-utils";
-import Joi9 from "joi";
-var schemaPermission = Joi9.object({
-  app: Joi9.string().required(),
-  key: Joi9.string().required(),
-  name: Joi9.string().required(),
-  group: Joi9.string().required(),
-  description: Joi9.string().required(),
-  deprecated: Joi9.boolean().optional().allow(null)
+import { BadRequestError as BadRequestError20 } from "@eeplatform/nodejs-utils";
+import Joi10 from "joi";
+var schemaPermission = Joi10.object({
+  app: Joi10.string().required(),
+  key: Joi10.string().required(),
+  name: Joi10.string().required(),
+  group: Joi10.string().required(),
+  description: Joi10.string().required(),
+  deprecated: Joi10.boolean().optional().allow(null)
 });
-var schemaPermissionUpdate = Joi9.object({
-  key: Joi9.string().optional().allow("", null),
-  name: Joi9.string().optional().allow("", null),
-  group: Joi9.string().optional().allow("", null),
-  description: Joi9.string().max(1024).optional().allow("", null)
+var schemaPermissionUpdate = Joi10.object({
+  key: Joi10.string().optional().allow("", null),
+  name: Joi10.string().optional().allow("", null),
+  group: Joi10.string().optional().allow("", null),
+  description: Joi10.string().max(1024).optional().allow("", null)
 });
 function modelPermission(value) {
   const { error } = schemaPermission.validate(value);
   if (error) {
-    throw new BadRequestError19(error.message);
+    throw new BadRequestError20(error.message);
   }
   return {
     _id: value._id,
@@ -4256,19 +4265,19 @@ function modelPermission(value) {
 
 // src/resources/permission/permission.repository.ts
 import {
-  AppError as AppError7,
-  BadRequestError as BadRequestError20,
+  AppError as AppError8,
+  BadRequestError as BadRequestError21,
   InternalServerError as InternalServerError14,
   logger as logger14,
   makeCacheKey as makeCacheKey10,
   paginate as paginate7,
-  useRepo as useRepo2
+  useRepo as useRepo3
 } from "@eeplatform/nodejs-utils";
 import { ObjectId as ObjectId15 } from "mongodb";
-import Joi10 from "joi";
+import Joi11 from "joi";
 function usePermissionRepo() {
   const namespace_collection = "permissions";
-  const repo = useRepo2(namespace_collection);
+  const repo = useRepo3(namespace_collection);
   async function createIndexes() {
     try {
       await repo.collection.createIndexes([
@@ -4307,12 +4316,12 @@ function usePermissionRepo() {
         level: "error",
         message: error.message
       });
-      if (error instanceof AppError7) {
+      if (error instanceof AppError8) {
         throw error;
       } else {
         const isDuplicated = error.message.includes("duplicate");
         if (isDuplicated) {
-          throw new BadRequestError20("Permission already exists.");
+          throw new BadRequestError21("Permission already exists.");
         }
         throw new Error("Failed to create permission.");
       }
@@ -4322,11 +4331,11 @@ function usePermissionRepo() {
     try {
       _id = new ObjectId15(_id);
     } catch (error2) {
-      throw new BadRequestError20("Invalid ID.");
+      throw new BadRequestError21("Invalid ID.");
     }
     const { error } = schemaPermissionUpdate.validate(value);
     if (error) {
-      throw new BadRequestError20(`Invalid data: ${error.message}`);
+      throw new BadRequestError21(`Invalid data: ${error.message}`);
     }
     try {
       const res = await repo.collection.updateOne(
@@ -4341,7 +4350,7 @@ function usePermissionRepo() {
         level: "error",
         message: error2.message
       });
-      if (error2 instanceof AppError7) {
+      if (error2 instanceof AppError8) {
         throw error2;
       } else {
         throw new Error("Failed to update permission.");
@@ -4417,7 +4426,7 @@ function usePermissionRepo() {
     try {
       _id = new ObjectId15(_id);
     } catch (error) {
-      throw new BadRequestError20("Invalid ID.");
+      throw new BadRequestError21("Invalid ID.");
     }
     const cacheKey = makeCacheKey10(namespace_collection, { _id: String(_id) });
     try {
@@ -4445,7 +4454,7 @@ function usePermissionRepo() {
       });
       return result;
     } catch (error) {
-      if (error instanceof AppError7) {
+      if (error instanceof AppError8) {
         throw error;
       } else {
         throw new InternalServerError14("Failed to get permission.");
@@ -4453,14 +4462,14 @@ function usePermissionRepo() {
     }
   }
   async function getByKey(key, group, app) {
-    const validation = Joi10.object({
-      key: Joi10.string().required(),
-      group: Joi10.string().optional().allow("", null),
-      app: Joi10.string().optional().allow("", null)
+    const validation = Joi11.object({
+      key: Joi11.string().required(),
+      group: Joi11.string().optional().allow("", null),
+      app: Joi11.string().optional().allow("", null)
     });
     const { error } = validation.validate({ key, group });
     if (error) {
-      throw new BadRequestError20(`Invalid data: ${error.message}`);
+      throw new BadRequestError21(`Invalid data: ${error.message}`);
     }
     const query = {};
     const cacheKeyOptions = {};
@@ -4498,7 +4507,7 @@ function usePermissionRepo() {
       });
       return result;
     } catch (error2) {
-      if (error2 instanceof AppError7) {
+      if (error2 instanceof AppError8) {
         throw error2;
       } else {
         throw new InternalServerError14("Failed to get permission.");
@@ -4535,7 +4544,7 @@ function usePermissionRepo() {
       });
       return result;
     } catch (error) {
-      if (error instanceof AppError7) {
+      if (error instanceof AppError8) {
         throw error;
       } else {
         throw new InternalServerError14("Failed to count permission by group.");
@@ -4546,7 +4555,7 @@ function usePermissionRepo() {
     try {
       _id = new ObjectId15(_id);
     } catch (error) {
-      throw new BadRequestError20("Invalid ID.");
+      throw new BadRequestError21("Invalid ID.");
     }
     try {
       const res = await repo.collection.updateOne(
@@ -4560,7 +4569,7 @@ function usePermissionRepo() {
         level: "error",
         message: error.message
       });
-      if (error instanceof AppError7) {
+      if (error instanceof AppError8) {
         throw error;
       } else {
         throw new InternalServerError14("Failed to delete permission.");
@@ -4600,8 +4609,8 @@ function usePermissionService() {
 }
 
 // src/resources/permission/permission.controller.ts
-import { BadRequestError as BadRequestError21, logger as logger15 } from "@eeplatform/nodejs-utils";
-import Joi11 from "joi";
+import { BadRequestError as BadRequestError22, logger as logger15 } from "@eeplatform/nodejs-utils";
+import Joi12 from "joi";
 function usePermissionController() {
   const {
     getAll: _getAll,
@@ -4614,7 +4623,7 @@ function usePermissionController() {
     const value = req.body;
     const { error } = schemaPermission.validate(value);
     if (error) {
-      next(new BadRequestError21(error.message));
+      next(new BadRequestError22(error.message));
       logger15.info(`Controller: ${error.message}`);
       return;
     }
@@ -4628,16 +4637,16 @@ function usePermissionController() {
   }
   async function getAll(req, res, next) {
     const query = req.query;
-    const validation = Joi11.object({
-      page: Joi11.number().min(1).optional().allow("", null),
-      limit: Joi11.number().min(1).optional().allow("", null),
-      search: Joi11.string().optional().allow("", null),
-      app: Joi11.string().optional().allow("", null),
-      status: Joi11.string().optional().allow("", null)
+    const validation = Joi12.object({
+      page: Joi12.number().min(1).optional().allow("", null),
+      limit: Joi12.number().min(1).optional().allow("", null),
+      search: Joi12.string().optional().allow("", null),
+      app: Joi12.string().optional().allow("", null),
+      status: Joi12.string().optional().allow("", null)
     });
     const { error } = validation.validate(query);
     if (error) {
-      next(new BadRequestError21(error.message));
+      next(new BadRequestError22(error.message));
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
@@ -4671,12 +4680,12 @@ function usePermissionController() {
   }
   async function getById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi11.object({
-      id: Joi11.string().hex().required()
+    const validation = Joi12.object({
+      id: Joi12.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError21(error.message));
+      next(new BadRequestError22(error.message));
       return;
     }
     try {
@@ -4692,12 +4701,12 @@ function usePermissionController() {
   }
   async function deleteById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi11.object({
-      id: Joi11.string().hex().required()
+    const validation = Joi12.object({
+      id: Joi12.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError21(error.message));
+      next(new BadRequestError22(error.message));
       return;
     }
     try {
@@ -4710,15 +4719,15 @@ function usePermissionController() {
   }
   async function updateById(req, res, next) {
     const id = req.params.id;
-    const { error: errorId } = Joi11.string().hex().required().validate(id);
+    const { error: errorId } = Joi12.string().hex().required().validate(id);
     if (errorId) {
-      next(new BadRequestError21(errorId.message));
+      next(new BadRequestError22(errorId.message));
       return;
     }
     const payload = req.body;
     const { error } = schemaPermissionUpdate.validate(payload);
     if (error) {
-      next(new BadRequestError21(error.message));
+      next(new BadRequestError22(error.message));
       return;
     }
     try {
@@ -4739,23 +4748,23 @@ function usePermissionController() {
 }
 
 // src/resources/permission/permission.group.model.ts
-import { BadRequestError as BadRequestError22 } from "@eeplatform/nodejs-utils";
-import Joi12 from "joi";
-var schemaPermissionGroup = Joi12.object({
-  app: Joi12.string().required(),
-  key: Joi12.string().required(),
-  label: Joi12.string().required(),
-  order: Joi12.number().integer().optional().allow("", null)
+import { BadRequestError as BadRequestError23 } from "@eeplatform/nodejs-utils";
+import Joi13 from "joi";
+var schemaPermissionGroup = Joi13.object({
+  app: Joi13.string().required(),
+  key: Joi13.string().required(),
+  label: Joi13.string().required(),
+  order: Joi13.number().integer().optional().allow("", null)
 });
-var schemaPermissionGroupUpdate = Joi12.object({
-  key: Joi12.string().optional().allow("", null),
-  label: Joi12.string().optional().allow("", null),
-  order: Joi12.number().integer().optional().allow("", null)
+var schemaPermissionGroupUpdate = Joi13.object({
+  key: Joi13.string().optional().allow("", null),
+  label: Joi13.string().optional().allow("", null),
+  order: Joi13.number().integer().optional().allow("", null)
 });
 function modelPermissionGroup(value) {
   const { error } = schemaPermissionGroup.validate(value);
   if (error) {
-    throw new BadRequestError22(error.message);
+    throw new BadRequestError23(error.message);
   }
   return {
     _id: value._id,
@@ -4772,19 +4781,19 @@ function modelPermissionGroup(value) {
 
 // src/resources/permission/permission.group.repository.ts
 import {
-  AppError as AppError8,
-  BadRequestError as BadRequestError23,
+  AppError as AppError9,
+  BadRequestError as BadRequestError24,
   InternalServerError as InternalServerError15,
   logger as logger16,
   makeCacheKey as makeCacheKey11,
   paginate as paginate8,
-  useRepo as useRepo3
+  useRepo as useRepo4
 } from "@eeplatform/nodejs-utils";
 import { ObjectId as ObjectId16 } from "mongodb";
-import Joi13 from "joi";
+import Joi14 from "joi";
 function usePermissionGroupRepo() {
   const namespace_collection = "permission.groups";
-  const repo = useRepo3(namespace_collection);
+  const repo = useRepo4(namespace_collection);
   async function createIndexes() {
     try {
       await repo.collection.createIndexes([
@@ -4816,12 +4825,12 @@ function usePermissionGroupRepo() {
         level: "error",
         message: error.message
       });
-      if (error instanceof AppError8) {
+      if (error instanceof AppError9) {
         throw error;
       } else {
         const isDuplicated = error.message.includes("duplicate");
         if (isDuplicated) {
-          throw new BadRequestError23("Permission group already exists.");
+          throw new BadRequestError24("Permission group already exists.");
         }
         throw new Error("Failed to create permission group.");
       }
@@ -4831,11 +4840,11 @@ function usePermissionGroupRepo() {
     try {
       _id = new ObjectId16(_id);
     } catch (error2) {
-      throw new BadRequestError23("Invalid ID.");
+      throw new BadRequestError24("Invalid ID.");
     }
     const { error } = schemaPermissionGroupUpdate.validate(value);
     if (error) {
-      throw new BadRequestError23(`Invalid data: ${error.message}`);
+      throw new BadRequestError24(`Invalid data: ${error.message}`);
     }
     try {
       const res = await repo.collection.updateOne(
@@ -4850,7 +4859,7 @@ function usePermissionGroupRepo() {
         level: "error",
         message: error2.message
       });
-      if (error2 instanceof AppError8) {
+      if (error2 instanceof AppError9) {
         throw error2;
       } else {
         throw new Error("Failed to update permission group.");
@@ -4926,7 +4935,7 @@ function usePermissionGroupRepo() {
     try {
       _id = new ObjectId16(_id);
     } catch (error) {
-      throw new BadRequestError23("Invalid ID.");
+      throw new BadRequestError24("Invalid ID.");
     }
     const cacheKey = makeCacheKey11(namespace_collection, { _id: String(_id) });
     try {
@@ -4954,7 +4963,7 @@ function usePermissionGroupRepo() {
       });
       return result;
     } catch (error) {
-      if (error instanceof AppError8) {
+      if (error instanceof AppError9) {
         throw error;
       } else {
         throw new InternalServerError15("Failed to get permission group.");
@@ -4962,13 +4971,13 @@ function usePermissionGroupRepo() {
     }
   }
   async function getByKey(key, app) {
-    const validation = Joi13.object({
-      key: Joi13.string().required(),
-      app: Joi13.string().optional().allow(null, "")
+    const validation = Joi14.object({
+      key: Joi14.string().required(),
+      app: Joi14.string().optional().allow(null, "")
     });
     const { error } = validation.validate({ key, app });
     if (error) {
-      throw new BadRequestError23("Invalid key.");
+      throw new BadRequestError24("Invalid key.");
     }
     const query = { key };
     const cacheKeyOptions = { key, tag: "byKey" };
@@ -5000,7 +5009,7 @@ function usePermissionGroupRepo() {
       });
       return result;
     } catch (error2) {
-      if (error2 instanceof AppError8) {
+      if (error2 instanceof AppError9) {
         throw error2;
       } else {
         throw new InternalServerError15("Failed to get permission group.");
@@ -5011,7 +5020,7 @@ function usePermissionGroupRepo() {
     try {
       _id = new ObjectId16(_id);
     } catch (error) {
-      throw new BadRequestError23("Invalid ID.");
+      throw new BadRequestError24("Invalid ID.");
     }
     try {
       const res = await repo.collection.updateOne(
@@ -5025,7 +5034,7 @@ function usePermissionGroupRepo() {
         level: "error",
         message: error.message
       });
-      if (error instanceof AppError8) {
+      if (error instanceof AppError9) {
         throw error;
       } else {
         throw new InternalServerError15("Failed to delete permission group.");
@@ -5045,11 +5054,12 @@ function usePermissionGroupRepo() {
 
 // src/resources/permission/permission.group.service.ts
 import {
-  AppError as AppError9,
-  BadRequestError as BadRequestError24,
+  AppError as AppError10,
+  BadRequestError as BadRequestError25,
   InternalServerError as InternalServerError16,
   logger as logger17,
-  useAtlas as useAtlas12
+  useAtlas as useAtlas11,
+  useModule
 } from "@eeplatform/nodejs-utils";
 function usePermissionGroupService() {
   const {
@@ -5066,7 +5076,7 @@ function usePermissionGroupService() {
     add: addPermission
   } = usePermissionRepo();
   async function addDefaultModule() {
-    const session = useAtlas12.getClient()?.startSession();
+    const session = useAtlas11.getClient()?.startSession();
     if (!session) {
       throw new Error("Failed to start database session.");
     }
@@ -5077,96 +5087,69 @@ function usePermissionGroupService() {
         type: ["default", "standard"]
       });
       if (apps && apps.items && apps.items.length) {
-        const modules = [
-          {
-            key: "members",
-            label: "Members",
-            permissions: [
-              {
-                key: "members.view",
-                name: "View Members",
-                description: "Allow user to view members"
-              },
-              {
-                key: "members.view.details",
-                name: "View Member Details",
-                description: "Allow user to view member details"
-              },
-              {
-                key: "members.add",
-                name: "Add Members",
-                description: "Allow user to add new members"
-              },
-              {
-                key: "members.edit.details",
-                name: "Edit Member Details",
-                description: "Allow user to edit member details"
-              },
-              {
-                key: "members.delete",
-                name: "Delete Members",
-                description: "Allow user to delete members"
-              }
-            ]
-          },
-          {
-            key: "roles",
-            label: "Roles",
-            permissions: [
-              {
-                key: "roles.view",
-                name: "View Roles",
-                description: "Allow user to view roles"
-              },
-              {
-                key: "roles.view.details",
-                name: "View Role Details",
-                description: "Allow user to view role details"
-              },
-              {
-                key: "roles.add",
-                name: "Add Roles",
-                description: "Allow user to add new roles"
-              },
-              {
-                key: "roles.edit.details",
-                name: "Edit Role Details",
-                description: "Allow user to edit role details"
-              },
-              {
-                key: "roles.delete",
-                name: "Delete Roles",
-                description: "Allow user to delete roles"
-              }
-            ]
-          },
-          {
-            key: "invitations",
-            label: "Invitations",
-            permissions: [
-              {
-                key: "invitations.view",
-                name: "View Invitations",
-                description: "Allow user to view invitations"
-              },
-              {
-                key: "invitations.view.details",
-                name: "View Invitation Details",
-                description: "Allow user to view invitation details"
-              },
-              {
-                key: "invitations.send",
-                name: "Send Invitations",
-                description: "Allow user to send invitations"
-              },
-              {
-                key: "invitations.revoke",
-                name: "Revoke Invitations",
-                description: "Allow user to revoke invitations"
-              }
-            ]
-          }
-        ];
+        let modules = [];
+        const memberModule = useModule("members", "Members").addPermission({
+          key: "add",
+          name: "Add Members",
+          description: "Allow user to add new members"
+        }).addPermission({
+          key: "view",
+          name: "View Members",
+          description: "Allow user to view members"
+        }).addPermission({
+          key: "view.details",
+          name: "View Member Details",
+          description: "Allow user to view member details"
+        }).addPermission({
+          key: "edit.details",
+          name: "Edit Member Details",
+          description: "Allow user to edit member details"
+        }).addPermission({
+          key: "delete",
+          name: "Delete Members",
+          description: "Allow user to delete members"
+        });
+        modules.push(memberModule);
+        const roleModule = useModule("roles", "Roles").addPermission({
+          key: "add",
+          name: "Add Roles",
+          description: "Allow user to add new roles"
+        }).addPermission({
+          key: "view",
+          name: "View Roles",
+          description: "Allow user to view roles"
+        }).addPermission({
+          key: "view.details",
+          name: "View Role Details",
+          description: "Allow user to view role details"
+        }).addPermission({
+          key: "edit.details",
+          name: "Edit Role Details",
+          description: "Allow user to edit role details"
+        }).addPermission({
+          key: "delete",
+          name: "Delete Roles",
+          description: "Allow user to delete roles"
+        });
+        modules.push(roleModule);
+        const invitationModule = useModule("invitations", "Invitations").addPermission({
+          key: "send",
+          name: "Send Invitations",
+          description: "Allow user to send invitations"
+        }).addPermission({
+          key: "view",
+          name: "View Invitations",
+          description: "Allow user to view invitations"
+        }).addPermission({
+          key: "view.details",
+          name: "View Invitation Details",
+          description: "Allow user to view invitation details"
+        }).addPermission({
+          key: "revoke",
+          name: "Revoke Invitations",
+          description: "Allow user to revoke invitations"
+        });
+        modules.push(invitationModule);
         for (const app of apps.items) {
           for (const module of modules) {
             const existingGroup = await _getByKey(module.key, app.code);
@@ -5199,168 +5182,426 @@ function usePermissionGroupService() {
             }
           }
           if (app.code === "admin") {
-            const modules2 = [
-              {
-                key: "applications",
-                label: "Applications",
-                permissions: [
-                  {
-                    key: "applications.add",
-                    name: "Add Applications",
-                    description: "Allow user to add new applications"
-                  },
-                  {
-                    key: "applications.view",
-                    name: "View Applications",
-                    description: "Allow user to view applications"
-                  },
-                  {
-                    key: "applications.view.details",
-                    name: "View Application Details",
-                    description: "Allow user to view application details"
-                  },
-                  {
-                    key: "applications.edit",
-                    name: "Edit Applications",
-                    description: "Allow user to edit existing applications"
-                  },
-                  {
-                    key: "applications.update.details",
-                    name: "Update Application Details",
-                    description: "Allow user to update application details"
-                  },
-                  {
-                    key: "applications.delete",
-                    name: "Delete Applications",
-                    description: "Allow user to delete applications"
-                  }
-                ]
-              },
-              {
-                key: "deped-ro",
-                label: "Regional Offices",
-                permissions: [
-                  {
-                    key: "deped-ro.add",
-                    name: "Add Regional Office",
-                    description: "Allow user to add new regional office"
-                  },
-                  {
-                    key: "deped-ro.view",
-                    name: "View Regional Offices",
-                    description: "Allow user to view regional offices"
-                  },
-                  {
-                    key: "deped-ro.view.details",
-                    name: "View Regional Office Details",
-                    description: "Allow user to view regional office details"
-                  },
-                  {
-                    key: "deped-ro.update.details",
-                    name: "Update Regional Office Details",
-                    description: "Allow user to update regional office details"
-                  },
-                  {
-                    key: "deped-ro.delete",
-                    name: "Delete Regional Office",
-                    description: "Allow user to delete regional office"
-                  }
-                ]
-              },
-              {
-                key: "deped-sdo",
-                label: "School Division Offices",
-                permissions: [
-                  {
-                    key: "deped-sdo.add",
-                    name: "Add School Division Office",
-                    description: "Allow user to add new school division office"
-                  },
-                  {
-                    key: "deped-sdo.view",
-                    name: "View School Division Offices",
-                    description: "Allow user to view school division offices"
-                  },
-                  {
-                    key: "deped-sdo.view.details",
-                    name: "View School Division Office Details",
-                    description: "Allow user to view school division office details"
-                  },
-                  {
-                    key: "deped-sdo.update.details",
-                    name: "Update School Division Office Details",
-                    description: "Allow user to update school division office details"
-                  },
-                  {
-                    key: "deped-sdo.delete",
-                    name: "Delete School Division Office",
-                    description: "Allow user to delete school division office"
-                  }
-                ]
-              },
-              {
-                key: "deped-school",
-                label: "Schools",
-                permissions: [
-                  {
-                    key: "deped-school.add",
-                    name: "Add School",
-                    description: "Allow user to add new school"
-                  },
-                  {
-                    key: "deped-school.view",
-                    name: "View Schools",
-                    description: "Allow user to view schools"
-                  },
-                  {
-                    key: "deped-school.view.details",
-                    name: "View School Details",
-                    description: "Allow user to view school details"
-                  },
-                  {
-                    key: "deped-school.update.details",
-                    name: "Update School Details",
-                    description: "Allow user to update school details"
-                  },
-                  {
-                    key: "deped-school.delete",
-                    name: "Delete School",
-                    description: "Allow user to delete school"
-                  }
-                ]
-              },
-              {
-                key: "users",
-                label: "Users",
-                permissions: [
-                  {
-                    key: "users.add",
-                    name: "Add Users",
-                    description: "Allow user to add new users"
-                  },
-                  {
-                    key: "users.view",
-                    name: "View Users",
-                    description: "Allow user to view users"
-                  },
-                  {
-                    key: "users.view.details",
-                    name: "View User Details",
-                    description: "Allow user to view user details"
-                  },
-                  {
-                    key: "users.edit.status",
-                    name: "Edit User Status",
-                    description: "Allow user to edit user status"
-                  },
-                  {
-                    key: "users.delete",
-                    name: "Delete Users",
-                    description: "Allow user to delete users"
-                  }
-                ]
+            let modules2 = [];
+            const appModule = useModule("app", "Application").addPermission({
+              key: "add",
+              name: "Add Applications",
+              description: "Allow user to add new applications"
+            }).addPermission({
+              key: "view",
+              name: "View Applications",
+              description: "Allow user to view applications"
+            }).addPermission({
+              key: "view.details",
+              name: "View Application Details",
+              description: "Allow user to view application details"
+            }).addPermission({
+              key: "edit",
+              name: "Edit Applications",
+              description: "Allow user to edit existing applications"
+            }).addPermission({
+              key: "update.details",
+              name: "Update Application Details",
+              description: "Allow user to update application details"
+            }).addPermission({
+              key: "delete",
+              name: "Delete Applications",
+              description: "Allow user to delete applications"
+            });
+            modules2.push(appModule);
+            const userModule = useModule("users", "Users").addPermission({
+              key: "add",
+              name: "Add Users",
+              description: "Allow user to add new users"
+            }).addPermission({
+              key: "view",
+              name: "View Users",
+              description: "Allow user to view users"
+            }).addPermission({
+              key: "view.details",
+              name: "View User Details",
+              description: "Allow user to view user details"
+            }).addPermission({
+              key: "edit.status",
+              name: "Edit User Status",
+              description: "Allow user to edit user status"
+            }).addPermission({
+              key: "delete",
+              name: "Delete Users",
+              description: "Allow user to delete users"
+            });
+            modules2.push(userModule);
+            const basicEduRegionModule = useModule(
+              "deped-ro",
+              "Regional Offices"
+            ).addPermission({
+              key: "add",
+              name: "Add Regional Office",
+              description: "Allow user to add new regional office"
+            }).addPermission({
+              key: "view",
+              name: "View Regional Offices",
+              description: "Allow user to view regional offices"
+            }).addPermission({
+              key: "view.details",
+              name: "View Regional Office Details",
+              description: "Allow user to view regional office details"
+            }).addPermission({
+              key: "update.details",
+              name: "Update Regional Office Details",
+              description: "Allow user to update regional office details"
+            }).addPermission({
+              key: "delete",
+              name: "Delete Regional Office",
+              description: "Allow user to delete regional office"
+            });
+            modules2.push(basicEduRegionModule);
+            const basicEduDivisionModule = useModule(
+              "deped-sdo",
+              "School Division Offices"
+            ).addPermission({
+              key: "add",
+              name: "Add School Division Office",
+              description: "Allow user to add new school division office"
+            }).addPermission({
+              key: "view",
+              name: "View School Division Offices",
+              description: "Allow user to view school division offices"
+            }).addPermission({
+              key: "view.details",
+              name: "View School Division Office Details",
+              description: "Allow user to view school division office details"
+            }).addPermission({
+              key: "update.details",
+              name: "Update School Division Office Details",
+              description: "Allow user to update school division office details"
+            }).addPermission({
+              key: "delete",
+              name: "Delete School Division Office",
+              description: "Allow user to delete school division office"
+            });
+            modules2.push(basicEduDivisionModule);
+            const basicEduSchoolModule = useModule("deped-school", "Schools").addPermission({
+              key: "add",
+              name: "Add School",
+              description: "Allow user to add new school"
+            }).addPermission({
+              key: "view",
+              name: "View Schools",
+              description: "Allow user to view schools"
+            }).addPermission({
+              key: "view.details",
+              name: "View School Details",
+              description: "Allow user to view school details"
+            }).addPermission({
+              key: "update.details",
+              name: "Update School Details",
+              description: "Allow user to update school details"
+            }).addPermission({
+              key: "delete",
+              name: "Delete School",
+              description: "Allow user to delete school"
+            });
+            modules2.push(basicEduSchoolModule);
+            for (const module of modules2) {
+              const existingGroup = await _getByKey(module.key, app.code);
+              if (!existingGroup) {
+                await _add({
+                  app: app.code,
+                  key: module.key,
+                  label: module.label
+                });
+                logger17.log({
+                  level: "info",
+                  message: `Default permission group added: ${app.code} - ${module.key}`
+                });
               }
-            ];
+              for (const permission of module.permissions) {
+                const existingPermission = await getPermissionByKey(
+                  permission.key,
+                  module.key
+                );
+                if (!existingPermission) {
+                  await addPermission({
+                    app: app.code,
+                    group: module.key,
+                    key: permission.key,
+                    name: permission.name,
+                    description: permission.description
+                  });
+                }
+              }
+            }
+          }
+          if (app.code === "basic-edu-school") {
+            const modules2 = [];
+            const curriculumModule = useModule("curriculums", "Curriculums").addPermission({
+              key: "add",
+              name: "Add Curriculums",
+              description: "Allow user to add new curriculums"
+            }).addPermission({
+              key: "view",
+              name: "View Curriculums",
+              description: "Allow user to view curriculums"
+            }).addPermission({
+              key: "view.details",
+              name: "View Curriculum Details",
+              description: "Allow user to view curriculum details"
+            }).addPermission({
+              key: "edit",
+              name: "Edit Curriculums",
+              description: "Allow user to edit existing curriculums"
+            }).addPermission({
+              key: "update.details",
+              name: "Update Curriculum Details",
+              description: "Allow user to update curriculum details"
+            }).addPermission({
+              key: "delete",
+              name: "Delete Curriculums",
+              description: "Allow user to delete curriculums"
+            });
+            modules2.push(curriculumModule);
+            const gradeLevelModule = useModule("grade-levels", "Grade Levels").addPermission({
+              key: "add",
+              name: "Add Grade Levels",
+              description: "Allow user to add new grade levels"
+            }).addPermission({
+              key: "view",
+              name: "View Grade Levels",
+              description: "Allow user to view grade levels"
+            }).addPermission({
+              key: "view.details",
+              name: "View Grade Level Details",
+              description: "Allow user to view grade level details"
+            }).addPermission({
+              key: "edit",
+              name: "Edit Grade Levels",
+              description: "Allow user to edit existing grade levels"
+            }).addPermission({
+              key: "update.details",
+              name: "Update Grade Level Details",
+              description: "Allow user to update grade level details"
+            }).addPermission({
+              key: "delete",
+              name: "Delete Grade Levels",
+              description: "Allow user to delete grade levels"
+            });
+            modules2.push(gradeLevelModule);
+            const programModule = useModule("programs", "Programs").addPermission({
+              key: "add",
+              name: "Add Programs",
+              description: "Allow user to add new programs"
+            }).addPermission({
+              key: "view",
+              name: "View Programs",
+              description: "Allow user to view programs"
+            }).addPermission({
+              key: "view.details",
+              name: "View Program Details",
+              description: "Allow user to view program details"
+            }).addPermission({
+              key: "edit",
+              name: "Edit Programs",
+              description: "Allow user to edit existing programs"
+            }).addPermission({
+              key: "update.details",
+              name: "Update Program Details",
+              description: "Allow user to update program details"
+            }).addPermission({
+              key: "delete",
+              name: "Delete Programs",
+              description: "Allow user to delete programs"
+            });
+            modules2.push(programModule);
+            const kindergartenRoutineModule = useModule(
+              "kindergarten-routines",
+              "Kindergarten Routines"
+            ).addPermission({
+              key: "add",
+              name: "Add Kindergarten Routines",
+              description: "Allow user to add new kindergarten routines"
+            }).addPermission({
+              key: "view",
+              name: "View Kindergarten Routines",
+              description: "Allow user to view kindergarten routines"
+            }).addPermission({
+              key: "view.details",
+              name: "View Kindergarten Routine Details",
+              description: "Allow user to view kindergarten routine details"
+            }).addPermission({
+              key: "edit",
+              name: "Edit Kindergarten Routines",
+              description: "Allow user to edit existing kindergarten routines"
+            }).addPermission({
+              key: "update.details",
+              name: "Update Kindergarten Routine Details",
+              description: "Allow user to update kindergarten routine details"
+            }).addPermission({
+              key: "delete",
+              name: "Delete Kindergarten Routines",
+              description: "Allow user to delete kindergarten routines"
+            });
+            modules2.push(kindergartenRoutineModule);
+            const subjectModule = useModule("subjects", "Subjects").addPermission({
+              key: "add",
+              name: "Add Subjects",
+              description: "Allow user to add new subjects"
+            }).addPermission({
+              key: "view",
+              name: "View Subjects",
+              description: "Allow user to view subjects"
+            }).addPermission({
+              key: "view.details",
+              name: "View Subject Details",
+              description: "Allow user to view subject details"
+            }).addPermission({
+              key: "edit",
+              name: "Edit Subjects",
+              description: "Allow user to edit existing subjects"
+            }).addPermission({
+              key: "update.details",
+              name: "Update Subject Details",
+              description: "Allow user to update subject details"
+            }).addPermission({
+              key: "delete",
+              name: "Delete Subjects",
+              description: "Allow user to delete subjects"
+            });
+            modules2.push(subjectModule);
+            const teachingLoadModule = useModule(
+              "teaching-loads",
+              "Teaching Loads"
+            ).addPermission({
+              key: "add",
+              name: "Add Teaching Loads",
+              description: "Allow user to add new teaching loads"
+            }).addPermission({
+              key: "view",
+              name: "View Teaching Loads",
+              description: "Allow user to view teaching loads"
+            }).addPermission({
+              key: "view.details",
+              name: "View Teaching Load Details",
+              description: "Allow user to view teaching load details"
+            }).addPermission({
+              key: "edit",
+              name: "Edit Teaching Loads",
+              description: "Allow user to edit existing teaching loads"
+            }).addPermission({
+              key: "update.details",
+              name: "Update Teaching Load Details",
+              description: "Allow user to update teaching load details"
+            }).addPermission({
+              key: "delete",
+              name: "Delete Teaching Loads",
+              description: "Allow user to delete teaching loads"
+            });
+            modules2.push(teachingLoadModule);
+            const personnelModule = useModule("personnel", "Personnel").addPermission({
+              key: "add",
+              name: "Add Personnel",
+              description: "Allow user to add new personnel"
+            }).addPermission({
+              key: "view",
+              name: "View Personnel",
+              description: "Allow user to view personnel"
+            }).addPermission({
+              key: "view.details",
+              name: "View Personnel Details",
+              description: "Allow user to view personnel details"
+            }).addPermission({
+              key: "edit",
+              name: "Edit Personnel",
+              description: "Allow user to edit existing personnel"
+            }).addPermission({
+              key: "update.details",
+              name: "Update Personnel Details",
+              description: "Allow user to update personnel details"
+            }).addPermission({
+              key: "delete",
+              name: "Delete Personnel",
+              description: "Allow user to delete personnel"
+            });
+            modules2.push(personnelModule);
+            const studentModule = useModule("students", "Students").addPermission({
+              key: "view",
+              name: "View Students",
+              description: "Allow user to view students"
+            }).addPermission({
+              key: "view.details",
+              name: "View Student Details",
+              description: "Allow user to view student details"
+            }).addPermission({
+              key: "update.details",
+              name: "Update Student Details",
+              description: "Allow user to update student details"
+            }).addPermission({
+              key: "update.transfer",
+              name: "Update Student Transfer",
+              description: "Allow user to update student transfer details"
+            });
+            modules2.push(studentModule);
+            const sectionModule = useModule("sections", "Sections").addPermission({
+              key: "generate",
+              name: "Generate Sections",
+              description: "Allow user to generate sections"
+            }).addPermission({
+              key: "view",
+              name: "View Sections",
+              description: "Allow user to view sections"
+            }).addPermission({
+              key: "view.details",
+              name: "View Section Details",
+              description: "Allow user to view section details"
+            }).addPermission({
+              key: "update.details",
+              name: "Update Section Details",
+              description: "Allow user to update section details"
+            }).addPermission({
+              key: "delete",
+              name: "Delete Sections",
+              description: "Allow user to delete sections"
+            });
+            modules2.push(sectionModule);
+            const enrollmentModule = useModule("enrollments", "Enrollments").addPermission({
+              key: "add",
+              name: "Add Enrollments",
+              description: "Allow user to add new enrollments"
+            }).addPermission({
+              key: "view",
+              name: "View Enrollments",
+              description: "Allow user to view enrollments"
+            }).addPermission({
+              key: "view.details",
+              name: "View Enrollment Details",
+              description: "Allow user to view enrollment details"
+            }).addPermission({
+              key: "accept",
+              name: "Accept Enrollments",
+              description: "Allow user to accept enrollments"
+            }).addPermission({
+              key: "reject",
+              name: "Reject Enrollments",
+              description: "Allow user to reject enrollments"
+            });
+            modules2.push(enrollmentModule);
+            const programScreeningModule = useModule(
+              "program-screening",
+              "Program Screening"
+            ).addPermission({
+              key: "view",
+              name: "View Program Screenings",
+              description: "Allow user to view program screenings"
+            }).addPermission({
+              key: "approve",
+              name: "Approve Program Screening",
+              description: "Allow user to approve program screening"
+            }).addPermission({
+              key: "reject",
+              name: "Reject Program Screening",
+              description: "Allow user to reject program screening"
+            });
+            modules2.push(programScreeningModule);
             for (const module of modules2) {
               const existingGroup = await _getByKey(module.key, app.code);
               if (!existingGroup) {
@@ -5414,15 +5655,15 @@ function usePermissionGroupService() {
     }
     const associatedPermissionsCount = await countByGroup(permission.key);
     if (associatedPermissionsCount > 0) {
-      throw new BadRequestError24(
+      throw new BadRequestError25(
         "Cannot delete Permission Group with associated Permissions."
       );
     }
     try {
       await _deleteById(id);
-      return "Permission deleted successfully.";
+      return "Permission Group deleted successfully.";
     } catch (error) {
-      if (error instanceof AppError9) {
+      if (error instanceof AppError10) {
         throw error;
       } else {
         throw new InternalServerError16("Failed to delete Permission Group.");
@@ -5436,8 +5677,8 @@ function usePermissionGroupService() {
 }
 
 // src/resources/permission/permission.group.controller.ts
-import { BadRequestError as BadRequestError25, logger as logger18 } from "@eeplatform/nodejs-utils";
-import Joi14 from "joi";
+import { BadRequestError as BadRequestError26, logger as logger18 } from "@eeplatform/nodejs-utils";
+import Joi15 from "joi";
 function usePermissionGroupController() {
   const {
     getAll: _getAll,
@@ -5450,7 +5691,7 @@ function usePermissionGroupController() {
     const value = req.body;
     const { error } = schemaPermissionGroup.validate(value);
     if (error) {
-      next(new BadRequestError25(error.message));
+      next(new BadRequestError26(error.message));
       logger18.info(`Controller: ${error.message}`);
       return;
     }
@@ -5464,16 +5705,16 @@ function usePermissionGroupController() {
   }
   async function getAll(req, res, next) {
     const query = req.query;
-    const validation = Joi14.object({
-      page: Joi14.number().min(1).optional().allow("", null),
-      limit: Joi14.number().min(1).optional().allow("", null),
-      search: Joi14.string().optional().allow("", null),
-      app: Joi14.string().optional().allow("", null),
-      status: Joi14.string().optional().allow("", null)
+    const validation = Joi15.object({
+      page: Joi15.number().min(1).optional().allow("", null),
+      limit: Joi15.number().min(1).optional().allow("", null),
+      search: Joi15.string().optional().allow("", null),
+      app: Joi15.string().optional().allow("", null),
+      status: Joi15.string().optional().allow("", null)
     });
     const { error } = validation.validate(query);
     if (error) {
-      next(new BadRequestError25(error.message));
+      next(new BadRequestError26(error.message));
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
@@ -5507,12 +5748,12 @@ function usePermissionGroupController() {
   }
   async function getById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi14.object({
-      id: Joi14.string().hex().required()
+    const validation = Joi15.object({
+      id: Joi15.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError25(error.message));
+      next(new BadRequestError26(error.message));
       return;
     }
     try {
@@ -5528,12 +5769,12 @@ function usePermissionGroupController() {
   }
   async function deleteById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi14.object({
-      id: Joi14.string().hex().required()
+    const validation = Joi15.object({
+      id: Joi15.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError25(error.message));
+      next(new BadRequestError26(error.message));
       return;
     }
     try {
@@ -5546,15 +5787,15 @@ function usePermissionGroupController() {
   }
   async function updateById(req, res, next) {
     const id = req.params.id;
-    const { error: errorId } = Joi14.string().hex().required().validate(id);
+    const { error: errorId } = Joi15.string().hex().required().validate(id);
     if (errorId) {
-      next(new BadRequestError25(errorId.message));
+      next(new BadRequestError26(errorId.message));
       return;
     }
     const payload = req.body;
     const { error } = schemaPermissionGroupUpdate.validate(payload);
     if (error) {
-      next(new BadRequestError25(error.message));
+      next(new BadRequestError26(error.message));
       return;
     }
     try {
@@ -5575,7 +5816,7 @@ function usePermissionGroupController() {
 }
 
 // src/resources/file/file.service.ts
-import { logger as logger19, useS3 as useS32, useAtlas as useAtlas13 } from "@eeplatform/nodejs-utils";
+import { logger as logger19, useS3 as useS32, useAtlas as useAtlas12 } from "@eeplatform/nodejs-utils";
 import cron from "node-cron";
 import * as fs from "fs";
 function useFileService() {
@@ -5593,7 +5834,7 @@ function useFileService() {
     forcePathStyle: true
   });
   async function createFile(value) {
-    const session = useAtlas13.getClient()?.startSession();
+    const session = useAtlas12.getClient()?.startSession();
     session?.startTransaction();
     const file = {
       name: value.originalname,
@@ -5627,7 +5868,7 @@ function useFileService() {
     }
   }
   async function deleteFile(id) {
-    const session = useAtlas13.getClient()?.startSession();
+    const session = useAtlas12.getClient()?.startSession();
     session?.startTransaction();
     try {
       await deleteFileById(id, session);
@@ -5671,11 +5912,11 @@ function useFileService() {
 
 // src/resources/file/file.controller.ts
 import {
-  AppError as AppError10,
-  BadRequestError as BadRequestError26,
+  AppError as AppError11,
+  BadRequestError as BadRequestError27,
   InternalServerError as InternalServerError17
 } from "@eeplatform/nodejs-utils";
-import Joi15 from "joi";
+import Joi16 from "joi";
 function useFileController() {
   const { createFile, deleteFile: _deleteFile } = useFileService();
   async function upload(req, res, next) {
@@ -5688,7 +5929,7 @@ function useFileController() {
       res.json({ message: "Successfully uploaded file", id });
       return;
     } catch (error) {
-      if (error instanceof AppError10) {
+      if (error instanceof AppError11) {
         next(error);
       } else {
         next(new InternalServerError17(error));
@@ -5697,17 +5938,17 @@ function useFileController() {
   }
   async function deleteFile(req, res, next) {
     const id = req.params.id;
-    const validation = Joi15.string().required();
+    const validation = Joi16.string().required();
     const { error } = validation.validate(id);
     if (error) {
-      next(new BadRequestError26(error.message));
+      next(new BadRequestError27(error.message));
     }
     try {
       const message = await _deleteFile(id);
       res.json({ message });
       return;
     } catch (error2) {
-      if (error2 instanceof AppError10) {
+      if (error2 instanceof AppError11) {
         next(error2);
       } else {
         next(new InternalServerError17(error2));
@@ -5720,21 +5961,16 @@ function useFileController() {
   };
 }
 
-// src/resources/role/role.controller.ts
-import Joi18 from "joi";
-import { BadRequestError as BadRequestError29 } from "@eeplatform/nodejs-utils";
-
 // src/resources/role/role.service.ts
 import {
-  AppError as AppError11,
-  BadRequestError as BadRequestError28,
+  AppError as AppError12,
+  BadRequestError as BadRequestError29,
   InternalServerError as InternalServerError18
 } from "@eeplatform/nodejs-utils";
-import Joi17 from "joi";
 
 // src/resources/member/member.controller.ts
-import Joi16 from "joi";
-import { BadRequestError as BadRequestError27 } from "@eeplatform/nodejs-utils";
+import Joi17 from "joi";
+import { BadRequestError as BadRequestError28 } from "@eeplatform/nodejs-utils";
 function useMemberController() {
   const {
     getByUserId: _getByUserId,
@@ -5745,12 +5981,12 @@ function useMemberController() {
   } = useMemberRepo();
   async function getByUserId(req, res, next) {
     const userId = req.params.id;
-    const validation = Joi16.object({
-      id: Joi16.string().hex().required()
+    const validation = Joi17.object({
+      id: Joi17.string().hex().required()
     });
     const { error } = validation.validate({ id: userId });
     if (error) {
-      next(new BadRequestError27(error.message));
+      next(new BadRequestError28(error.message));
       return;
     }
     try {
@@ -5765,14 +6001,14 @@ function useMemberController() {
     }
   }
   async function getByUserType(req, res, next) {
-    const validation = Joi16.object({
-      org: Joi16.string().hex().optional().allow("", null),
-      user: Joi16.string().hex().required(),
-      type: Joi16.string().required()
+    const validation = Joi17.object({
+      org: Joi17.string().hex().optional().allow("", null),
+      user: Joi17.string().hex().required(),
+      type: Joi17.string().required()
     });
     const { error } = validation.validate({ ...req.params, ...req.query });
     if (error) {
-      next(new BadRequestError27(error.message));
+      next(new BadRequestError28(error.message));
       return;
     }
     const orgId = req.query.org;
@@ -5797,14 +6033,14 @@ function useMemberController() {
     const org = req.query.org ?? "";
     const type = req.query.type ?? "main";
     const status = req.query.status ?? "active";
-    const validation = Joi16.object({
-      limit: Joi16.number().min(10).max(300).required(),
-      search: Joi16.string().optional().allow("", null),
-      page: Joi16.number().required(),
-      user: Joi16.string().hex().optional().allow("", null),
-      org: Joi16.string().hex().optional().allow("", null),
-      type: Joi16.string().required(),
-      status: Joi16.string().required()
+    const validation = Joi17.object({
+      limit: Joi17.number().min(10).max(300).required(),
+      search: Joi17.string().optional().allow("", null),
+      page: Joi17.number().required(),
+      user: Joi17.string().hex().optional().allow("", null),
+      org: Joi17.string().hex().optional().allow("", null),
+      type: Joi17.string().required(),
+      status: Joi17.string().required()
     });
     const { error } = validation.validate({
       search,
@@ -5816,7 +6052,7 @@ function useMemberController() {
       status
     });
     if (error) {
-      next(new BadRequestError27(error.message));
+      next(new BadRequestError28(error.message));
       return;
     }
     try {
@@ -5840,11 +6076,11 @@ function useMemberController() {
     const search = req.query.search ?? "";
     const page = Number(req.query.page) ?? 1;
     const user = req.query.user ?? "";
-    const validation = Joi16.object({
-      limit: Joi16.number().min(10).max(50).required(),
-      search: Joi16.string().optional().allow("", null),
-      page: Joi16.number().required(),
-      user: Joi16.string().hex().optional().allow("", null)
+    const validation = Joi17.object({
+      limit: Joi17.number().min(10).max(50).required(),
+      search: Joi17.string().optional().allow("", null),
+      page: Joi17.number().required(),
+      user: Joi17.string().hex().optional().allow("", null)
     });
     const { error } = validation.validate({
       search,
@@ -5853,7 +6089,7 @@ function useMemberController() {
       limit
     });
     if (error) {
-      next(new BadRequestError27(error.message));
+      next(new BadRequestError28(error.message));
     }
     try {
       const items = await _getOrgsByMembership({
@@ -5869,13 +6105,13 @@ function useMemberController() {
     }
   }
   async function updateStatusByUserId(req, res, next) {
-    const validation = Joi16.object({
-      id: Joi16.string().hex().required(),
-      status: Joi16.string().valid("active", "suspended", "deleted").required()
+    const validation = Joi17.object({
+      id: Joi17.string().hex().required(),
+      status: Joi17.string().valid("active", "suspended", "deleted").required()
     });
     const { error } = validation.validate(req.params);
     if (error) {
-      next(new BadRequestError27(error.message));
+      next(new BadRequestError28(error.message));
       return;
     }
     const id = req.params.id;
@@ -5898,29 +6134,21 @@ function useMemberController() {
 
 // src/resources/role/role.service.ts
 function useRoleService() {
-  const { getByOrg } = useMemberRepo();
-  const { deleteRole, getRoleById } = useRoleRepo();
-  async function deleteById(_id) {
-    const { error } = Joi17.string().hex().length(24).validate(_id);
-    if (error) {
-      throw new BadRequestError28("Invalid Role ID");
-    }
+  const { getByRole } = useMemberRepo();
+  const { deleteById: _deleteById } = useRoleRepo();
+  async function deleteById(id) {
     try {
-      const role = await getRoleById(_id);
-      if (!role) {
-        throw new BadRequestError28("Role not found");
+      const role = await getByRole(id);
+      if (role) {
+        throw new BadRequestError29("Cannot delete role assigned to members.");
       }
-      const org = await getByOrg(String(role.id));
-      if (org) {
-        throw new BadRequestError28("Cannot delete role assigned to members");
-      }
-      await deleteRole(_id);
-      return "Role deleted successfully";
-    } catch (error2) {
-      if (error2 instanceof AppError11) {
-        throw error2;
+      await _deleteById(id);
+    } catch (error) {
+      if (error instanceof AppError12) {
+        throw error;
+      } else {
+        throw new InternalServerError18("Failed to delete role.");
       }
-      throw new InternalServerError18("Failed to delete role");
     }
   }
   return {
@@ -5929,26 +6157,23 @@ function useRoleService() {
 }
 
 // src/resources/role/role.controller.ts
+import Joi18 from "joi";
+import { BadRequestError as BadRequestError30 } from "@eeplatform/nodejs-utils";
 function useRoleController() {
   const {
     addRole: _createRole,
-    getRoleById: _getRoleById,
+    getById,
     getRoleByUserId: _getRoleByUserId,
     getRoles: _getRoles,
     updateRole: _updateRole,
     updatePermissionsById: _updatePermissionsById
   } = useRoleRepo();
+  const { deleteById: _deleteById } = useRoleService();
   async function createRole(req, res, next) {
     const payload = req.body;
-    const validation = Joi18.object({
-      name: Joi18.string().required(),
-      permissions: Joi18.array().items(Joi18.string()).required(),
-      type: Joi18.string().valid("school", "division", "region", "account").required(),
-      id: Joi18.string().hex().optional().allow("", null)
-    });
-    const { error } = validation.validate(payload);
+    const { error } = schemaRole.validate(payload);
     if (error) {
-      next(new BadRequestError29(error.message));
+      next(new BadRequestError30(error.message));
       return;
     }
     try {
@@ -5963,22 +6188,22 @@ function useRoleController() {
     const search = req.query.search ?? "";
     const page = parseInt(req.query.page ?? "1");
     const limit = parseInt(req.query.limit ?? "10");
-    const type = req.query.type ?? "";
-    const id = req.query.id ?? "";
+    const app = req.query.app ?? "";
+    const org = req.query.org ?? "";
     const validation = Joi18.object({
       search: Joi18.string().optional().allow("", null),
       page: Joi18.number().required(),
       limit: Joi18.number().required(),
-      type: Joi18.string().optional().allow("", null),
-      id: Joi18.string().hex().optional().allow("", null)
+      app: Joi18.string().optional().allow("", null),
+      org: Joi18.string().hex().optional().allow("", null)
     });
-    const { error } = validation.validate({ search, page, limit, type, id });
+    const { error } = validation.validate({ search, page, limit, app, org });
     if (error) {
-      next(new BadRequestError29(error.message));
+      next(new BadRequestError30(error.message));
       return;
     }
     try {
-      const data = await _getRoles({ search, page, limit, type, id });
+      const data = await _getRoles({ search, page, limit, app, org });
       res.json(data);
       return;
     } catch (error2) {
@@ -5992,7 +6217,7 @@ function useRoleController() {
     });
     const { error } = validation.validate({ userId });
     if (error) {
-      next(new BadRequestError29(error.message));
+      next(new BadRequestError30(error.message));
       return;
     }
     try {
@@ -6010,11 +6235,11 @@ function useRoleController() {
     });
     const { error } = validation.validate({ _id });
     if (error) {
-      next(new BadRequestError29(error.message));
+      next(new BadRequestError30(error.message));
       return;
     }
     try {
-      const data = await _getRoleById(_id);
+      const data = await getById(_id);
       res.json(data);
       return;
     } catch (error2) {
@@ -6032,7 +6257,7 @@ function useRoleController() {
     });
     const { error } = validation.validate({ _id, name, permissions });
     if (error) {
-      next(new BadRequestError29(error.message));
+      next(new BadRequestError30(error.message));
       return;
     }
     try {
@@ -6052,7 +6277,7 @@ function useRoleController() {
     });
     const { error } = validation.validate({ _id, permissions });
     if (error) {
-      next(new BadRequestError29(error.message));
+      next(new BadRequestError30(error.message));
       return;
     }
     try {
@@ -6063,7 +6288,6 @@ function useRoleController() {
       next(error2);
     }
   }
-  const { deleteById } = useRoleService();
   async function deleteRole(req, res, next) {
     const _id = req.params.id;
     const validation = Joi18.object({
@@ -6071,11 +6295,11 @@ function useRoleController() {
     });
     const { error } = validation.validate({ _id });
     if (error) {
-      next(new BadRequestError29(error.message));
+      next(new BadRequestError30(error.message));
       return;
     }
     try {
-      const message = await deleteById(_id);
+      const message = await _deleteById(_id);
       res.json({ message });
       return;
     } catch (error2) {
@@ -6095,8 +6319,8 @@ function useRoleController() {
 
 // src/resources/verification/verification.controller.ts
 import {
-  AppError as AppError12,
-  BadRequestError as BadRequestError30,
+  AppError as AppError13,
+  BadRequestError as BadRequestError31,
   InternalServerError as InternalServerError20
 } from "@eeplatform/nodejs-utils";
 import Joi19 from "joi";
@@ -6119,7 +6343,7 @@ function useVerificationController() {
     });
     const { error } = validation.validate(req.body);
     if (error) {
-      next(new BadRequestError30(error.message));
+      next(new BadRequestError31(error.message));
       return;
     }
     const email = req.body.email ?? "";
@@ -6150,7 +6374,7 @@ function useVerificationController() {
     const validation = Joi19.string().email().required();
     const { error } = validation.validate(email);
     if (error) {
-      next(new BadRequestError30(error.message));
+      next(new BadRequestError31(error.message));
       return;
     }
     try {
@@ -6160,7 +6384,7 @@ function useVerificationController() {
       });
       return;
     } catch (error2) {
-      if (error2 instanceof AppError12) {
+      if (error2 instanceof AppError13) {
         next(error2);
       } else {
         next(new InternalServerError20("An unexpected error occurred"));
@@ -6178,7 +6402,7 @@ function useVerificationController() {
     });
     const { error } = validation.validate(req.query);
     if (error) {
-      next(new BadRequestError30(error.message));
+      next(new BadRequestError31(error.message));
       return;
     }
     const status = req.query.status ?? "";
@@ -6212,7 +6436,7 @@ function useVerificationController() {
     const validation = Joi19.string().hex().required();
     const { error } = validation.validate(id);
     if (error) {
-      next(new BadRequestError30(error.message));
+      next(new BadRequestError31(error.message));
       return;
     }
     try {
@@ -6228,7 +6452,7 @@ function useVerificationController() {
     const validation = Joi19.string().hex().required();
     const { error } = validation.validate(otpId);
     if (error) {
-      next(new BadRequestError30(error.message));
+      next(new BadRequestError31(error.message));
       return;
     }
     try {
@@ -6250,7 +6474,7 @@ function useVerificationController() {
 }
 
 // src/resources/address/address.model.ts
-import { BadRequestError as BadRequestError31 } from "@eeplatform/nodejs-utils";
+import { BadRequestError as BadRequestError32 } from "@eeplatform/nodejs-utils";
 import Joi20 from "joi";
 import { ObjectId as ObjectId17 } from "mongodb";
 var addressSchema = Joi20.object({
@@ -6270,14 +6494,14 @@ function MAddress(value) {
     try {
       value.user = new ObjectId17(value.user);
     } catch (error) {
-      throw new BadRequestError31("Invalid user ID.");
+      throw new BadRequestError32("Invalid user ID.");
     }
   }
   if (value.org) {
     try {
       value.org = new ObjectId17(value.org);
     } catch (error) {
-      throw new BadRequestError31("Invalid org ID.");
+      throw new BadRequestError32("Invalid org ID.");
     }
   }
   return {
@@ -6296,21 +6520,21 @@ function MAddress(value) {
 
 // src/resources/address/address.repository.ts
 import {
-  BadRequestError as BadRequestError32,
-  useAtlas as useAtlas14,
-  useCache as useCache10,
+  BadRequestError as BadRequestError33,
+  useAtlas as useAtlas13,
+  useCache as useCache9,
   makeCacheKey as makeCacheKey12,
   logger as logger20
 } from "@eeplatform/nodejs-utils";
 import { ObjectId as ObjectId18 } from "mongodb";
 function useAddressRepo() {
-  const db = useAtlas14.getDb();
+  const db = useAtlas13.getDb();
   if (!db) {
-    throw new BadRequestError32("Unable to connect to server.");
+    throw new BadRequestError33("Unable to connect to server.");
   }
   const namespace_collection = "addresses";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = useCache10(namespace_collection);
+  const { getCache, setCache, delNamespace } = useCache9(namespace_collection);
   function delCachedData() {
     delNamespace().then(() => {
       logger20.log({
@@ -6332,7 +6556,7 @@ function useAddressRepo() {
         { key: { orgId: 1 } }
       ]);
     } catch (error) {
-      throw new BadRequestError32("Failed to create index on address.");
+      throw new BadRequestError33("Failed to create index on address.");
     }
   }
   async function add(value, session) {
@@ -6342,20 +6566,20 @@ function useAddressRepo() {
       delCachedData();
       return res.insertedId;
     } catch (error) {
-      throw new BadRequestError32("Failed to create address.");
+      throw new BadRequestError33("Failed to create address.");
     }
   }
   async function updateById(_id, value, session) {
     try {
       _id = new ObjectId18(_id);
     } catch (error) {
-      throw new BadRequestError32("Invalid address ID.");
+      throw new BadRequestError33("Invalid address ID.");
     }
     if (value.org) {
       try {
         value.org = new ObjectId18(value.org);
       } catch (error) {
-        throw new BadRequestError32("Invalid org ID.");
+        throw new BadRequestError33("Invalid org ID.");
       }
     }
     try {
@@ -6367,14 +6591,14 @@ function useAddressRepo() {
       delCachedData();
       return "Successfully updated address.";
     } catch (error) {
-      throw new BadRequestError32("Failed to update address.");
+      throw new BadRequestError33("Failed to update address.");
     }
   }
   async function getByUserId(user) {
     try {
       user = new ObjectId18(user);
     } catch (error) {
-      throw new BadRequestError32("Invalid user ID.");
+      throw new BadRequestError33("Invalid user ID.");
     }
     const cacheKey = makeCacheKey12(namespace_collection, { user: String(user) });
     try {
@@ -6402,14 +6626,14 @@ function useAddressRepo() {
       }
       return data;
     } catch (error) {
-      throw new BadRequestError32("Failed to get address by ID.");
+      throw new BadRequestError33("Failed to get address by ID.");
     }
   }
   async function getByOrgId(org) {
     try {
       org = new ObjectId18(org);
     } catch (error) {
-      throw new BadRequestError32("Invalid orgId.");
+      throw new BadRequestError33("Invalid orgId.");
     }
     const cacheKey = makeCacheKey12(namespace_collection, { org: String(org) });
     try {
@@ -6437,7 +6661,7 @@ function useAddressRepo() {
       }
       return data;
     } catch (error) {
-      throw new BadRequestError32("Failed to get address by orgId.");
+      throw new BadRequestError33("Failed to get address by orgId.");
     }
   }
   return {
@@ -6450,7 +6674,7 @@ function useAddressRepo() {
 }
 
 // src/resources/address/address.controller.ts
-import { BadRequestError as BadRequestError33, NotFoundError as NotFoundError4 } from "@eeplatform/nodejs-utils";
+import { BadRequestError as BadRequestError34, NotFoundError as NotFoundError4 } from "@eeplatform/nodejs-utils";
 import Joi21 from "joi";
 function useAddressController() {
   const {
@@ -6475,7 +6699,7 @@ function useAddressController() {
     });
     const { error } = validation.validate(value);
     if (error) {
-      next(new BadRequestError33(error.message));
+      next(new BadRequestError34(error.message));
     }
     try {
       const value2 = req.body;
@@ -6502,7 +6726,7 @@ function useAddressController() {
     });
     const { error } = validation.validate({ id, ...value });
     if (error) {
-      next(new BadRequestError33(error.message));
+      next(new BadRequestError34(error.message));
       return;
     }
     try {
@@ -6518,7 +6742,7 @@ function useAddressController() {
     const validation = Joi21.string().hex().required();
     const { error } = validation.validate(user);
     if (error) {
-      next(new BadRequestError33(error.message));
+      next(new BadRequestError34(error.message));
     }
     try {
       const address = await _getByUserId(user);
@@ -6537,7 +6761,7 @@ function useAddressController() {
     const validation = Joi21.string().hex().required();
     const { error } = validation.validate(id);
     if (error) {
-      next(new BadRequestError33(error.message));
+      next(new BadRequestError34(error.message));
     }
     try {
       const address = await _getByOrgId(id);
@@ -6570,7 +6794,7 @@ var MToken = class {
 };
 
 // src/resources/counter/counter.model.ts
-import { BadRequestError as BadRequestError34 } from "@eeplatform/nodejs-utils";
+import { BadRequestError as BadRequestError35 } from "@eeplatform/nodejs-utils";
 import { ObjectId as ObjectId20 } from "mongodb";
 import { z } from "zod";
 var TCounter = z.object({
@@ -6590,7 +6814,7 @@ function useCounterModel(db) {
     try {
       return TCounter.parse(value);
     } catch (error) {
-      throw new BadRequestError34(error.issues[0].message);
+      throw new BadRequestError35(error.issues[0].message);
     }
   }
   function validateCounter(data) {
@@ -6605,19 +6829,19 @@ function useCounterModel(db) {
 
 // src/resources/counter/counter.repository.ts
 import {
-  useAtlas as useAtlas15,
-  useCache as useCache11,
+  useAtlas as useAtlas14,
+  useCache as useCache10,
   makeCacheKey as makeCacheKey13,
   logger as logger21
 } from "@eeplatform/nodejs-utils";
 function useCounterRepo() {
-  const db = useAtlas15.getDb();
+  const db = useAtlas14.getDb();
   if (!db) {
     throw new Error("Unable to connect to server.");
   }
   const namespace_collection = "counters";
   const { collection, createCounter } = useCounterModel(db);
-  const { getCache, setCache, delNamespace } = useCache11(namespace_collection);
+  const { getCache, setCache, delNamespace } = useCache10(namespace_collection);
   function delCachedData() {
     delNamespace().then(() => {
       logger21.log({
@@ -7033,7 +7257,7 @@ IMPORTANT: Only consider it a match if the target phoneme is the FIRST sound pro
 }
 
 // src/resources/utils/github.service.ts
-import { AppError as AppError13, BadRequestError as BadRequestError35 } from "@eeplatform/nodejs-utils";
+import { AppError as AppError14, BadRequestError as BadRequestError36 } from "@eeplatform/nodejs-utils";
 import { Octokit } from "@octokit/rest";
 import _sodium from "libsodium-wrappers";
 function useGitHubService() {
@@ -7047,23 +7271,23 @@ function useGitHubService() {
     try {
       const { data: repoData } = await octokit.repos.get({ owner, repo });
       if (!repoData.permissions?.admin) {
-        throw new BadRequestError35(
+        throw new BadRequestError36(
           "You do not have admin access to this repository."
         );
       }
     } catch (error) {
       if (error.status === 404) {
-        throw new BadRequestError35(
+        throw new BadRequestError36(
           "Repository not found or you don't have access to it."
         );
       } else if (error.status === 401) {
-        throw new BadRequestError35(
+        throw new BadRequestError36(
           "Invalid GitHub token or insufficient permissions."
         );
       } else if (error.message.includes("admin access")) {
         throw error;
       } else {
-        throw new BadRequestError35(
+        throw new BadRequestError36(
           `Failed to check repository permissions: ${error.message}`
         );
       }
@@ -7112,7 +7336,7 @@ function useGitHubService() {
               key_id: publicKeyRes.key_id
             });
           } catch (encryptionError) {
-            throw new BadRequestError35(
+            throw new BadRequestError36(
               `Failed to encrypt secret '${key}': ${encryptionError.message}`
             );
           }
@@ -7128,22 +7352,22 @@ function useGitHubService() {
       }
       return `Successfully set ${lines.length} ${type} variables/secrets in environment '${environment}'`;
     } catch (error) {
-      if (error instanceof AppError13)
+      if (error instanceof AppError14)
         throw error;
       if (error.status === 422) {
-        throw new BadRequestError35(
+        throw new BadRequestError36(
           `GitHub API validation error: ${error.message}`
         );
       } else if (error.status === 404) {
-        throw new BadRequestError35("Environment or repository not found.");
+        throw new BadRequestError36("Environment or repository not found.");
       } else if (error.status === 403) {
-        throw new BadRequestError35(
+        throw new BadRequestError36(
           "Forbidden: Insufficient permissions or rate limit exceeded."
         );
       } else if (error.message.includes("admin access") || error.message.includes("permissions")) {
         throw error;
       } else {
-        throw new BadRequestError35(
+        throw new BadRequestError36(
           `Failed to set GitHub variables: ${error.message}`
         );
       }
@@ -7155,7 +7379,7 @@ function useGitHubService() {
 }
 
 // src/resources/utils/transcribe.service.ts
-import { AppError as AppError14, BadRequestError as BadRequestError36, useRedis } from "@eeplatform/nodejs-utils";
+import { AppError as AppError15, BadRequestError as BadRequestError37, useRedis } from "@eeplatform/nodejs-utils";
 function useTranscribeService() {
   const { createFile } = useFileService();
   const { getClient } = useRedis();
@@ -7164,10 +7388,10 @@ function useTranscribeService() {
     try {
       const fileId = await createFile(file);
     } catch (error) {
-      if (error instanceof AppError14) {
+      if (error instanceof AppError15) {
         throw error;
       } else {
-        throw new BadRequestError36("Failed to transcribe audio file");
+        throw new BadRequestError37("Failed to transcribe audio file");
       }
     }
   }
@@ -7178,8 +7402,8 @@ function useTranscribeService() {
 
 // src/resources/utils/audio-transcription.controller.ts
 import {
-  AppError as AppError15,
-  BadRequestError as BadRequestError37,
+  AppError as AppError16,
+  BadRequestError as BadRequestError38,
   InternalServerError as InternalServerError21
 } from "@eeplatform/nodejs-utils";
 import Joi22 from "joi";
@@ -7202,7 +7426,7 @@ function useAudioTranscriptionController() {
   });
   async function transcribeFromFile(req, res, next) {
     if (!req.file) {
-      next(new BadRequestError37("Audio file is required"));
+      next(new BadRequestError38("Audio file is required"));
       return;
     }
     try {
@@ -7210,14 +7434,14 @@ function useAudioTranscriptionController() {
         req.body
       );
       if (error) {
-        next(new BadRequestError37(error.message));
+        next(new BadRequestError38(error.message));
         return;
       }
       const { buffer, mimetype, originalname, size } = req.file;
       if (!geminiService.validateAudioFormat(mimetype)) {
         const supportedFormats = geminiService.getSupportedAudioFormats();
         next(
-          new BadRequestError37(
+          new BadRequestError38(
             `Unsupported audio format: ${mimetype}. Supported formats: ${supportedFormats.join(
               ", "
             )}`
@@ -7228,7 +7452,7 @@ function useAudioTranscriptionController() {
       const maxSizeBytes = 25 * 1024 * 1024;
       if (size > maxSizeBytes) {
         next(
-          new BadRequestError37(
+          new BadRequestError38(
             `File size too large. Maximum allowed size is ${maxSizeBytes / (1024 * 1024)}MB`
           )
         );
@@ -7258,7 +7482,7 @@ function useAudioTranscriptionController() {
         }
       });
     } catch (error) {
-      if (error instanceof AppError15) {
+      if (error instanceof AppError16) {
         next(error);
       } else {
         next(
@@ -7278,14 +7502,14 @@ function useAudioTranscriptionController() {
       });
       const { error, value } = bodySchema.validate(req.body);
       if (error) {
-        next(new BadRequestError37(error.message));
+        next(new BadRequestError38(error.message));
         return;
       }
       const { audioData, mimeType, options = {} } = value;
       if (!geminiService.validateAudioFormat(mimeType)) {
         const supportedFormats = geminiService.getSupportedAudioFormats();
         next(
-          new BadRequestError37(
+          new BadRequestError38(
             `Unsupported audio format: ${mimeType}. Supported formats: ${supportedFormats.join(
               ", "
             )}`
@@ -7297,13 +7521,13 @@ function useAudioTranscriptionController() {
       try {
         audioBuffer = Buffer.from(audioData, "base64");
       } catch (conversionError) {
-        next(new BadRequestError37("Invalid base64 audio data"));
+        next(new BadRequestError38("Invalid base64 audio data"));
         return;
       }
       const maxSizeBytes = 25 * 1024 * 1024;
       if (audioBuffer.length > maxSizeBytes) {
         next(
-          new BadRequestError37(
+          new BadRequestError38(
             `Audio data too large. Maximum allowed size is ${maxSizeBytes / (1024 * 1024)}MB`
           )
         );
@@ -7332,7 +7556,7 @@ function useAudioTranscriptionController() {
         }
       });
     } catch (error) {
-      if (error instanceof AppError15) {
+      if (error instanceof AppError16) {
         next(error);
       } else {
         next(
@@ -7369,7 +7593,7 @@ function useAudioTranscriptionController() {
       });
       const { error, value } = schema.validate(req.body);
       if (error) {
-        next(new BadRequestError37(error.message));
+        next(new BadRequestError38(error.message));
         return;
       }
       const { mimeType } = value;
@@ -7391,13 +7615,13 @@ function useAudioTranscriptionController() {
   }
   async function checkPhonemeFromFile(req, res, next) {
     if (!req.file) {
-      next(new BadRequestError37("Audio file is required"));
+      next(new BadRequestError38("Audio file is required"));
       return;
     }
     try {
       const { error, value } = phonemeMatchSchema.validate(req.body);
       if (error) {
-        next(new BadRequestError37(error.message));
+        next(new BadRequestError38(error.message));
         return;
       }
       const { targetPhoneme, options = {} } = value;
@@ -7405,7 +7629,7 @@ function useAudioTranscriptionController() {
       if (!geminiService.validateAudioFormat(mimetype)) {
         const supportedFormats = geminiService.getSupportedAudioFormats();
         next(
-          new BadRequestError37(
+          new BadRequestError38(
             `Unsupported audio format: ${mimetype}. Supported formats: ${supportedFormats.join(
               ", "
             )}`
@@ -7416,7 +7640,7 @@ function useAudioTranscriptionController() {
       const maxSizeBytes = 25 * 1024 * 1024;
       if (size > maxSizeBytes) {
         next(
-          new BadRequestError37(
+          new BadRequestError38(
             `File size too large. Maximum allowed size is ${maxSizeBytes / (1024 * 1024)}MB`
           )
         );
@@ -7431,7 +7655,7 @@ function useAudioTranscriptionController() {
       );
       const processingTime = Date.now() - startTime;
       if (!result.isMatch) {
-        throw new BadRequestError37(
+        throw new BadRequestError38(
           `Phoneme "${targetPhoneme}" not found in the provided audio. Transcription: "${result.transcription}"`
         );
       }
@@ -7459,7 +7683,7 @@ function useAudioTranscriptionController() {
         }
       });
     } catch (error) {
-      if (error instanceof AppError15) {
+      if (error instanceof AppError16) {
         next(error);
       } else {
         next(
@@ -7478,14 +7702,14 @@ function useAudioTranscriptionController() {
       });
       const { error, value } = bodySchema.validate(req.body);
       if (error) {
-        next(new BadRequestError37(error.message));
+        next(new BadRequestError38(error.message));
         return;
       }
       const { audioData, mimeType, targetPhoneme, options = {} } = value;
       if (!geminiService.validateAudioFormat(mimeType)) {
         const supportedFormats = geminiService.getSupportedAudioFormats();
         next(
-          new BadRequestError37(
+          new BadRequestError38(
             `Unsupported audio format: ${mimeType}. Supported formats: ${supportedFormats.join(
               ", "
             )}`
@@ -7497,13 +7721,13 @@ function useAudioTranscriptionController() {
       try {
         audioBuffer = Buffer.from(audioData, "base64");
       } catch (conversionError) {
-        next(new BadRequestError37("Invalid base64 audio data"));
+        next(new BadRequestError38("Invalid base64 audio data"));
         return;
       }
       const maxSizeBytes = 25 * 1024 * 1024;
       if (audioBuffer.length > maxSizeBytes) {
         next(
-          new BadRequestError37(
+          new BadRequestError38(
             `Audio data too large. Maximum allowed size is ${maxSizeBytes / (1024 * 1024)}MB`
           )
         );
@@ -7518,7 +7742,7 @@ function useAudioTranscriptionController() {
       );
       const processingTime = Date.now() - startTime;
       if (!result.isMatch) {
-        throw new BadRequestError37(
+        throw new BadRequestError38(
           `Phoneme "${targetPhoneme}" not found in the provided audio. Transcription: "${result.transcription}"`
         );
       }
@@ -7545,7 +7769,7 @@ function useAudioTranscriptionController() {
         }
       });
     } catch (error) {
-      if (error instanceof AppError15) {
+      if (error instanceof AppError16) {
         next(error);
       } else {
         next(
@@ -7556,7 +7780,7 @@ function useAudioTranscriptionController() {
   }
   async function batchPhonemeCheck(req, res, next) {
     if (!req.file) {
-      next(new BadRequestError37("Audio file is required"));
+      next(new BadRequestError38("Audio file is required"));
       return;
     }
     try {
@@ -7566,7 +7790,7 @@ function useAudioTranscriptionController() {
       });
       const { error, value } = batchSchema.validate(req.body);
       if (error) {
-        next(new BadRequestError37(error.message));
+        next(new BadRequestError38(error.message));
         return;
       }
       const { targetPhonemes, options = {} } = value;
@@ -7574,7 +7798,7 @@ function useAudioTranscriptionController() {
       if (!geminiService.validateAudioFormat(mimetype)) {
         const supportedFormats = geminiService.getSupportedAudioFormats();
         next(
-          new BadRequestError37(
+          new BadRequestError38(
             `Unsupported audio format: ${mimetype}. Supported formats: ${supportedFormats.join(
               ", "
             )}`
@@ -7585,7 +7809,7 @@ function useAudioTranscriptionController() {
       const maxSizeBytes = 25 * 1024 * 1024;
       if (size > maxSizeBytes) {
         next(
-          new BadRequestError37(
+          new BadRequestError38(
             `File size too large. Maximum allowed size is ${maxSizeBytes / (1024 * 1024)}MB`
           )
         );
@@ -7641,7 +7865,7 @@ function useAudioTranscriptionController() {
         }
       });
     } catch (error) {
-      if (error instanceof AppError15) {
+      if (error instanceof AppError16) {
         next(error);
       } else {
         next(
@@ -7684,8 +7908,8 @@ function useAudioTranscriptionController() {
 // src/resources/utils/util.controller.ts
 import Joi23 from "joi";
 import {
-  AppError as AppError16,
-  BadRequestError as BadRequestError38,
+  AppError as AppError17,
+  BadRequestError as BadRequestError39,
   InternalServerError as InternalServerError22,
   logger as logger22
 } from "@eeplatform/nodejs-utils";
@@ -7742,13 +7966,13 @@ function useUtilController() {
         keyValues
       });
       if (error) {
-        next(new BadRequestError38(error.message));
+        next(new BadRequestError39(error.message));
         return;
       }
       const repoUrlPattern = /github\.com[:\/]([^\/]+)\/(.+)\.git$/;
       if (!repoUrlPattern.test(repoUrl)) {
         next(
-          new BadRequestError38(
+          new BadRequestError39(
             "Invalid GitHub repository URL format. Expected format: https://github.com/owner/repo.git"
           )
         );
@@ -7760,7 +7984,7 @@ function useUtilController() {
       );
       if (invalidLines.length > 0) {
         next(
-          new BadRequestError38(
+          new BadRequestError39(
             "Invalid key-value format. Each pair should be in format: KEY=value. Pairs should be separated by semicolons."
           )
         );
@@ -7795,7 +8019,7 @@ function useUtilController() {
         error: error.message,
         stack: error.stack
       });
-      if (error instanceof AppError16) {
+      if (error instanceof AppError17) {
         next(error);
       } else {
         next(
@@ -7856,24 +8080,24 @@ function modelPSGC(data) {
 
 // src/resources/psgc/psgc.repository.ts
 import {
-  AppError as AppError17,
-  BadRequestError as BadRequestError39,
+  AppError as AppError18,
+  BadRequestError as BadRequestError40,
   InternalServerError as InternalServerError23,
   logger as logger23,
   makeCacheKey as makeCacheKey14,
   paginate as paginate9,
-  useAtlas as useAtlas16,
-  useCache as useCache12
+  useAtlas as useAtlas15,
+  useCache as useCache11
 } from "@eeplatform/nodejs-utils";
 import { ObjectId as ObjectId21 } from "mongodb";
 function usePSGCRepo() {
-  const db = useAtlas16.getDb();
+  const db = useAtlas15.getDb();
   if (!db) {
     throw new Error("Unable to connect to server.");
   }
   const namespace_collection = "psgc";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = useCache12(namespace_collection);
+  const { getCache, setCache, delNamespace } = useCache11(namespace_collection);
   async function createIndexes() {
     try {
       await collection.createIndexes([
@@ -7909,12 +8133,12 @@ function usePSGCRepo() {
         level: "error",
         message: error.message
       });
-      if (error instanceof AppError17) {
+      if (error instanceof AppError18) {
         throw error;
       } else {
         const isDuplicated = error.message.includes("duplicate");
         if (isDuplicated) {
-          throw new BadRequestError39("Region already exists.");
+          throw new BadRequestError40("Region already exists.");
         }
         throw new Error("Failed to create PSGC.");
       }
@@ -7993,7 +8217,7 @@ function usePSGCRepo() {
     try {
       _id = new ObjectId21(_id);
     } catch (error) {
-      throw new BadRequestError39("Invalid ID.");
+      throw new BadRequestError40("Invalid ID.");
     }
     const cacheKey = makeCacheKey14(namespace_collection, { _id: String(_id) });
     try {
@@ -8010,7 +8234,7 @@ function usePSGCRepo() {
         deletedAt: { $in: ["", null] }
       });
       if (!result) {
-        throw new BadRequestError39("Region not found.");
+        throw new BadRequestError40("Region not found.");
       }
       setCache(cacheKey, result, 300).then(() => {
         logger23.log({
@@ -8025,7 +8249,7 @@ function usePSGCRepo() {
       });
       return result;
     } catch (error) {
-      if (error instanceof AppError17) {
+      if (error instanceof AppError18) {
         throw error;
       } else {
         throw new InternalServerError23("Failed to get PSGC.");
@@ -8080,7 +8304,7 @@ function usePSGCRepo() {
       });
       return result;
     } catch (error) {
-      if (error instanceof AppError17) {
+      if (error instanceof AppError18) {
         throw error;
       } else {
         throw new InternalServerError23("Failed to get PSGC.");
@@ -8090,14 +8314,14 @@ function usePSGCRepo() {
   async function updateFieldById({ _id, field, value } = {}, session) {
     const allowedFields = ["name"];
     if (!allowedFields.includes(field)) {
-      throw new BadRequestError39(
+      throw new BadRequestError40(
         `Field "${field}" is not allowed to be updated.`
       );
     }
     try {
       _id = new ObjectId21(_id);
     } catch (error) {
-      throw new BadRequestError39("Invalid ID.");
+      throw new BadRequestError40("Invalid ID.");
     }
     try {
       await collection.updateOne(
@@ -8115,7 +8339,7 @@ function usePSGCRepo() {
     try {
       _id = new ObjectId21(_id);
     } catch (error) {
-      throw new BadRequestError39("Invalid ID.");
+      throw new BadRequestError40("Invalid ID.");
     }
     try {
       await collection.updateOne(
@@ -8175,7 +8399,7 @@ function usePSGCRepo() {
 }
 
 // src/resources/psgc/psgc.controller.ts
-import { BadRequestError as BadRequestError40 } from "@eeplatform/nodejs-utils";
+import { BadRequestError as BadRequestError41 } from "@eeplatform/nodejs-utils";
 import Joi26 from "joi";
 function usePSGCController() {
   const {
@@ -8190,7 +8414,7 @@ function usePSGCController() {
     const value = req.body;
     const { error } = schemaPSGC.validate(value);
     if (error) {
-      next(new BadRequestError40(error.message));
+      next(new BadRequestError41(error.message));
       return;
     }
     try {
@@ -8221,16 +8445,16 @@ function usePSGCController() {
     const prefix = req.query.prefix ? String(req.query.prefix) : "";
     const isPageNumber = isFinite(page);
     if (!isPageNumber) {
-      next(new BadRequestError40("Invalid page number."));
+      next(new BadRequestError41("Invalid page number."));
       return;
     }
     const isLimitNumber = isFinite(limit);
     if (!isLimitNumber) {
-      next(new BadRequestError40("Invalid limit number."));
+      next(new BadRequestError41("Invalid limit number."));
       return;
     }
     if (error) {
-      next(new BadRequestError40(error.message));
+      next(new BadRequestError41(error.message));
       return;
     }
     try {
@@ -8254,7 +8478,7 @@ function usePSGCController() {
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError40(error.message));
+      next(new BadRequestError41(error.message));
       return;
     }
     try {
@@ -8275,7 +8499,7 @@ function usePSGCController() {
     });
     const { error } = validation.validate({ name });
     if (error) {
-      next(new BadRequestError40(error.message));
+      next(new BadRequestError41(error.message));
       return;
     }
     try {
@@ -8299,7 +8523,7 @@ function usePSGCController() {
     });
     const { error } = validation.validate({ _id, field, value });
     if (error) {
-      next(new BadRequestError40(error.message));
+      next(new BadRequestError41(error.message));
       return;
     }
     try {
@@ -8317,7 +8541,7 @@ function usePSGCController() {
     });
     const { error } = validation.validate({ _id });
     if (error) {
-      next(new BadRequestError40(error.message));
+      next(new BadRequestError41(error.message));
       return;
     }
     try {
@@ -8360,7 +8584,6 @@ export {
   MONGO_DB,
   MONGO_URI,
   MOrg,
-  MRole,
   MToken,
   MUser,
   MUserRole,
@@ -8390,6 +8613,7 @@ export {
   modelPSGC,
   modelPermission,
   modelPermissionGroup,
+  modelRole,
   schemaApp,
   schemaAppUpdate,
   schemaOrg,
@@ -8398,6 +8622,8 @@ export {
   schemaPermissionGroup,
   schemaPermissionGroupUpdate,
   schemaPermissionUpdate,
+  schemaRole,
+  schemaRoleUpdate,
   transactionSchema,
   useAddressController,
   useAddressRepo,
@@ -8429,6 +8655,7 @@ export {
   usePermissionService,
   useRoleController,
   useRoleRepo,
+  useRoleService,
   useTokenRepo,
   useTranscribeService,
   useUserController,