@goweekdays/core 2.1.4 → 2.2.1

package/dist/index.mjs

@@ -833,15 +833,15 @@ function useAuthService() {
 // src/resources/auth/auth.controller.ts
 import Joi14 from "joi";
 import {
-  AppError as AppError7,
-  BadRequestError as BadRequestError24,
+  AppError as AppError8,
+  BadRequestError as BadRequestError25,
   InternalServerError as InternalServerError13,
   logger as logger17
 } from "@goweekdays/utils";
 
 // src/resources/user/user.service.ts
 import {
-  BadRequestError as BadRequestError23,
+  BadRequestError as BadRequestError24,
   InternalServerError as InternalServerError12,
   NotFoundError as NotFoundError4,
   hashPassword,
@@ -1386,6 +1386,56 @@ function MMember(value) {
     deletedAt: ""
   };
 }
+var schemaMember = Joi3.object({
+  org: Joi3.string().hex().optional().allow("", null),
+  orgName: Joi3.string().optional().allow("", null),
+  name: Joi3.string().required(),
+  user: Joi3.string().hex().required(),
+  role: Joi3.string().hex().required(),
+  roleName: Joi3.string().optional().allow("", null),
+  type: Joi3.string().required()
+});
+function modelMember(value) {
+  const { error } = schemaMember.validate(value);
+  if (error) {
+    throw new BadRequestError9(error.message);
+  }
+  if (value.org) {
+    try {
+      value.org = new ObjectId8(value.org);
+    } catch (error2) {
+      throw new BadRequestError9("Invalid org ID.");
+    }
+  }
+  if (value.user) {
+    try {
+      value.user = new ObjectId8(value.user);
+    } catch (error2) {
+      throw new BadRequestError9("Invalid user ID.");
+    }
+  }
+  if (value.role) {
+    try {
+      value.role = new ObjectId8(value.role);
+    } catch (error2) {
+      throw new BadRequestError9("Invalid role ID.");
+    }
+  }
+  return {
+    _id: value._id,
+    org: value.org ?? "",
+    orgName: value.orgName ?? "",
+    name: value.name,
+    user: value.user,
+    type: value.type,
+    role: value.role,
+    roleName: value.roleName ?? "",
+    status: value.status ?? "active",
+    createdAt: value.createdAt || /* @__PURE__ */ new Date(),
+    updatedAt: "",
+    deletedAt: ""
+  };
+}
 
 // src/resources/member/member.repository.ts
 import { ObjectId as ObjectId9 } from "mongodb";
@@ -1454,7 +1504,7 @@ function useMemberRepo() {
   }
   async function add(value, session) {
     try {
-      value = MMember(value);
+      value = modelMember(value);
       await collection.insertOne(value, { session });
       delCachedData();
       return "Successfully added member.";
@@ -1507,6 +1557,43 @@ function useMemberRepo() {
       );
     }
   }
+  async function getByRole(role) {
+    try {
+      role = new ObjectId9(role);
+    } catch (error) {
+      throw new BadRequestError10("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 InternalServerError5(
+        "Internal server error, failed to retrieve member."
+      );
+    }
+  }
   async function getByUserId(user) {
     try {
       user = new ObjectId9(user);
@@ -1957,6 +2044,7 @@ function useMemberRepo() {
     createTextIndex,
     add,
     getById,
+    getByRole,
     getAll,
     getOrgsByUserId,
     updateStatusByUserId,
@@ -2304,49 +2392,51 @@ import { ObjectId as ObjectId15 } from "mongodb";
 
 // src/resources/role/role.repository.ts
 import {
-  BadRequestError as BadRequestError12,
+  BadRequestError as BadRequestError13,
   InternalServerError as InternalServerError7,
   useAtlas as useAtlas7,
   paginate as paginate4,
   logger as logger7,
   makeCacheKey as makeCacheKey6,
-  useCache as useCache7
+  useCache as useCache7,
+  AppError as AppError3
 } from "@goweekdays/utils";
 
 // src/resources/role/role.model.ts
+import { BadRequestError as BadRequestError12 } from "@goweekdays/utils";
 import Joi4 from "joi";
 import { ObjectId as ObjectId10 } from "mongodb";
 var schemaRole = Joi4.object({
   name: Joi4.string().required(),
   description: Joi4.string().max(1024).optional().allow("", null),
   permissions: Joi4.array().items(Joi4.string()).required(),
-  type: Joi4.string().required(),
-  org: Joi4.string().hex().optional().allow("", null)
+  org: Joi4.string().hex().optional().allow("", null),
+  createdBy: Joi4.string().hex().required()
 });
 function modelRole(value) {
   const { error } = schemaRole.validate(value);
   if (error) {
-    throw new Error(error.message);
+    throw new BadRequestError12(error.message);
   }
   if (value._id && typeof value._id === "string") {
     try {
       value._id = new ObjectId10(value._id);
     } catch (error2) {
-      throw new Error("Invalid _id.");
+      throw new BadRequestError12("Invalid _id.");
     }
   }
   if (value.org && typeof value.org === "string" && value.org.length === 24) {
     try {
       value.org = new ObjectId10(value.org);
     } catch (error2) {
-      throw new Error("Invalid org.");
+      throw new BadRequestError12("Invalid org.");
     }
   }
   if (value.createdBy && typeof value.createdBy === "string" && value.createdBy.length === 24) {
     try {
       value.createdBy = new ObjectId10(value.createdBy);
     } catch (error2) {
-      throw new Error("Invalid createdBy.");
+      throw new BadRequestError12("Invalid createdBy.");
     }
   }
   return {
@@ -2354,7 +2444,6 @@ function modelRole(value) {
     name: value.name,
     description: value.description ?? "",
     permissions: value.permissions,
-    type: value.type,
     org: value.org,
     status: value.status ?? "active",
     default: value.default ?? false,
@@ -2427,16 +2516,20 @@ function useRoleRepo() {
       logger7.log({ level: "error", message: `${error}` });
       const isDuplicated = error.message.includes("duplicate");
       if (isDuplicated) {
-        throw new BadRequestError12("Role already exists");
+        throw new BadRequestError13("Role already exists");
+      }
+      if (error instanceof AppError3) {
+        throw error;
+      } else {
+        throw new InternalServerError7("Failed to create role.");
       }
-      throw new InternalServerError7("Failed to create role.");
     }
   }
   async function getRoleByUserId(value) {
     try {
       value = new ObjectId11(value);
     } catch (error) {
-      throw new BadRequestError12("Invalid user ID.");
+      throw new BadRequestError13("Invalid user ID.");
     }
     try {
       const cacheKey = makeCacheKey6(namespace_collection, {
@@ -2467,11 +2560,11 @@ function useRoleRepo() {
       throw new InternalServerError7("Failed to retrieve role by user ID.");
     }
   }
-  async function getRoleById(_id) {
+  async function getById(_id) {
     try {
       _id = new ObjectId11(_id);
     } catch (error) {
-      throw new BadRequestError12("Invalid ID.");
+      throw new BadRequestError13("Invalid ID.");
     }
     try {
       const cacheKey = makeCacheKey6(namespace_collection, {
@@ -2481,7 +2574,7 @@ function useRoleRepo() {
       if (cached) {
         logger7.log({
           level: "info",
-          message: `Cache hit for getRoleById role: ${cacheKey}`
+          message: `Cache hit for getById role: ${cacheKey}`
         });
         return cached;
       }
@@ -2504,7 +2597,7 @@ function useRoleRepo() {
   }
   async function getRoleByName(name) {
     if (!name) {
-      throw new BadRequestError12("Role name is required.");
+      throw new BadRequestError13("Role name is required.");
     }
     try {
       const cacheKey = makeCacheKey6(namespace_collection, {
@@ -2550,7 +2643,7 @@ function useRoleRepo() {
       try {
         id = new ObjectId11(id);
       } catch (error) {
-        throw new BadRequestError12("Invalid ID.");
+        throw new BadRequestError13("Invalid ID.");
       }
     }
     const query = { status: "active" };
@@ -2612,12 +2705,12 @@ function useRoleRepo() {
   }
   async function updateRole(_id, value, session) {
     if (!_id) {
-      throw new BadRequestError12("Role ID is required.");
+      throw new BadRequestError13("Role ID is required.");
     }
     try {
       _id = new ObjectId11(_id);
     } catch (error) {
-      throw new BadRequestError12("Invalid role ID.");
+      throw new BadRequestError13("Invalid role ID.");
     }
     if (!value.name) {
       delete value.name;
@@ -2634,23 +2727,23 @@ function useRoleRepo() {
         throw new InternalServerError7("Failed to update role.");
       }
     } else {
-      throw new BadRequestError12("No fields to update.");
+      throw new BadRequestError13("No fields to update.");
     }
   }
   async function updatePermissionsById(_id, permissions, session) {
     if (!_id) {
-      throw new BadRequestError12("Role ID is required.");
+      throw new BadRequestError13("Role ID is required.");
     }
     try {
       _id = new ObjectId11(_id);
     } catch (error) {
-      throw new BadRequestError12("Invalid role ID.");
+      throw new BadRequestError13("Invalid role ID.");
     }
     if (!permissions) {
-      throw new BadRequestError12("Permissions are required.");
+      throw new BadRequestError13("Permissions are required.");
     }
     if (permissions.length === 0) {
-      throw new BadRequestError12("Permissions cannot be empty.");
+      throw new BadRequestError13("Permissions cannot be empty.");
     }
     try {
       await collection.updateOne(
@@ -2664,11 +2757,11 @@ function useRoleRepo() {
       throw new InternalServerError7("Failed to update role permissions.");
     }
   }
-  async function deleteRole(_id, session) {
+  async function deleteById(_id, session) {
     try {
       _id = new ObjectId11(_id);
     } catch (error) {
-      throw new BadRequestError12("Invalid ID.");
+      throw new BadRequestError13("Invalid ID.");
     }
     try {
       await collection.deleteOne(
@@ -2690,17 +2783,17 @@ function useRoleRepo() {
     addRole,
     getRoles,
     getRoleByUserId,
-    getRoleById,
+    getById,
     getRoleByName,
     updateRole,
-    deleteRole,
+    deleteById,
     updatePermissionsById,
     delCachedData
   };
 }
 
 // src/resources/permission/permission.model.ts
-import { BadRequestError as BadRequestError13 } from "@goweekdays/utils";
+import { BadRequestError as BadRequestError14 } from "@goweekdays/utils";
 import Joi5 from "joi";
 var schemaPermission = Joi5.object({
   app: Joi5.string().required(),
@@ -2719,7 +2812,7 @@ var schemaPermissionUpdate = Joi5.object({
 function modelPermission(value) {
   const { error } = schemaPermission.validate(value);
   if (error) {
-    throw new BadRequestError13(error.message);
+    throw new BadRequestError14(error.message);
   }
   return {
     _id: value._id,
@@ -2738,8 +2831,8 @@ function modelPermission(value) {
 
 // src/resources/permission/permission.repository.ts
 import {
-  AppError as AppError3,
-  BadRequestError as BadRequestError14,
+  AppError as AppError4,
+  BadRequestError as BadRequestError15,
   InternalServerError as InternalServerError8,
   logger as logger8,
   makeCacheKey as makeCacheKey7,
@@ -2798,12 +2891,12 @@ function usePermissionRepo() {
         level: "error",
         message: error.message
       });
-      if (error instanceof AppError3) {
+      if (error instanceof AppError4) {
         throw error;
       } else {
         const isDuplicated = error.message.includes("duplicate");
         if (isDuplicated) {
-          throw new BadRequestError14("Permission already exists.");
+          throw new BadRequestError15("Permission already exists.");
         }
         throw new Error("Failed to create permission.");
       }
@@ -2813,11 +2906,11 @@ function usePermissionRepo() {
     try {
       _id = new ObjectId12(_id);
     } catch (error2) {
-      throw new BadRequestError14("Invalid ID.");
+      throw new BadRequestError15("Invalid ID.");
     }
     const { error } = schemaPermissionUpdate.validate(value);
     if (error) {
-      throw new BadRequestError14(`Invalid data: ${error.message}`);
+      throw new BadRequestError15(`Invalid data: ${error.message}`);
     }
     try {
       const res = await collection.updateOne(
@@ -2832,7 +2925,7 @@ function usePermissionRepo() {
         level: "error",
         message: error2.message
       });
-      if (error2 instanceof AppError3) {
+      if (error2 instanceof AppError4) {
         throw error2;
       } else {
         throw new Error("Failed to update permission.");
@@ -2908,7 +3001,7 @@ function usePermissionRepo() {
     try {
       _id = new ObjectId12(_id);
     } catch (error) {
-      throw new BadRequestError14("Invalid ID.");
+      throw new BadRequestError15("Invalid ID.");
     }
     const cacheKey = makeCacheKey7(namespace_collection, { _id: String(_id) });
     try {
@@ -2936,7 +3029,7 @@ function usePermissionRepo() {
       });
       return result;
     } catch (error) {
-      if (error instanceof AppError3) {
+      if (error instanceof AppError4) {
         throw error;
       } else {
         throw new InternalServerError8("Failed to get permission.");
@@ -2951,7 +3044,7 @@ function usePermissionRepo() {
     });
     const { error } = validation.validate({ key, group });
     if (error) {
-      throw new BadRequestError14(`Invalid data: ${error.message}`);
+      throw new BadRequestError15(`Invalid data: ${error.message}`);
     }
     const query = {};
     const cacheKeyOptions = {};
@@ -2989,7 +3082,7 @@ function usePermissionRepo() {
       });
       return result;
     } catch (error2) {
-      if (error2 instanceof AppError3) {
+      if (error2 instanceof AppError4) {
         throw error2;
       } else {
         throw new InternalServerError8("Failed to get permission.");
@@ -3026,7 +3119,7 @@ function usePermissionRepo() {
       });
       return result;
     } catch (error) {
-      if (error instanceof AppError3) {
+      if (error instanceof AppError4) {
         throw error;
       } else {
         throw new InternalServerError8("Failed to count permission by group.");
@@ -3037,7 +3130,7 @@ function usePermissionRepo() {
     try {
       _id = new ObjectId12(_id);
     } catch (error) {
-      throw new BadRequestError14("Invalid ID.");
+      throw new BadRequestError15("Invalid ID.");
     }
     try {
       const res = await collection.updateOne(
@@ -3051,7 +3144,7 @@ function usePermissionRepo() {
         level: "error",
         message: error.message
       });
-      if (error instanceof AppError3) {
+      if (error instanceof AppError4) {
         throw error;
       } else {
         throw new InternalServerError8("Failed to delete permission.");
@@ -3104,7 +3197,7 @@ function usePermissionService() {
 }
 
 // src/resources/permission/permission.controller.ts
-import { BadRequestError as BadRequestError15, logger as logger9 } from "@goweekdays/utils";
+import { BadRequestError as BadRequestError16, logger as logger9 } from "@goweekdays/utils";
 import Joi7 from "joi";
 function usePermissionController() {
   const {
@@ -3118,7 +3211,7 @@ function usePermissionController() {
     const value = req.body;
     const { error } = schemaPermission.validate(value);
     if (error) {
-      next(new BadRequestError15(error.message));
+      next(new BadRequestError16(error.message));
       logger9.info(`Controller: ${error.message}`);
       return;
     }
@@ -3141,7 +3234,7 @@ function usePermissionController() {
     });
     const { error } = validation.validate(query);
     if (error) {
-      next(new BadRequestError15(error.message));
+      next(new BadRequestError16(error.message));
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
@@ -3180,7 +3273,7 @@ function usePermissionController() {
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError15(error.message));
+      next(new BadRequestError16(error.message));
       return;
     }
     try {
@@ -3201,7 +3294,7 @@ function usePermissionController() {
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError15(error.message));
+      next(new BadRequestError16(error.message));
       return;
     }
     try {
@@ -3216,13 +3309,13 @@ function usePermissionController() {
     const id = req.params.id;
     const { error: errorId } = Joi7.string().hex().required().validate(id);
     if (errorId) {
-      next(new BadRequestError15(errorId.message));
+      next(new BadRequestError16(errorId.message));
       return;
     }
     const payload = req.body;
     const { error } = schemaPermissionUpdate.validate(payload);
     if (error) {
-      next(new BadRequestError15(error.message));
+      next(new BadRequestError16(error.message));
       return;
     }
     try {
@@ -3243,7 +3336,7 @@ function usePermissionController() {
 }
 
 // src/resources/permission/permission.group.model.ts
-import { BadRequestError as BadRequestError16 } from "@goweekdays/utils";
+import { BadRequestError as BadRequestError17 } from "@goweekdays/utils";
 import Joi8 from "joi";
 var schemaPermissionGroup = Joi8.object({
   app: Joi8.string().required(),
@@ -3259,7 +3352,7 @@ var schemaPermissionGroupUpdate = Joi8.object({
 function modelPermissionGroup(value) {
   const { error } = schemaPermissionGroup.validate(value);
   if (error) {
-    throw new BadRequestError16(error.message);
+    throw new BadRequestError17(error.message);
   }
   return {
     _id: value._id,
@@ -3276,8 +3369,8 @@ function modelPermissionGroup(value) {
 
 // src/resources/permission/permission.group.repository.ts
 import {
-  AppError as AppError4,
-  BadRequestError as BadRequestError17,
+  AppError as AppError5,
+  BadRequestError as BadRequestError18,
   InternalServerError as InternalServerError9,
   logger as logger10,
   makeCacheKey as makeCacheKey8,
@@ -3336,12 +3429,12 @@ function usePermissionGroupRepo() {
         level: "error",
         message: error.message
       });
-      if (error instanceof AppError4) {
+      if (error instanceof AppError5) {
         throw error;
       } else {
         const isDuplicated = error.message.includes("duplicate");
         if (isDuplicated) {
-          throw new BadRequestError17("Permission group already exists.");
+          throw new BadRequestError18("Permission group already exists.");
         }
         throw new Error("Failed to create permission group.");
       }
@@ -3351,11 +3444,11 @@ function usePermissionGroupRepo() {
     try {
       _id = new ObjectId13(_id);
     } catch (error2) {
-      throw new BadRequestError17("Invalid ID.");
+      throw new BadRequestError18("Invalid ID.");
     }
     const { error } = schemaPermissionGroupUpdate.validate(value);
     if (error) {
-      throw new BadRequestError17(`Invalid data: ${error.message}`);
+      throw new BadRequestError18(`Invalid data: ${error.message}`);
     }
     try {
       const res = await collection.updateOne(
@@ -3370,7 +3463,7 @@ function usePermissionGroupRepo() {
         level: "error",
         message: error2.message
       });
-      if (error2 instanceof AppError4) {
+      if (error2 instanceof AppError5) {
         throw error2;
       } else {
         throw new Error("Failed to update permission group.");
@@ -3446,7 +3539,7 @@ function usePermissionGroupRepo() {
     try {
       _id = new ObjectId13(_id);
     } catch (error) {
-      throw new BadRequestError17("Invalid ID.");
+      throw new BadRequestError18("Invalid ID.");
     }
     const cacheKey = makeCacheKey8(namespace_collection, { _id: String(_id) });
     try {
@@ -3474,7 +3567,7 @@ function usePermissionGroupRepo() {
       });
       return result;
     } catch (error) {
-      if (error instanceof AppError4) {
+      if (error instanceof AppError5) {
         throw error;
       } else {
         throw new InternalServerError9("Failed to get permission group.");
@@ -3488,7 +3581,7 @@ function usePermissionGroupRepo() {
     });
     const { error } = validation.validate({ key, app });
     if (error) {
-      throw new BadRequestError17("Invalid key.");
+      throw new BadRequestError18("Invalid key.");
     }
     const query = { key };
     const cacheKeyOptions = { key, tag: "byKey" };
@@ -3520,7 +3613,7 @@ function usePermissionGroupRepo() {
       });
       return result;
     } catch (error2) {
-      if (error2 instanceof AppError4) {
+      if (error2 instanceof AppError5) {
         throw error2;
       } else {
         throw new InternalServerError9("Failed to get permission group.");
@@ -3531,7 +3624,7 @@ function usePermissionGroupRepo() {
     try {
       _id = new ObjectId13(_id);
     } catch (error) {
-      throw new BadRequestError17("Invalid ID.");
+      throw new BadRequestError18("Invalid ID.");
     }
     try {
       const res = await collection.updateOne(
@@ -3545,7 +3638,7 @@ function usePermissionGroupRepo() {
         level: "error",
         message: error.message
       });
-      if (error instanceof AppError4) {
+      if (error instanceof AppError5) {
         throw error;
       } else {
         throw new InternalServerError9("Failed to delete permission group.");
@@ -3578,15 +3671,15 @@ function usePermissionGroupRepo() {
 
 // src/resources/permission/permission.group.service.ts
 import {
-  AppError as AppError6,
-  BadRequestError as BadRequestError21,
+  AppError as AppError7,
+  BadRequestError as BadRequestError22,
   InternalServerError as InternalServerError11,
   logger as logger14,
   useAtlas as useAtlas12
 } from "@goweekdays/utils";
 
 // src/resources/app/app.model.ts
-import { BadRequestError as BadRequestError18 } from "@goweekdays/utils";
+import { BadRequestError as BadRequestError19 } from "@goweekdays/utils";
 import Joi10 from "joi";
 var schemaApp = Joi10.object({
   code: Joi10.string().alphanum().max(20).required(),
@@ -3602,7 +3695,7 @@ var schemaAppUpdate = Joi10.object({
 function modelApp(value) {
   const { error } = schemaApp.validate(value);
   if (error) {
-    throw new BadRequestError18(error.message);
+    throw new BadRequestError19(error.message);
   }
   return {
     _id: value._id,
@@ -3619,8 +3712,8 @@ function modelApp(value) {
 
 // src/resources/app/app.repository.ts
 import {
-  AppError as AppError5,
-  BadRequestError as BadRequestError19,
+  AppError as AppError6,
+  BadRequestError as BadRequestError20,
   InternalServerError as InternalServerError10,
   logger as logger11,
   makeCacheKey as makeCacheKey9,
@@ -3682,12 +3775,12 @@ function useAppRepo() {
         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 BadRequestError19("App already exists.");
+          throw new BadRequestError20("App already exists.");
         }
         throw new Error("Failed to create app.");
       }
@@ -3697,7 +3790,7 @@ function useAppRepo() {
     try {
       _id = new ObjectId14(_id);
     } catch (error) {
-      throw new BadRequestError19("Invalid ID.");
+      throw new BadRequestError20("Invalid ID.");
     }
     try {
       const res = await collection.updateOne(
@@ -3712,7 +3805,7 @@ function useAppRepo() {
         level: "error",
         message: error.message
       });
-      if (error instanceof AppError5) {
+      if (error instanceof AppError6) {
         throw error;
       } else {
         throw new Error("Failed to update app.");
@@ -3793,7 +3886,7 @@ function useAppRepo() {
     try {
       _id = new ObjectId14(_id);
     } catch (error) {
-      throw new BadRequestError19("Invalid ID.");
+      throw new BadRequestError20("Invalid ID.");
     }
     const cacheKey = makeCacheKey9(namespace_collection, { _id: String(_id) });
     try {
@@ -3821,7 +3914,7 @@ function useAppRepo() {
       });
       return result;
     } catch (error) {
-      if (error instanceof AppError5) {
+      if (error instanceof AppError6) {
         throw error;
       } else {
         throw new InternalServerError10("Failed to get app.");
@@ -3832,7 +3925,7 @@ function useAppRepo() {
     const validate = Joi11.string().required();
     const { error } = validate.validate(code);
     if (error) {
-      throw new BadRequestError19("Invalid code.");
+      throw new BadRequestError20("Invalid code.");
     }
     const cacheKey = makeCacheKey9(namespace_collection, {
       code,
@@ -3863,7 +3956,7 @@ function useAppRepo() {
       });
       return result;
     } catch (error2) {
-      if (error2 instanceof AppError5) {
+      if (error2 instanceof AppError6) {
         throw error2;
       } else {
         throw new InternalServerError10("Failed to get app.");
@@ -3874,7 +3967,7 @@ function useAppRepo() {
     try {
       _id = new ObjectId14(_id);
     } catch (error) {
-      throw new BadRequestError19("Invalid ID.");
+      throw new BadRequestError20("Invalid ID.");
     }
     try {
       const res = await collection.updateOne(
@@ -3888,7 +3981,7 @@ function useAppRepo() {
         level: "error",
         message: error.message
       });
-      if (error instanceof AppError5) {
+      if (error instanceof AppError6) {
         throw error;
       } else {
         throw new InternalServerError10("Failed to delete app.");
@@ -3937,6 +4030,12 @@ function useAppService() {
         description: "Administrative application.",
         type: "default"
       },
+      {
+        code: "org",
+        name: "Organization",
+        description: "Organization application.",
+        type: "standard"
+      },
       {
         code: "marketplace",
         name: "Marketplace",
@@ -4008,7 +4107,7 @@ function useAppService() {
 }
 
 // src/resources/app/app.controller.ts
-import { BadRequestError as BadRequestError20 } from "@goweekdays/utils";
+import { BadRequestError as BadRequestError21 } from "@goweekdays/utils";
 import Joi12 from "joi";
 function useAppController() {
   const {
@@ -4022,7 +4121,7 @@ function useAppController() {
     const value = req.body;
     const { error } = schemaApp.validate(value);
     if (error) {
-      next(new BadRequestError20(error.message));
+      next(new BadRequestError21(error.message));
       return;
     }
     try {
@@ -4037,13 +4136,13 @@ function useAppController() {
     const id = req.params.id ?? "";
     const { error: errorId } = Joi12.string().hex().required().validate(id);
     if (errorId) {
-      next(new BadRequestError20(errorId.message));
+      next(new BadRequestError21(errorId.message));
       return;
     }
     const value = req.body;
     const { error } = schemaAppUpdate.validate(value);
     if (error) {
-      next(new BadRequestError20(error.message));
+      next(new BadRequestError21(error.message));
       return;
     }
     try {
@@ -4065,7 +4164,7 @@ function useAppController() {
     });
     const { error } = validation.validate(query);
     if (error) {
-      next(new BadRequestError20(error.message));
+      next(new BadRequestError21(error.message));
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
@@ -4104,7 +4203,7 @@ function useAppController() {
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError20(error.message));
+      next(new BadRequestError21(error.message));
       return;
     }
     try {
@@ -4125,7 +4224,7 @@ function useAppController() {
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError20(error.message));
+      next(new BadRequestError21(error.message));
       return;
     }
     try {
@@ -4525,7 +4624,7 @@ function usePermissionGroupService() {
     }
     const associatedPermissionsCount = await countByGroup(permission.key);
     if (associatedPermissionsCount > 0) {
-      throw new BadRequestError21(
+      throw new BadRequestError22(
         "Cannot delete Permission Group with associated Permissions."
       );
     }
@@ -4533,7 +4632,7 @@ function usePermissionGroupService() {
       await _deleteById(id);
       return "Permission deleted successfully.";
     } catch (error) {
-      if (error instanceof AppError6) {
+      if (error instanceof AppError7) {
         throw error;
       } else {
         throw new InternalServerError11("Failed to delete Permission Group.");
@@ -4547,7 +4646,7 @@ function usePermissionGroupService() {
 }
 
 // src/resources/permission/permission.group.controller.ts
-import { BadRequestError as BadRequestError22, logger as logger15 } from "@goweekdays/utils";
+import { BadRequestError as BadRequestError23, logger as logger15 } from "@goweekdays/utils";
 import Joi13 from "joi";
 function usePermissionGroupController() {
   const {
@@ -4561,7 +4660,7 @@ function usePermissionGroupController() {
     const value = req.body;
     const { error } = schemaPermissionGroup.validate(value);
     if (error) {
-      next(new BadRequestError22(error.message));
+      next(new BadRequestError23(error.message));
       logger15.info(`Controller: ${error.message}`);
       return;
     }
@@ -4584,7 +4683,7 @@ function usePermissionGroupController() {
     });
     const { error } = validation.validate(query);
     if (error) {
-      next(new BadRequestError22(error.message));
+      next(new BadRequestError23(error.message));
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
@@ -4623,7 +4722,7 @@ function usePermissionGroupController() {
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError22(error.message));
+      next(new BadRequestError23(error.message));
       return;
     }
     try {
@@ -4644,7 +4743,7 @@ function usePermissionGroupController() {
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError22(error.message));
+      next(new BadRequestError23(error.message));
       return;
     }
     try {
@@ -4659,13 +4758,13 @@ function usePermissionGroupController() {
     const id = req.params.id;
     const { error: errorId } = Joi13.string().hex().required().validate(id);
     if (errorId) {
-      next(new BadRequestError22(errorId.message));
+      next(new BadRequestError23(errorId.message));
       return;
     }
     const payload = req.body;
     const { error } = schemaPermissionGroupUpdate.validate(payload);
     if (error) {
-      next(new BadRequestError22(error.message));
+      next(new BadRequestError23(error.message));
       return;
     }
     try {
@@ -4705,7 +4804,7 @@ function useUserService() {
       session?.startTransaction();
       const _user = await getUserByEmail(DEFAULT_USER_EMAIL);
       if (_user) {
-        throw new BadRequestError23(
+        throw new BadRequestError24(
           `User already exists: ${DEFAULT_USER_EMAIL}.`
         );
       }
@@ -4775,7 +4874,7 @@ function useUserService() {
     try {
       const _user = await getUserByEmail(value.email);
       if (_user) {
-        throw new BadRequestError23(`User already exists: ${value.email}.`);
+        throw new BadRequestError24(`User already exists: ${value.email}.`);
       }
       const hashedPassword = await hashPassword(value.password);
       const userId = new ObjectId15();
@@ -4814,14 +4913,14 @@ function useUserService() {
     try {
       const invitation = await _getVerificationById(id);
       if (!invitation || !invitation.metadata?.app || !invitation.metadata?.role) {
-        throw new BadRequestError23("Invalid invitation.");
+        throw new BadRequestError24("Invalid invitation.");
       }
       if (invitation.status === "complete") {
-        throw new BadRequestError23("Invitation already used.");
+        throw new BadRequestError24("Invitation already used.");
       }
       const expired = new Date(invitation.expireAt) < /* @__PURE__ */ new Date();
       if (invitation.status === "expired" || expired) {
-        throw new BadRequestError23("Invitation expired.");
+        throw new BadRequestError24("Invitation expired.");
       }
       const email = invitation.email;
       const _user = await getUserByEmail(invitation.email);
@@ -4873,21 +4972,21 @@ function useUserService() {
     try {
       const signUp = await _getVerificationById(id);
       if (!signUp) {
-        throw new BadRequestError23("Invalid sign up link.");
+        throw new BadRequestError24("Invalid sign up link.");
       }
       if (signUp.status === "complete") {
-        throw new BadRequestError23(
+        throw new BadRequestError24(
           "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 BadRequestError23("Sign up link expired.");
+        throw new BadRequestError24("Sign up link expired.");
       }
       const email = signUp.email;
       const _user = await getUserByEmail(signUp.email);
       if (_user) {
-        throw new BadRequestError23(`User already exists: ${email}.`);
+        throw new BadRequestError24(`User already exists: ${email}.`);
       }
       const hashedPassword = await hashPassword(password);
       const userId = new ObjectId15();
@@ -4921,7 +5020,7 @@ function useUserService() {
       throw error;
     }
     if (newPassword !== passwordConfirmation) {
-      throw new BadRequestError23("Passwords do not match.");
+      throw new BadRequestError24("Passwords do not match.");
     }
     let hashedPassword = "";
     try {
@@ -4935,7 +5034,7 @@ function useUserService() {
         throw new NotFoundError4("You are using an invalid reset link.");
       }
       if (otpDoc.status === "used") {
-        throw new BadRequestError23("This link has already been invalidated.");
+        throw new BadRequestError24("This link has already been invalidated.");
       }
       await updateStatusById(id, "used");
       return "Successfully reset password.";
@@ -4946,13 +5045,13 @@ function useUserService() {
   const { updateName: updateMemberName } = useMemberRepo();
   async function updateName(_id, firstName, lastName) {
     if (!_id) {
-      throw new BadRequestError23("Invalid user ID");
+      throw new BadRequestError24("Invalid user ID");
     }
     if (!firstName) {
-      throw new BadRequestError23("Invalid firstName");
+      throw new BadRequestError24("Invalid firstName");
     }
     if (!lastName) {
-      throw new BadRequestError23("Invalid lastName");
+      throw new BadRequestError24("Invalid lastName");
     }
     const session = useAtlas13.getClient()?.startSession();
     session?.startTransaction();
@@ -4979,16 +5078,16 @@ function useUserService() {
   }
   async function updateBirthday(_id, month, day, year) {
     if (!_id) {
-      throw new BadRequestError23("Invalid user ID");
+      throw new BadRequestError24("Invalid user ID");
     }
     if (!month) {
-      throw new BadRequestError23("Invalid birth month.");
+      throw new BadRequestError24("Invalid birth month.");
     }
     if (!day) {
-      throw new BadRequestError23("Invalid birthday.");
+      throw new BadRequestError24("Invalid birthday.");
     }
     if (!year) {
-      throw new BadRequestError23("Invalid birth year.");
+      throw new BadRequestError24("Invalid birth year.");
     }
     try {
       await _updateBirthday({ _id, month, day, year });
@@ -5069,7 +5168,7 @@ function useAuthController() {
     });
     const { error } = validation.validate({ email, password });
     if (error) {
-      next(new BadRequestError24(error.message));
+      next(new BadRequestError25(error.message));
       return;
     }
     try {
@@ -5089,7 +5188,7 @@ function useAuthController() {
         level: "error",
         message: `Error during login: ${error2.message}`
       });
-      if (error2 instanceof AppError7) {
+      if (error2 instanceof AppError8) {
         next(error2);
       } else {
         next(new InternalServerError13("An unexpected error occurred"));
@@ -5100,14 +5199,14 @@ function useAuthController() {
   async function logout(req, res, next) {
     const sid = req.headers["authorization"] ?? "";
     if (!sid) {
-      next(new BadRequestError24("Session ID is required"));
+      next(new BadRequestError25("Session ID is required"));
       return;
     }
     try {
       await useAuthService().logout(sid);
       res.json({ message: "Logged out successfully" });
     } catch (error) {
-      if (error instanceof AppError7) {
+      if (error instanceof AppError8) {
         next(error);
       } else {
         next(new InternalServerError13("An unexpected error occurred"));
@@ -5129,7 +5228,7 @@ function useAuthController() {
       passwordConfirmation
     });
     if (error) {
-      next(new BadRequestError24(error.message));
+      next(new BadRequestError25(error.message));
       return;
     }
     try {
@@ -5153,7 +5252,7 @@ function useAuthController() {
     });
     const { error } = validation.validate({ email, referralCode });
     if (error) {
-      next(new BadRequestError24(error.message));
+      next(new BadRequestError25(error.message));
       return;
     }
     try {
@@ -5178,7 +5277,7 @@ function useAuthController() {
 }
 
 // src/resources/building/building.model.ts
-import { BadRequestError as BadRequestError25, logger as logger18 } from "@goweekdays/utils";
+import { BadRequestError as BadRequestError26, logger as logger18 } from "@goweekdays/utils";
 import Joi15 from "joi";
 import { ObjectId as ObjectId16 } from "mongodb";
 var schemaBuilding = Joi15.object({
@@ -5223,19 +5322,19 @@ function MBuilding(value) {
   const { error } = schemaBuilding.validate(value);
   if (error) {
     logger18.info(`Building Model: ${error.message}`);
-    throw new BadRequestError25(error.message);
+    throw new BadRequestError26(error.message);
   }
   if (value._id && typeof value._id === "string") {
     try {
       value._id = new ObjectId16(value._id);
     } catch (error2) {
-      throw new BadRequestError25("Invalid _id format");
+      throw new BadRequestError26("Invalid _id format");
     }
   }
   try {
     value.school = new ObjectId16(value.school);
   } catch (error2) {
-    throw new BadRequestError25("Invalid school format");
+    throw new BadRequestError26("Invalid school format");
   }
   return {
     _id: value._id ?? void 0,
@@ -5253,24 +5352,24 @@ function MBuildingUnit(value) {
   const { error } = schemaBuildingUnit.validate(value);
   if (error) {
     logger18.info(`Building Unit Model: ${error.message}`);
-    throw new BadRequestError25(error.message);
+    throw new BadRequestError26(error.message);
   }
   if (value._id && typeof value._id === "string") {
     try {
       value._id = new ObjectId16(value._id);
     } catch (error2) {
-      throw new BadRequestError25("Invalid ID");
+      throw new BadRequestError26("Invalid ID");
     }
   }
   try {
     value.school = new ObjectId16(value.school);
   } catch (error2) {
-    throw new BadRequestError25("Invalid school ID");
+    throw new BadRequestError26("Invalid school ID");
   }
   try {
     value.building = new ObjectId16(value.building);
   } catch (error2) {
-    throw new BadRequestError25("Invalid building ID");
+    throw new BadRequestError26("Invalid building ID");
   }
   return {
     _id: value._id ?? void 0,
@@ -5295,8 +5394,8 @@ function MBuildingUnit(value) {
 
 // src/resources/building/building.repository.ts
 import {
-  AppError as AppError8,
-  BadRequestError as BadRequestError26,
+  AppError as AppError9,
+  BadRequestError as BadRequestError27,
   InternalServerError as InternalServerError14,
   logger as logger19,
   makeCacheKey as makeCacheKey11,
@@ -5338,12 +5437,12 @@ function useBuildingRepo() {
         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 BadRequestError26("Building already exists.");
+          throw new BadRequestError27("Building already exists.");
         }
         throw new Error("Failed to create building.");
       }
@@ -5353,7 +5452,7 @@ function useBuildingRepo() {
     try {
       _id = new ObjectId17(_id);
     } catch (error) {
-      throw new BadRequestError26("Invalid ID.");
+      throw new BadRequestError27("Invalid ID.");
     }
     try {
       const res = await collection.updateOne(
@@ -5368,7 +5467,7 @@ function useBuildingRepo() {
         level: "error",
         message: error.message
       });
-      if (error instanceof AppError8) {
+      if (error instanceof AppError9) {
         throw error;
       } else {
         throw new Error("Failed to update building.");
@@ -5395,7 +5494,7 @@ function useBuildingRepo() {
       try {
         query.school = new ObjectId17(school);
       } catch (error) {
-        throw new BadRequestError26("Invalid school ID.");
+        throw new BadRequestError27("Invalid school ID.");
       }
     }
     const cacheParams = {
@@ -5452,7 +5551,7 @@ function useBuildingRepo() {
     try {
       _id = new ObjectId17(_id);
     } catch (error) {
-      throw new BadRequestError26("Invalid ID.");
+      throw new BadRequestError27("Invalid ID.");
     }
     const cacheKey = makeCacheKey11(namespace_collection, { _id: String(_id) });
     try {
@@ -5480,7 +5579,7 @@ function useBuildingRepo() {
       });
       return result;
     } catch (error) {
-      if (error instanceof AppError8) {
+      if (error instanceof AppError9) {
         throw error;
       } else {
         throw new InternalServerError14("Failed to get building.");
@@ -5491,7 +5590,7 @@ function useBuildingRepo() {
     try {
       _id = new ObjectId17(_id);
     } catch (error) {
-      throw new BadRequestError26("Invalid ID.");
+      throw new BadRequestError27("Invalid ID.");
     }
     try {
       const res = await collection.updateOne(
@@ -5505,7 +5604,7 @@ function useBuildingRepo() {
         level: "error",
         message: error.message
       });
-      if (error instanceof AppError8) {
+      if (error instanceof AppError9) {
         throw error;
       } else {
         throw new InternalServerError14("Failed to delete building.");
@@ -5536,12 +5635,12 @@ function useBuildingRepo() {
 }
 
 // src/resources/building/building.service.ts
-import { BadRequestError as BadRequestError28, NotFoundError as NotFoundError5, useAtlas as useAtlas16 } from "@goweekdays/utils";
+import { BadRequestError as BadRequestError29, NotFoundError as NotFoundError5, useAtlas as useAtlas16 } from "@goweekdays/utils";
 
 // src/resources/building/building-unit.repository.ts
 import {
-  AppError as AppError9,
-  BadRequestError as BadRequestError27,
+  AppError as AppError10,
+  BadRequestError as BadRequestError28,
   InternalServerError as InternalServerError15,
   logger as logger20,
   makeCacheKey as makeCacheKey12,
@@ -5607,7 +5706,7 @@ function useBuildingUnitRepo() {
         level: "error",
         message: error.message
       });
-      if (error instanceof AppError9) {
+      if (error instanceof AppError10) {
         throw error;
       } else {
         throw new Error("Failed to create building unit.");
@@ -5617,12 +5716,12 @@ function useBuildingUnitRepo() {
   async function updateById(_id, value, session) {
     const { error } = schemaUpdateOptions.validate(value);
     if (error) {
-      throw new BadRequestError27(error.message);
+      throw new BadRequestError28(error.message);
     }
     try {
       _id = new ObjectId18(_id);
     } catch (error2) {
-      throw new BadRequestError27("Invalid ID.");
+      throw new BadRequestError28("Invalid ID.");
     }
     try {
       const res = await collection.updateOne(
@@ -5637,7 +5736,7 @@ function useBuildingUnitRepo() {
         level: "error",
         message: error2.message
       });
-      if (error2 instanceof AppError9) {
+      if (error2 instanceof AppError10) {
         throw error2;
       } else {
         throw new Error("Failed to create building unit.");
@@ -5647,12 +5746,12 @@ function useBuildingUnitRepo() {
   async function updateByBuildingId(building, value, session) {
     const { error } = schemaUpdateOptions.validate(value);
     if (error) {
-      throw new BadRequestError27(error.message);
+      throw new BadRequestError28(error.message);
     }
     try {
       building = new ObjectId18(building);
     } catch (error2) {
-      throw new BadRequestError27("Invalid building ID.");
+      throw new BadRequestError28("Invalid building ID.");
     }
     try {
       const res = await collection.updateMany(
@@ -5667,7 +5766,7 @@ function useBuildingUnitRepo() {
         level: "error",
         message: error2.message
       });
-      if (error2 instanceof AppError9) {
+      if (error2 instanceof AppError10) {
         throw error2;
       } else {
         throw new Error("Failed to update building unit.");
@@ -5696,14 +5795,14 @@ function useBuildingUnitRepo() {
       try {
         query.school = new ObjectId18(school);
       } catch (error) {
-        throw new BadRequestError27("Invalid school ID.");
+        throw new BadRequestError28("Invalid school ID.");
       }
     }
     if (building) {
       try {
         query.building = new ObjectId18(building);
       } catch (error) {
-        throw new BadRequestError27("Invalid building ID.");
+        throw new BadRequestError28("Invalid building ID.");
       }
     }
     const cacheParams = {
@@ -5762,7 +5861,7 @@ function useBuildingUnitRepo() {
     try {
       _id = new ObjectId18(_id);
     } catch (error) {
-      throw new BadRequestError27("Invalid ID.");
+      throw new BadRequestError28("Invalid ID.");
     }
     const cacheKey = makeCacheKey12(namespace_collection, { _id: String(_id) });
     try {
@@ -5779,7 +5878,7 @@ function useBuildingUnitRepo() {
         deletedAt: { $in: ["", null] }
       });
       if (!result) {
-        throw new BadRequestError27("Building unit not found.");
+        throw new BadRequestError28("Building unit not found.");
       }
       setCache(cacheKey, result, 300).then(() => {
         logger20.log({
@@ -5794,7 +5893,7 @@ function useBuildingUnitRepo() {
       });
       return result;
     } catch (error) {
-      if (error instanceof AppError9) {
+      if (error instanceof AppError10) {
         throw error;
       } else {
         throw new InternalServerError15("Failed to get building unit.");
@@ -5805,7 +5904,7 @@ function useBuildingUnitRepo() {
     try {
       building = new ObjectId18(building);
     } catch (error) {
-      throw new BadRequestError27("Invalid building ID.");
+      throw new BadRequestError28("Invalid building ID.");
     }
     const cacheKey = makeCacheKey12(namespace_collection, {
       building: String(building),
@@ -5838,7 +5937,7 @@ function useBuildingUnitRepo() {
       });
       return result;
     } catch (error) {
-      if (error instanceof AppError9) {
+      if (error instanceof AppError10) {
         throw error;
       } else {
         throw new InternalServerError15("Failed to get building unit.");
@@ -5849,7 +5948,7 @@ function useBuildingUnitRepo() {
     try {
       building = new ObjectId18(building);
     } catch (error) {
-      throw new BadRequestError27("Invalid building ID.");
+      throw new BadRequestError28("Invalid building ID.");
     }
     const cacheKey = makeCacheKey12(namespace_collection, {
       building: String(building)
@@ -5880,7 +5979,7 @@ function useBuildingUnitRepo() {
       });
       return result;
     } catch (error) {
-      if (error instanceof AppError9) {
+      if (error instanceof AppError10) {
         throw error;
       } else {
         throw new InternalServerError15("Failed to get building unit.");
@@ -5891,7 +5990,7 @@ function useBuildingUnitRepo() {
     try {
       _id = new ObjectId18(_id);
     } catch (error) {
-      throw new BadRequestError27("Invalid ID.");
+      throw new BadRequestError28("Invalid ID.");
     }
     try {
       const res = await collection.updateOne(
@@ -5906,7 +6005,7 @@ function useBuildingUnitRepo() {
         level: "error",
         message: error.message
       });
-      if (error instanceof AppError9) {
+      if (error instanceof AppError10) {
         throw error;
       } else {
         throw new Error("Failed to deleted room/facility.");
@@ -5945,7 +6044,7 @@ function useBuildingService() {
       if (data.levels < building.levels) {
         const unit = await getByBuildingLevel(id, building.levels);
         if (unit) {
-          throw new BadRequestError28(
+          throw new BadRequestError29(
             "Cannot reduce floors, there are existing building units at higher floors."
           );
         }
@@ -5967,7 +6066,7 @@ function useBuildingService() {
   async function deleteById(id) {
     const building = await getByBuilding(id);
     if (building) {
-      throw new BadRequestError28(
+      throw new BadRequestError29(
         "Cannot delete building with existing room/facility. Please delete room/facility first."
       );
     }
@@ -5985,7 +6084,7 @@ function useBuildingService() {
 }
 
 // src/resources/building/building.controller.ts
-import { BadRequestError as BadRequestError29, logger as logger21 } from "@goweekdays/utils";
+import { BadRequestError as BadRequestError30, logger as logger21 } from "@goweekdays/utils";
 import Joi16 from "joi";
 function useBuildingController() {
   const { getAll: _getAll, getById: _getById, add: _add } = useBuildingRepo();
@@ -6001,7 +6100,7 @@ function useBuildingController() {
     });
     const { error } = validation.validate(value);
     if (error) {
-      next(new BadRequestError29(error.message));
+      next(new BadRequestError30(error.message));
       logger21.info(`Controller: ${error.message}`);
       return;
     }
@@ -6026,7 +6125,7 @@ function useBuildingController() {
     });
     const { error } = validation.validate({ id, value });
     if (error) {
-      next(new BadRequestError29(error.message));
+      next(new BadRequestError30(error.message));
       logger21.info(`Controller: ${error.message}`);
       return;
     }
@@ -6049,7 +6148,7 @@ function useBuildingController() {
     });
     const { error } = validation.validate(query);
     if (error) {
-      next(new BadRequestError29(error.message));
+      next(new BadRequestError30(error.message));
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
@@ -6088,7 +6187,7 @@ function useBuildingController() {
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError29(error.message));
+      next(new BadRequestError30(error.message));
       return;
     }
     try {
@@ -6109,7 +6208,7 @@ function useBuildingController() {
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError29(error.message));
+      next(new BadRequestError30(error.message));
       return;
     }
     try {
@@ -6161,7 +6260,7 @@ function useBuildingUnitService() {
 }
 
 // src/resources/building/building-unit.controller.ts
-import { BadRequestError as BadRequestError30 } from "@goweekdays/utils";
+import { BadRequestError as BadRequestError31 } from "@goweekdays/utils";
 import Joi17 from "joi";
 function useBuildingUnitController() {
   const {
@@ -6193,7 +6292,7 @@ function useBuildingUnitController() {
     });
     const { error } = validation.validate(data);
     if (error) {
-      next(new BadRequestError30(error.message));
+      next(new BadRequestError31(error.message));
       return;
     }
     try {
@@ -6215,7 +6314,7 @@ function useBuildingUnitController() {
     });
     const { error } = validation.validate({ id, value: data });
     if (error) {
-      next(new BadRequestError30(error.message));
+      next(new BadRequestError31(error.message));
       return;
     }
     try {
@@ -6240,7 +6339,7 @@ function useBuildingUnitController() {
     });
     const { error } = validation.validate(query);
     if (error) {
-      next(new BadRequestError30(error.message));
+      next(new BadRequestError31(error.message));
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
@@ -6281,7 +6380,7 @@ function useBuildingUnitController() {
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError30(error.message));
+      next(new BadRequestError31(error.message));
       return;
     }
     try {
@@ -6302,7 +6401,7 @@ function useBuildingUnitController() {
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError30(error.message));
+      next(new BadRequestError31(error.message));
       return;
     }
     try {
@@ -6323,7 +6422,7 @@ function useBuildingUnitController() {
 }
 
 // src/resources/counter/counter.model.ts
-import { BadRequestError as BadRequestError31 } from "@goweekdays/utils";
+import { BadRequestError as BadRequestError32 } from "@goweekdays/utils";
 import { ObjectId as ObjectId19 } from "mongodb";
 import { z } from "zod";
 var TCounter = z.object({
@@ -6343,7 +6442,7 @@ function useCounterModel(db) {
     try {
       return TCounter.parse(value);
     } catch (error) {
-      throw new BadRequestError31(error.issues[0].message);
+      throw new BadRequestError32(error.issues[0].message);
     }
   }
   function validateCounter(data) {
@@ -6560,8 +6659,8 @@ function useFileService() {
 
 // src/resources/file/file.controller.ts
 import {
-  AppError as AppError10,
-  BadRequestError as BadRequestError32,
+  AppError as AppError11,
+  BadRequestError as BadRequestError33,
   InternalServerError as InternalServerError16
 } from "@goweekdays/utils";
 import Joi18 from "joi";
@@ -6577,7 +6676,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 InternalServerError16(error));
@@ -6589,14 +6688,14 @@ function useFileController() {
     const validation = Joi18.string().required();
     const { error } = validation.validate(id);
     if (error) {
-      next(new BadRequestError32(error.message));
+      next(new BadRequestError33(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 InternalServerError16(error2));
@@ -6611,7 +6710,7 @@ function useFileController() {
 
 // src/resources/member/member.controller.ts
 import Joi19 from "joi";
-import { BadRequestError as BadRequestError33 } from "@goweekdays/utils";
+import { BadRequestError as BadRequestError34 } from "@goweekdays/utils";
 function useMemberController() {
   const {
     getByUserId: _getByUserId,
@@ -6627,7 +6726,7 @@ function useMemberController() {
     });
     const { error } = validation.validate({ id: userId });
     if (error) {
-      next(new BadRequestError33(error.message));
+      next(new BadRequestError34(error.message));
       return;
     }
     try {
@@ -6649,7 +6748,7 @@ function useMemberController() {
     });
     const { error } = validation.validate({ ...req.params, ...req.query });
     if (error) {
-      next(new BadRequestError33(error.message));
+      next(new BadRequestError34(error.message));
       return;
     }
     const orgId = req.query.org;
@@ -6693,7 +6792,7 @@ function useMemberController() {
       status
     });
     if (error) {
-      next(new BadRequestError33(error.message));
+      next(new BadRequestError34(error.message));
       return;
     }
     try {
@@ -6730,7 +6829,7 @@ function useMemberController() {
       limit
     });
     if (error) {
-      next(new BadRequestError33(error.message));
+      next(new BadRequestError34(error.message));
     }
     try {
       const items = await _getOrgsByMembership({
@@ -6752,7 +6851,7 @@ function useMemberController() {
     });
     const { error } = validation.validate(req.params);
     if (error) {
-      next(new BadRequestError33(error.message));
+      next(new BadRequestError34(error.message));
       return;
     }
     const id = req.params.id;
@@ -6774,42 +6873,32 @@ function useMemberController() {
 }
 
 // src/resources/organization/organization.model.ts
-import { BadRequestError as BadRequestError34 } from "@goweekdays/utils";
+import { BadRequestError as BadRequestError35 } from "@goweekdays/utils";
 import Joi20 from "joi";
 import { ObjectId as ObjectId20 } from "mongodb";
-var OrgTypes = [
-  "marketplace",
-  "stay",
-  "eat",
-  "service",
-  "ride",
-  "experience"
-];
 var schemaOrg = Joi20.object({
   name: Joi20.string().max(255).required(),
   description: Joi20.string().max(1024).optional().allow("", null),
-  type: Joi20.string().allow(...OrgTypes).required(),
   email: Joi20.string().email().max(255).optional().allow("", null),
   contact: Joi20.string().max(50).optional().allow("", null),
   createdBy: Joi20.string().hex().required()
 });
-function MOrg(value) {
+function modelOrg(value) {
   const { error } = schemaOrg.validate(value);
   if (error) {
-    throw new BadRequestError34(error.message);
+    throw new BadRequestError35(error.message);
   }
   if (value.createdBy && typeof value.createdBy === "string") {
     try {
       value.createdBy = new ObjectId20(value.createdBy);
     } catch (error2) {
-      throw new BadRequestError34("Invalid createdBy ObjectId");
+      throw new BadRequestError35("Invalid createdBy ObjectId");
     }
   }
   return {
     _id: value._id,
     name: value.name,
-    description: value.description,
-    type: value.type,
+    description: value.description ?? "",
     email: value.email,
     contact: value.contact,
     createdBy: value.createdBy,
@@ -6822,8 +6911,8 @@ function MOrg(value) {
 
 // src/resources/organization/organization.repository.ts
 import {
-  AppError as AppError11,
-  BadRequestError as BadRequestError35,
+  AppError as AppError12,
+  BadRequestError as BadRequestError36,
   InternalServerError as InternalServerError17,
   logger as logger24,
   makeCacheKey as makeCacheKey14,
@@ -6872,7 +6961,7 @@ function useOrgRepo() {
   }
   async function add(value, session) {
     try {
-      value = MOrg(value);
+      value = modelOrg(value);
       const res = await collection.insertOne(value, { session });
       delCachedData();
       return res.insertedId;
@@ -6881,12 +6970,12 @@ function useOrgRepo() {
         level: "error",
         message: error.message
       });
-      if (error instanceof AppError11) {
+      if (error instanceof AppError12) {
         throw error;
       } else {
         const isDuplicated = error.message.includes("duplicate");
         if (isDuplicated) {
-          throw new BadRequestError35("Organization already exist.");
+          throw new BadRequestError36("Organization already exist.");
         }
         throw new Error("Failed to create organization.");
       }
@@ -6963,7 +7052,7 @@ function useOrgRepo() {
     try {
       _id = new ObjectId21(_id);
     } catch (error) {
-      throw new BadRequestError35("Invalid ID.");
+      throw new BadRequestError36("Invalid ID.");
     }
     const cacheKey = makeCacheKey14(namespace_collection, { _id: String(_id) });
     try {
@@ -6977,7 +7066,7 @@ function useOrgRepo() {
       }
       const result = await collection.findOne({ _id });
       if (!result) {
-        throw new BadRequestError35("Organization not found.");
+        throw new BadRequestError36("Organization not found.");
       }
       setCache(cacheKey, result, 300).then(() => {
         logger24.log({
@@ -6992,7 +7081,7 @@ function useOrgRepo() {
       });
       return result;
     } catch (error) {
-      if (error instanceof AppError11) {
+      if (error instanceof AppError12) {
         throw error;
       } else {
         throw new InternalServerError17("Failed to get organization.");
@@ -7012,7 +7101,7 @@ function useOrgRepo() {
       }
       const result = await collection.findOne({ name });
       if (!result) {
-        throw new BadRequestError35("Organization not found.");
+        throw new BadRequestError36("Organization not found.");
       }
       setCache(cacheKey, result, 300).then(() => {
         logger24.log({
@@ -7027,7 +7116,7 @@ function useOrgRepo() {
       });
       return result;
     } catch (error) {
-      if (error instanceof AppError11) {
+      if (error instanceof AppError12) {
         throw error;
       } else {
         throw new InternalServerError17("Failed to get organization.");
@@ -7037,14 +7126,14 @@ function useOrgRepo() {
   async function updateFieldById({ _id, field, value } = {}, session) {
     const allowedFields = ["name", "description"];
     if (!allowedFields.includes(field)) {
-      throw new BadRequestError35(
+      throw new BadRequestError36(
         `Field "${field}" is not allowed to be updated.`
       );
     }
     try {
       _id = new ObjectId21(_id);
     } catch (error) {
-      throw new BadRequestError35("Invalid ID.");
+      throw new BadRequestError36("Invalid ID.");
     }
     try {
       await collection.updateOne(
@@ -7063,7 +7152,7 @@ function useOrgRepo() {
     try {
       _id = new ObjectId21(_id);
     } catch (error) {
-      throw new BadRequestError35("Invalid ID.");
+      throw new BadRequestError36("Invalid ID.");
     }
     try {
       await collection.updateOne(
@@ -7088,12 +7177,12 @@ function useOrgRepo() {
 }
 
 // src/resources/organization/organization.service.ts
-import { BadRequestError as BadRequestError37, useAtlas as useAtlas21 } from "@goweekdays/utils";
+import { BadRequestError as BadRequestError38, useAtlas as useAtlas21 } from "@goweekdays/utils";
 
 // src/resources/user/user.controller.ts
 import {
-  AppError as AppError12,
-  BadRequestError as BadRequestError36,
+  AppError as AppError13,
+  BadRequestError as BadRequestError37,
   InternalServerError as InternalServerError18
 } from "@goweekdays/utils";
 import Joi21 from "joi";
@@ -7119,7 +7208,7 @@ function useUserController() {
     });
     const { error } = validation.validate({ status, search, page });
     if (error) {
-      next(new BadRequestError36(error.message));
+      next(new BadRequestError37(error.message));
       return;
     }
     try {
@@ -7134,12 +7223,12 @@ function useUserController() {
     const id = req.params.id || "";
     const validation = Joi21.string().hex().validate(id);
     if (validation.error) {
-      throw new BadRequestError36("Invalid id.");
+      throw new BadRequestError37("Invalid id.");
     }
     try {
       const user = await _getUserById(id);
       if (!user) {
-        throw new BadRequestError36("User not found.");
+        throw new BadRequestError37("User not found.");
       }
       res.json(user);
     } catch (error) {
@@ -7156,7 +7245,7 @@ function useUserController() {
     });
     const { error } = validation.validate({ firstName, lastName });
     if (error) {
-      next(new BadRequestError36(error.message));
+      next(new BadRequestError37(error.message));
       return;
     }
     try {
@@ -7179,7 +7268,7 @@ function useUserController() {
     });
     const { error } = validation.validate({ month, day, year });
     if (error) {
-      next(new BadRequestError36(error.message));
+      next(new BadRequestError37(error.message));
       return;
     }
     try {
@@ -7204,7 +7293,7 @@ function useUserController() {
     });
     const { error } = validation.validate({ _id, field, value });
     if (error) {
-      next(new BadRequestError36(error.message));
+      next(new BadRequestError37(error.message));
       return;
     }
     try {
@@ -7225,7 +7314,7 @@ function useUserController() {
     });
     const { error } = validation.validate({ previousProfile });
     if (error) {
-      next(new BadRequestError36(error.message));
+      next(new BadRequestError37(error.message));
       return;
     }
     const user = req.headers["user"] ?? "";
@@ -7238,7 +7327,7 @@ function useUserController() {
       res.json({ message: "Successfully updated profile picture." });
       return;
     } catch (error2) {
-      if (error2 instanceof AppError12) {
+      if (error2 instanceof AppError13) {
         next(error2);
       } else {
         next(new InternalServerError18(error2));
@@ -7266,7 +7355,7 @@ function useUserController() {
       type
     });
     if (error) {
-      next(new BadRequestError36(error.message));
+      next(new BadRequestError37(error.message));
       return;
     }
     try {
@@ -7307,11 +7396,14 @@ function useOrgService() {
   const { getUserById } = useUserRepo();
   async function add(value) {
     const session = useAtlas21.getClient()?.startSession();
-    session?.startTransaction();
+    if (!session) {
+      throw new BadRequestError38("Unable to start database session.");
+    }
     try {
+      session?.startTransaction();
       const org = await addOrg(value, session);
       const allPermissions = await getAllPermission({
-        app: value.type,
+        app: "org",
         limit: 100
       });
       let permissions = [];
@@ -7321,39 +7413,41 @@ function useOrgService() {
       if (permissions.length === 0) {
         throw new Error("No permissions found for the organization type.");
       }
+      const createdBy = String(value.createdBy);
       const role = await addRole(
         {
-          id: org,
+          org: String(org),
           name: "Owner",
           description: "Owner of the organization",
-          permissions
+          permissions,
+          createdBy
         },
         session
       );
       if (!role) {
-        throw new BadRequestError37("Role is required to create org member.");
+        throw new BadRequestError38("Role is required to create org member.");
       }
-      const user = await getUserById(value.createdBy);
+      const user = await getUserById(createdBy);
       if (!user) {
-        throw new BadRequestError37("User is required to create org member.");
+        throw new BadRequestError38("User is required to create org member.");
       }
       await addMember(
         {
           role: String(role),
           org: String(org),
           name: `${user.firstName} ${user.lastName}`,
-          user: value.createdBy,
-          type: "owner"
+          user: createdBy,
+          type: "org"
         },
         session
       );
-      session?.commitTransaction();
-      return "Organization created successfully.";
+      await session?.commitTransaction();
+      return String(org);
     } catch (error) {
-      session?.abortTransaction();
+      await session?.abortTransaction();
       throw error;
     } finally {
-      session?.endSession();
+      await session?.endSession();
     }
   }
   return {
@@ -7362,7 +7456,7 @@ function useOrgService() {
 }
 
 // src/resources/organization/organization.controller.ts
-import { BadRequestError as BadRequestError38 } from "@goweekdays/utils";
+import { BadRequestError as BadRequestError39 } from "@goweekdays/utils";
 import Joi22 from "joi";
 function useOrgController() {
   const { add: _add } = useOrgService();
@@ -7372,16 +7466,19 @@ function useOrgController() {
     getAll: getAllOrg,
     getById: _getById
   } = useOrgRepo();
-  async function createOrg(req, res, next) {
+  async function add(req, res, next) {
     const value = req.body;
     const { error } = schemaOrg.validate(value);
     if (error) {
-      next(new BadRequestError38(error.message));
+      next(new BadRequestError39(error.message));
       return;
     }
     try {
-      const message = await _add(value);
-      res.json({ message });
+      const org = await _add(value);
+      res.json({
+        message: "Organization created successfully.",
+        data: { org }
+      });
       return;
     } catch (error2) {
       next(error2);
@@ -7394,12 +7491,12 @@ function useOrgController() {
     const user = req.params.user ?? "";
     const isPageNumber = isFinite(page);
     if (!isPageNumber) {
-      next(new BadRequestError38("Invalid page number."));
+      next(new BadRequestError39("Invalid page number."));
       return;
     }
     const isLimitNumber = isFinite(limit);
     if (!isLimitNumber) {
-      next(new BadRequestError38("Invalid limit number."));
+      next(new BadRequestError39("Invalid limit number."));
       return;
     }
     const validation = Joi22.object({
@@ -7410,7 +7507,7 @@ function useOrgController() {
     });
     const { error } = validation.validate({ user, page, limit, search });
     if (error) {
-      next(new BadRequestError38(error.message));
+      next(new BadRequestError39(error.message));
       return;
     }
     try {
@@ -7436,16 +7533,16 @@ function useOrgController() {
     const status = req.query.status ?? "active";
     const isPageNumber = isFinite(page);
     if (!isPageNumber) {
-      next(new BadRequestError38("Invalid page number."));
+      next(new BadRequestError39("Invalid page number."));
       return;
     }
     const isLimitNumber = isFinite(limit);
     if (!isLimitNumber) {
-      next(new BadRequestError38("Invalid limit number."));
+      next(new BadRequestError39("Invalid limit number."));
       return;
     }
     if (error) {
-      next(new BadRequestError38(error.message));
+      next(new BadRequestError39(error.message));
       return;
     }
     try {
@@ -7463,7 +7560,7 @@ function useOrgController() {
     });
     const { error } = validation.validate({ name });
     if (error) {
-      next(new BadRequestError38(error.message));
+      next(new BadRequestError39(error.message));
       return;
     }
     try {
@@ -7481,7 +7578,7 @@ function useOrgController() {
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError38(error.message));
+      next(new BadRequestError39(error.message));
       return;
     }
     try {
@@ -7493,7 +7590,7 @@ function useOrgController() {
     }
   }
   return {
-    createOrg,
+    add,
     getOrgsByUserId,
     getByName,
     getAll,
@@ -7522,8 +7619,8 @@ function modelPSGC(data) {
 
 // src/resources/psgc/psgc.repository.ts
 import {
-  AppError as AppError13,
-  BadRequestError as BadRequestError39,
+  AppError as AppError14,
+  BadRequestError as BadRequestError40,
   InternalServerError as InternalServerError19,
   logger as logger25,
   makeCacheKey as makeCacheKey15,
@@ -7575,12 +7672,12 @@ function usePSGCRepo() {
         level: "error",
         message: error.message
       });
-      if (error instanceof AppError13) {
+      if (error instanceof AppError14) {
         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.");
       }
@@ -7659,7 +7756,7 @@ function usePSGCRepo() {
     try {
       _id = new ObjectId22(_id);
     } catch (error) {
-      throw new BadRequestError39("Invalid ID.");
+      throw new BadRequestError40("Invalid ID.");
     }
     const cacheKey = makeCacheKey15(namespace_collection, { _id: String(_id) });
     try {
@@ -7676,7 +7773,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(() => {
         logger25.log({
@@ -7691,7 +7788,7 @@ function usePSGCRepo() {
       });
       return result;
     } catch (error) {
-      if (error instanceof AppError13) {
+      if (error instanceof AppError14) {
         throw error;
       } else {
         throw new InternalServerError19("Failed to get PSGC.");
@@ -7746,7 +7843,7 @@ function usePSGCRepo() {
       });
       return result;
     } catch (error) {
-      if (error instanceof AppError13) {
+      if (error instanceof AppError14) {
         throw error;
       } else {
         throw new InternalServerError19("Failed to get PSGC.");
@@ -7756,14 +7853,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 ObjectId22(_id);
     } catch (error) {
-      throw new BadRequestError39("Invalid ID.");
+      throw new BadRequestError40("Invalid ID.");
     }
     try {
       await collection.updateOne(
@@ -7781,7 +7878,7 @@ function usePSGCRepo() {
     try {
       _id = new ObjectId22(_id);
     } catch (error) {
-      throw new BadRequestError39("Invalid ID.");
+      throw new BadRequestError40("Invalid ID.");
     }
     try {
       await collection.updateOne(
@@ -7806,7 +7903,7 @@ function usePSGCRepo() {
 }
 
 // src/resources/psgc/psgc.controller.ts
-import { BadRequestError as BadRequestError40 } from "@goweekdays/utils";
+import { BadRequestError as BadRequestError41 } from "@goweekdays/utils";
 import Joi24 from "joi";
 function usePSGCController() {
   const {
@@ -7821,7 +7918,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 {
@@ -7852,16 +7949,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 {
@@ -7885,7 +7982,7 @@ function usePSGCController() {
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError40(error.message));
+      next(new BadRequestError41(error.message));
       return;
     }
     try {
@@ -7906,7 +8003,7 @@ function usePSGCController() {
     });
     const { error } = validation.validate({ name });
     if (error) {
-      next(new BadRequestError40(error.message));
+      next(new BadRequestError41(error.message));
       return;
     }
     try {
@@ -7930,7 +8027,7 @@ function usePSGCController() {
     });
     const { error } = validation.validate({ _id, field, value });
     if (error) {
-      next(new BadRequestError40(error.message));
+      next(new BadRequestError41(error.message));
       return;
     }
     try {
@@ -7948,7 +8045,7 @@ function usePSGCController() {
     });
     const { error } = validation.validate({ _id });
     if (error) {
-      next(new BadRequestError40(error.message));
+      next(new BadRequestError41(error.message));
       return;
     }
     try {
@@ -7969,24 +8066,53 @@ function usePSGCController() {
   };
 }
 
+// src/resources/role/role.service.ts
+import {
+  AppError as AppError15,
+  BadRequestError as BadRequestError42,
+  InternalServerError as InternalServerError20
+} from "@goweekdays/utils";
+function useRoleService() {
+  const { getByRole } = useMemberRepo();
+  const { deleteById: _deleteById } = useRoleRepo();
+  async function deleteById(id) {
+    try {
+      const role = await getByRole(id);
+      if (role) {
+        throw new BadRequestError42("Cannot delete role assigned to members.");
+      }
+      await _deleteById(id);
+    } catch (error) {
+      if (error instanceof AppError15) {
+        throw error;
+      } else {
+        throw new InternalServerError20("Failed to delete role.");
+      }
+    }
+  }
+  return {
+    deleteById
+  };
+}
+
 // src/resources/role/role.controller.ts
 import Joi25 from "joi";
-import { BadRequestError as BadRequestError41 } from "@goweekdays/utils";
+import { BadRequestError as BadRequestError43 } from "@goweekdays/utils";
 function useRoleController() {
   const {
     addRole: _createRole,
-    getRoleById: _getRoleById,
+    getById,
     getRoleByUserId: _getRoleByUserId,
     getRoles: _getRoles,
     updateRole: _updateRole,
-    deleteRole: _deleteRole,
     updatePermissionsById: _updatePermissionsById
   } = useRoleRepo();
+  const { deleteById: _deleteById } = useRoleService();
   async function createRole(req, res, next) {
     const payload = req.body;
     const { error } = schemaRole.validate(payload);
     if (error) {
-      next(new BadRequestError41(error.message));
+      next(new BadRequestError43(error.message));
       return;
     }
     try {
@@ -8012,7 +8138,7 @@ function useRoleController() {
     });
     const { error } = validation.validate({ search, page, limit, type, id });
     if (error) {
-      next(new BadRequestError41(error.message));
+      next(new BadRequestError43(error.message));
       return;
     }
     try {
@@ -8030,7 +8156,7 @@ function useRoleController() {
     });
     const { error } = validation.validate({ userId });
     if (error) {
-      next(new BadRequestError41(error.message));
+      next(new BadRequestError43(error.message));
       return;
     }
     try {
@@ -8048,11 +8174,11 @@ function useRoleController() {
     });
     const { error } = validation.validate({ _id });
     if (error) {
-      next(new BadRequestError41(error.message));
+      next(new BadRequestError43(error.message));
       return;
     }
     try {
-      const data = await _getRoleById(_id);
+      const data = await getById(_id);
       res.json(data);
       return;
     } catch (error2) {
@@ -8070,7 +8196,7 @@ function useRoleController() {
     });
     const { error } = validation.validate({ _id, name, permissions });
     if (error) {
-      next(new BadRequestError41(error.message));
+      next(new BadRequestError43(error.message));
       return;
     }
     try {
@@ -8090,7 +8216,7 @@ function useRoleController() {
     });
     const { error } = validation.validate({ _id, permissions });
     if (error) {
-      next(new BadRequestError41(error.message));
+      next(new BadRequestError43(error.message));
       return;
     }
     try {
@@ -8108,11 +8234,11 @@ function useRoleController() {
     });
     const { error } = validation.validate({ _id });
     if (error) {
-      next(new BadRequestError41(error.message));
+      next(new BadRequestError43(error.message));
       return;
     }
     try {
-      const message = await _deleteRole(_id);
+      const message = await _deleteById(_id);
       res.json({ message });
       return;
     } catch (error2) {
@@ -8131,7 +8257,7 @@ function useRoleController() {
 }
 
 // src/resources/utils/github.service.ts
-import { AppError as AppError14, BadRequestError as BadRequestError42 } from "@goweekdays/utils";
+import { AppError as AppError16, BadRequestError as BadRequestError44 } from "@goweekdays/utils";
 import { Octokit } from "@octokit/rest";
 import _sodium from "libsodium-wrappers";
 function useGitHubService() {
@@ -8145,23 +8271,23 @@ function useGitHubService() {
     try {
       const { data: repoData } = await octokit.repos.get({ owner, repo });
       if (!repoData.permissions?.admin) {
-        throw new BadRequestError42(
+        throw new BadRequestError44(
           "You do not have admin access to this repository."
         );
       }
     } catch (error) {
       if (error.status === 404) {
-        throw new BadRequestError42(
+        throw new BadRequestError44(
           "Repository not found or you don't have access to it."
         );
       } else if (error.status === 401) {
-        throw new BadRequestError42(
+        throw new BadRequestError44(
           "Invalid GitHub token or insufficient permissions."
         );
       } else if (error.message.includes("admin access")) {
         throw error;
       } else {
-        throw new BadRequestError42(
+        throw new BadRequestError44(
           `Failed to check repository permissions: ${error.message}`
         );
       }
@@ -8210,7 +8336,7 @@ function useGitHubService() {
               key_id: publicKeyRes.key_id
             });
           } catch (encryptionError) {
-            throw new BadRequestError42(
+            throw new BadRequestError44(
               `Failed to encrypt secret '${key}': ${encryptionError.message}`
             );
           }
@@ -8240,22 +8366,22 @@ function useGitHubService() {
       }
       return `Successfully set ${lines.length} ${type} variables/secrets in environment '${environment}'`;
     } catch (error) {
-      if (error instanceof AppError14)
+      if (error instanceof AppError16)
         throw error;
       if (error.status === 422) {
-        throw new BadRequestError42(
+        throw new BadRequestError44(
           `GitHub API validation error: ${error.message}`
         );
       } else if (error.status === 404) {
-        throw new BadRequestError42("Environment or repository not found.");
+        throw new BadRequestError44("Environment or repository not found.");
       } else if (error.status === 403) {
-        throw new BadRequestError42(
+        throw new BadRequestError44(
           "Forbidden: Insufficient permissions or rate limit exceeded."
         );
       } else if (error.message.includes("admin access") || error.message.includes("permissions")) {
         throw error;
       } else {
-        throw new BadRequestError42(
+        throw new BadRequestError44(
           `Failed to set GitHub variables: ${error.message}`
         );
       }
@@ -8269,9 +8395,9 @@ function useGitHubService() {
 // src/resources/utils/util.controller.ts
 import Joi26 from "joi";
 import {
-  AppError as AppError15,
-  BadRequestError as BadRequestError43,
-  InternalServerError as InternalServerError21,
+  AppError as AppError17,
+  BadRequestError as BadRequestError45,
+  InternalServerError as InternalServerError22,
   logger as logger26
 } from "@goweekdays/utils";
 function useUtilController() {
@@ -8290,7 +8416,7 @@ function useUtilController() {
       });
     } catch (error) {
       logger26.error("Health check failed", { error: error.message });
-      next(new InternalServerError21("Health check failed"));
+      next(new InternalServerError22("Health check failed"));
     }
   }
   async function setGitHubVariables(req, res, next) {
@@ -8327,13 +8453,13 @@ function useUtilController() {
         keyValues
       });
       if (error) {
-        next(new BadRequestError43(error.message));
+        next(new BadRequestError45(error.message));
         return;
       }
       const repoUrlPattern = /github\.com[:\/]([^\/]+)\/(.+)\.git$/;
       if (!repoUrlPattern.test(repoUrl)) {
         next(
-          new BadRequestError43(
+          new BadRequestError45(
             "Invalid GitHub repository URL format. Expected format: https://github.com/owner/repo.git"
           )
         );
@@ -8345,7 +8471,7 @@ function useUtilController() {
       );
       if (invalidLines.length > 0) {
         next(
-          new BadRequestError43(
+          new BadRequestError45(
             "Invalid key-value format. Each pair should be in format: KEY=value. Pairs should be separated by semicolons."
           )
         );
@@ -8380,11 +8506,11 @@ function useUtilController() {
         error: error.message,
         stack: error.stack
       });
-      if (error instanceof AppError15) {
+      if (error instanceof AppError17) {
         next(error);
       } else {
         next(
-          new InternalServerError21(
+          new InternalServerError22(
             `Failed to set GitHub variables: ${error.message}`
           )
         );
@@ -8422,9 +8548,9 @@ var transactionSchema = Joi27.object({
 
 // src/resources/verification/verification.controller.ts
 import {
-  AppError as AppError16,
-  BadRequestError as BadRequestError44,
-  InternalServerError as InternalServerError22
+  AppError as AppError18,
+  BadRequestError as BadRequestError46,
+  InternalServerError as InternalServerError23
 } from "@goweekdays/utils";
 import Joi28 from "joi";
 function useVerificationController() {
@@ -8446,7 +8572,7 @@ function useVerificationController() {
     });
     const { error } = validation.validate(req.body);
     if (error) {
-      next(new BadRequestError44(error.message));
+      next(new BadRequestError46(error.message));
       return;
     }
     const email = req.body.email ?? "";
@@ -8477,7 +8603,7 @@ function useVerificationController() {
     const validation = Joi28.string().email().required();
     const { error } = validation.validate(email);
     if (error) {
-      next(new BadRequestError44(error.message));
+      next(new BadRequestError46(error.message));
       return;
     }
     try {
@@ -8487,10 +8613,10 @@ function useVerificationController() {
       });
       return;
     } catch (error2) {
-      if (error2 instanceof AppError16) {
+      if (error2 instanceof AppError18) {
         next(error2);
       } else {
-        next(new InternalServerError22("An unexpected error occurred"));
+        next(new InternalServerError23("An unexpected error occurred"));
       }
     }
   }
@@ -8505,7 +8631,7 @@ function useVerificationController() {
     });
     const { error } = validation.validate(req.query);
     if (error) {
-      next(new BadRequestError44(error.message));
+      next(new BadRequestError46(error.message));
       return;
     }
     const status = req.query.status ?? "";
@@ -8539,7 +8665,7 @@ function useVerificationController() {
     const validation = Joi28.string().hex().required();
     const { error } = validation.validate(id);
     if (error) {
-      next(new BadRequestError44(error.message));
+      next(new BadRequestError46(error.message));
       return;
     }
     try {
@@ -8555,7 +8681,7 @@ function useVerificationController() {
     const validation = Joi28.string().hex().required();
     const { error } = validation.validate(otpId);
     if (error) {
-      next(new BadRequestError44(error.message));
+      next(new BadRequestError46(error.message));
       return;
     }
     try {
@@ -8597,11 +8723,9 @@ export {
   MMember,
   MONGO_DB,
   MONGO_URI,
-  MOrg,
   MUser,
   MUserRole,
   MVerification,
-  OrgTypes,
   PAYPAL_API_URL,
   PAYPAL_CLIENT_ID,
   PAYPAL_CLIENT_SECRET,
@@ -8624,6 +8748,8 @@ export {
   addressSchema,
   isDev,
   modelApp,
+  modelMember,
+  modelOrg,
   modelPSGC,
   modelPermission,
   modelPermissionGroup,
@@ -8632,6 +8758,7 @@ export {
   schemaAppUpdate,
   schemaBuilding,
   schemaBuildingUnit,
+  schemaMember,
   schemaOrg,
   schemaPSGC,
   schemaPermission,
@@ -8675,6 +8802,7 @@ export {
   usePermissionService,
   useRoleController,
   useRoleRepo,
+  useRoleService,
   useUserController,
   useUserRepo,
   useUserService,