@goweekdays/core 2.1.0 → 2.1.2

package/dist/index.mjs

@@ -6547,7 +6547,8 @@ import Joi19 from "joi";
 var schemaApp = Joi19.object({
   code: Joi19.string().alphanum().max(20).required(),
   name: Joi19.string().max(255).required(),
-  description: Joi19.string().max(1024).optional().allow("", null)
+  description: Joi19.string().max(1024).optional().allow("", null),
+  type: Joi19.string().allow("default", "standard").optional().allow("", null)
 });
 var schemaAppUpdate = Joi19.object({
   code: Joi19.string().alphanum().max(20).optional().allow("", null),
@@ -6564,6 +6565,7 @@ function modelApp(value) {
     code: value.code,
     name: value.name,
     description: value.description,
+    type: value.type ?? "standard",
     status: value.status ?? "active",
     createdAt: value.createdAt ?? /* @__PURE__ */ new Date(),
     updatedAt: "",
@@ -6583,6 +6585,8 @@ import {
   useCache as useCache14
 } from "@goweekdays/utils";
 import { ObjectId as ObjectId19 } from "mongodb";
+import Joi20 from "joi";
+var init = false;
 function useAppRepo() {
   const db = useAtlas18.getDb();
   if (!db) {
@@ -6617,9 +6621,12 @@ function useAppRepo() {
       throw new Error("Failed to create index on apps.");
     }
   }
-  createIndexes().catch((error) => {
-    logger19.log({ level: "error", message: `Index creation error: ${error}` });
-  });
+  if (!init) {
+    createIndexes().catch((error) => {
+      logger19.log({ level: "error", message: `Index creation error: ${error}` });
+    });
+    init = true;
+  }
   async function add(value, session) {
     try {
       value = modelApp(value);
@@ -6673,35 +6680,32 @@ function useAppRepo() {
     page = 1,
     limit = 10,
     sort = {},
-    school = "",
-    status = "active"
+    status = "active",
+    type = "standard"
   } = {}) {
     page = page > 0 ? page - 1 : 0;
     const query = {
       status
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
-    if (search) {
-      query.$text = { $search: search };
-    }
-    if (school) {
-      try {
-        query.school = new ObjectId19(school);
-      } catch (error) {
-        throw new BadRequestError35("Invalid school ID.");
-      }
-    }
     const cacheParams = {
+      status,
       page,
       limit,
       sort: JSON.stringify(sort)
     };
-    if (search)
+    if (search) {
+      query.$text = { $search: search };
       cacheParams.search = search;
-    if (school)
-      cacheParams.school = school;
-    if (status !== "active")
-      cacheParams.status = status;
+    }
+    if (type) {
+      if (Array.isArray(type)) {
+        query.type = { $in: type };
+      } else {
+        query.type = type;
+      }
+      cacheParams.type = type;
+    }
     const cacheKey = makeCacheKey13(namespace_collection, cacheParams);
     logger19.log({
       level: "info",
@@ -6780,6 +6784,48 @@ function useAppRepo() {
       }
     }
   }
+  async function getByCode(code) {
+    const validate = Joi20.string().required();
+    const { error } = validate.validate(code);
+    if (error) {
+      throw new BadRequestError35("Invalid code.");
+    }
+    const cacheKey = makeCacheKey13(namespace_collection, {
+      code,
+      tag: "byCode"
+    });
+    try {
+      const cached = await getCache(cacheKey);
+      if (cached) {
+        logger19.log({
+          level: "info",
+          message: `Cache hit for getByCode app: ${cacheKey}`
+        });
+        return cached;
+      }
+      const result = await collection.findOne({
+        code
+      });
+      setCache(cacheKey, result, 300).then(() => {
+        logger19.log({
+          level: "info",
+          message: `Cache set for app by code: ${cacheKey}`
+        });
+      }).catch((err) => {
+        logger19.log({
+          level: "error",
+          message: `Failed to set cache for app by code: ${err.message}`
+        });
+      });
+      return result;
+    } catch (error2) {
+      if (error2 instanceof AppError13) {
+        throw error2;
+      } else {
+        throw new InternalServerError19("Failed to get app.");
+      }
+    }
+  }
   async function deleteById(_id, session) {
     try {
       _id = new ObjectId19(_id);
@@ -6823,18 +6869,96 @@ function useAppRepo() {
     add,
     getAll,
     getById,
+    getByCode,
     updateById,
     deleteById
   };
 }
 
 // src/resources/app/app.service.ts
+import { logger as logger20, useAtlas as useAtlas19 } from "@goweekdays/utils";
+var init2 = false;
 function useAppService() {
   const {
     updateById: _updateById,
     getById: _getById,
-    deleteById: _deleteById
+    deleteById: _deleteById,
+    getByCode: _getByCode,
+    add: _add
   } = useAppRepo();
+  async function addDefaultApps() {
+    const apps = [
+      {
+        code: "admin",
+        name: "Admin",
+        description: "Administrative application.",
+        type: "default"
+      },
+      {
+        code: "marketplace",
+        name: "Marketplace",
+        description: "Marketplace for product listings."
+      },
+      {
+        code: "service",
+        name: "Services",
+        description: "Service offerings and management."
+      },
+      {
+        code: "stay",
+        name: "Stay",
+        description: "Accommodation and lodging services."
+      },
+      { code: "eat", name: "Eat", description: "Food and dining services." },
+      {
+        code: "experience",
+        name: "Experience",
+        description: "Experiential touring, travel, activities and events."
+      },
+      {
+        code: "ride",
+        name: "Ride",
+        description: "Transportation and ride services."
+      }
+    ];
+    const session = useAtlas19.getClient()?.startSession();
+    if (!session) {
+      throw new Error("Failed to start database session.");
+    }
+    try {
+      session?.startTransaction();
+      for (const app of apps) {
+        const existingApp = await _getByCode(app.code);
+        if (!existingApp) {
+          await _add(app, session);
+        }
+      }
+      await session.commitTransaction();
+      logger20.log({
+        level: "info",
+        message: "Default apps added successfully."
+      });
+      return;
+    } catch (error) {
+      await session.abortTransaction();
+      logger20.log({
+        level: "error",
+        message: `Failed to add default apps: ${error}`
+      });
+      throw error;
+    } finally {
+      await session.endSession();
+    }
+  }
+  if (!init2) {
+    addDefaultApps().catch((error) => {
+      logger20.log({
+        level: "error",
+        message: `Error in addDefaultApps: ${error}`
+      });
+    });
+    init2 = true;
+  }
   async function deleteById(id) {
     try {
       await _deleteById(id);
@@ -6850,7 +6974,7 @@ function useAppService() {
 
 // src/resources/app/app.controller.ts
 import { BadRequestError as BadRequestError36 } from "@goweekdays/utils";
-import Joi20 from "joi";
+import Joi21 from "joi";
 function useAppController() {
   const {
     getAll: _getAll,
@@ -6876,7 +7000,7 @@ function useAppController() {
   }
   async function updateById(req, res, next) {
     const id = req.params.id ?? "";
-    const { error: errorId } = Joi20.string().hex().required().validate(id);
+    const { error: errorId } = Joi21.string().hex().required().validate(id);
     if (errorId) {
       next(new BadRequestError36(errorId.message));
       return;
@@ -6897,12 +7021,12 @@ function useAppController() {
   }
   async function getAll(req, res, next) {
     const query = req.query;
-    const validation = Joi20.object({
-      page: Joi20.number().min(1).optional().allow("", null),
-      limit: Joi20.number().min(1).optional().allow("", null),
-      search: Joi20.string().optional().allow("", null),
-      school: Joi20.string().hex().optional().allow("", null),
-      status: Joi20.string().optional().allow("", null)
+    const validation = Joi21.object({
+      page: Joi21.number().min(1).optional().allow("", null),
+      limit: Joi21.number().min(1).optional().allow("", null),
+      search: Joi21.string().optional().allow("", null),
+      status: Joi21.string().optional().allow("", null),
+      type: Joi21.string().optional().allow("", null)
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -6921,16 +7045,16 @@ function useAppController() {
       });
     }
     const status = req.query.status ?? "active";
-    const school = req.query.school ?? "";
     const search = req.query.search ?? "";
+    let type = req.query.type ? req.query.type.split(",") : "standard";
     try {
       const buildings = await _getAll({
         page,
         limit,
         sort: sortObj,
         status,
-        school,
-        search
+        search,
+        type
       });
       res.json(buildings);
       return;
@@ -6940,8 +7064,8 @@ function useAppController() {
   }
   async function getById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi20.object({
-      id: Joi20.string().hex().required()
+    const validation = Joi21.object({
+      id: Joi21.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
@@ -6961,8 +7085,8 @@ function useAppController() {
   }
   async function deleteById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi20.object({
-      id: Joi20.string().hex().required()
+    const validation = Joi21.object({
+      id: Joi21.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
@@ -6988,18 +7112,18 @@ function useAppController() {
 
 // src/resources/permission/permission.model.ts
 import { BadRequestError as BadRequestError37 } from "@goweekdays/utils";
-import Joi21 from "joi";
-var schemaPermission = Joi21.object({
-  app: Joi21.string().required(),
-  key: Joi21.string().required(),
-  group: Joi21.string().required(),
-  description: Joi21.string().max(1024).required(),
-  deprecated: Joi21.boolean().optional().allow(null)
+import Joi22 from "joi";
+var schemaPermission = Joi22.object({
+  app: Joi22.string().required(),
+  key: Joi22.string().required(),
+  group: Joi22.string().required(),
+  description: Joi22.string().required(),
+  deprecated: Joi22.boolean().optional().allow(null)
 });
-var schemaPermissionUpdate = Joi21.object({
-  key: Joi21.string().optional().allow("", null),
-  group: Joi21.string().optional().allow("", null),
-  description: Joi21.string().max(1024).optional().allow("", null)
+var schemaPermissionUpdate = Joi22.object({
+  key: Joi22.string().optional().allow("", null),
+  group: Joi22.string().optional().allow("", null),
+  description: Joi22.string().max(1024).optional().allow("", null)
 });
 function modelPermission(value) {
   const { error } = schemaPermission.validate(value);
@@ -7025,15 +7149,16 @@ import {
   AppError as AppError14,
   BadRequestError as BadRequestError38,
   InternalServerError as InternalServerError20,
-  logger as logger21,
+  logger as logger22,
   makeCacheKey as makeCacheKey14,
   paginate as paginate10,
-  useAtlas as useAtlas19,
+  useAtlas as useAtlas20,
   useCache as useCache15
 } from "@goweekdays/utils";
 import { ObjectId as ObjectId20 } from "mongodb";
+import Joi23 from "joi";
 function usePermissionRepo() {
-  const db = useAtlas19.getDb();
+  const db = useAtlas20.getDb();
   if (!db) {
     throw new Error("Unable to connect to server.");
   }
@@ -7061,7 +7186,7 @@ function usePermissionRepo() {
     }
   }
   createIndexes().catch((error) => {
-    logger21.log({ level: "error", message: `Index creation error: ${error}` });
+    logger22.log({ level: "error", message: `Index creation error: ${error}` });
   });
   async function add(value, session) {
     try {
@@ -7070,7 +7195,7 @@ function usePermissionRepo() {
       delCachedData();
       return res.insertedId;
     } catch (error) {
-      logger21.log({
+      logger22.log({
         level: "error",
         message: error.message
       });
@@ -7104,7 +7229,7 @@ function usePermissionRepo() {
       delCachedData();
       return res;
     } catch (error2) {
-      logger21.log({
+      logger22.log({
         level: "error",
         message: error2.message
       });
@@ -7142,14 +7267,14 @@ function usePermissionRepo() {
       cacheParams.app = app;
     }
     const cacheKey = makeCacheKey14(namespace_collection, cacheParams);
-    logger21.log({
+    logger22.log({
       level: "info",
       message: `Cache key for getAll permissions: ${cacheKey}`
     });
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger21.log({
+        logger22.log({
           level: "info",
           message: `Cache hit for getAll permissions: ${cacheKey}`
         });
@@ -7164,19 +7289,19 @@ function usePermissionRepo() {
       const length = await collection.countDocuments(query);
       const data = paginate10(items, page, limit, length);
       setCache(cacheKey, data, 600).then(() => {
-        logger21.log({
+        logger22.log({
           level: "info",
           message: `Cache set for getAll permissions: ${cacheKey}`
         });
       }).catch((err) => {
-        logger21.log({
+        logger22.log({
           level: "error",
           message: `Failed to set cache for getAll permissions: ${err.message}`
         });
       });
       return data;
     } catch (error) {
-      logger21.log({ level: "error", message: `${error}` });
+      logger22.log({ level: "error", message: `${error}` });
       throw error;
     }
   }
@@ -7190,7 +7315,7 @@ function usePermissionRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger21.log({
+        logger22.log({
           level: "info",
           message: `Cache hit for getById permission: ${cacheKey}`
         });
@@ -7200,12 +7325,12 @@ function usePermissionRepo() {
         _id
       });
       setCache(cacheKey, result, 300).then(() => {
-        logger21.log({
+        logger22.log({
           level: "info",
           message: `Cache set for permission by id: ${cacheKey}`
         });
       }).catch((err) => {
-        logger21.log({
+        logger22.log({
           level: "error",
           message: `Failed to set cache for permission by id: ${err.message}`
         });
@@ -7219,6 +7344,54 @@ function usePermissionRepo() {
       }
     }
   }
+  async function getByKey(key, group) {
+    const validation = Joi23.object({
+      key: Joi23.string().required(),
+      group: Joi23.string().optional().allow("", null)
+    });
+    const { error } = validation.validate({ key, group });
+    if (error) {
+      throw new BadRequestError38(`Invalid data: ${error.message}`);
+    }
+    const query = {};
+    const cacheKeyOptions = {};
+    query.key = key;
+    cacheKeyOptions.key = key;
+    if (group) {
+      query.group = group;
+      cacheKeyOptions.group = group;
+    }
+    const cacheKey = makeCacheKey14(namespace_collection, cacheKeyOptions);
+    try {
+      const cached = await getCache(cacheKey);
+      if (cached) {
+        logger22.log({
+          level: "info",
+          message: `Cache hit for getById permission: ${cacheKey}`
+        });
+        return cached;
+      }
+      const result = await collection.findOne(query);
+      setCache(cacheKey, result, 300).then(() => {
+        logger22.log({
+          level: "info",
+          message: `Cache set for permission by key: ${cacheKey}`
+        });
+      }).catch((err) => {
+        logger22.log({
+          level: "error",
+          message: `Failed to set cache for permission by key: ${err.message}`
+        });
+      });
+      return result;
+    } catch (error2) {
+      if (error2 instanceof AppError14) {
+        throw error2;
+      } else {
+        throw new InternalServerError20("Failed to get permission.");
+      }
+    }
+  }
   async function countByGroup(group) {
     const cacheKey = makeCacheKey14(namespace_collection, {
       group,
@@ -7227,22 +7400,22 @@ function usePermissionRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger21.log({
+        logger22.log({
           level: "info",
           message: `Cache hit for getById permission: ${cacheKey}`
         });
         return cached;
       }
       const result = await collection.countDocuments({
-        key: group
+        group
       });
       setCache(cacheKey, result, 300).then(() => {
-        logger21.log({
+        logger22.log({
           level: "info",
           message: `Cache set for permission count by group: ${cacheKey}`
         });
       }).catch((err) => {
-        logger21.log({
+        logger22.log({
           level: "error",
           message: `Failed to set cache for permission by group: ${err.message}`
         });
@@ -7270,7 +7443,7 @@ function usePermissionRepo() {
       delCachedData();
       return res;
     } catch (error) {
-      logger21.log({
+      logger22.log({
         level: "error",
         message: error.message
       });
@@ -7283,12 +7456,12 @@ function usePermissionRepo() {
   }
   function delCachedData() {
     delNamespace().then(() => {
-      logger21.log({
+      logger22.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
       });
     }).catch((err) => {
-      logger21.log({
+      logger22.log({
         level: "error",
         message: `Failed to clear cache namespace for ${namespace_collection}: ${err.message}`
       });
@@ -7299,6 +7472,7 @@ function usePermissionRepo() {
     add,
     getAll,
     getById,
+    getByKey,
     updateById,
     deleteById,
     countByGroup
@@ -7326,8 +7500,8 @@ function usePermissionService() {
 }
 
 // src/resources/permission/permission.controller.ts
-import { BadRequestError as BadRequestError39, logger as logger22 } from "@goweekdays/utils";
-import Joi22 from "joi";
+import { BadRequestError as BadRequestError39, logger as logger23 } from "@goweekdays/utils";
+import Joi24 from "joi";
 function usePermissionController() {
   const {
     getAll: _getAll,
@@ -7341,7 +7515,7 @@ function usePermissionController() {
     const { error } = schemaPermission.validate(value);
     if (error) {
       next(new BadRequestError39(error.message));
-      logger22.info(`Controller: ${error.message}`);
+      logger23.info(`Controller: ${error.message}`);
       return;
     }
     try {
@@ -7354,12 +7528,12 @@ function usePermissionController() {
   }
   async function getAll(req, res, next) {
     const query = req.query;
-    const validation = Joi22.object({
-      page: Joi22.number().min(1).optional().allow("", null),
-      limit: Joi22.number().min(1).optional().allow("", null),
-      search: Joi22.string().optional().allow("", null),
-      app: Joi22.string().optional().allow("", null),
-      status: Joi22.string().optional().allow("", null)
+    const validation = Joi24.object({
+      page: Joi24.number().min(1).optional().allow("", null),
+      limit: Joi24.number().min(1).optional().allow("", null),
+      search: Joi24.string().optional().allow("", null),
+      app: Joi24.string().optional().allow("", null),
+      status: Joi24.string().optional().allow("", null)
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -7397,8 +7571,8 @@ function usePermissionController() {
   }
   async function getById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi22.object({
-      id: Joi22.string().hex().required()
+    const validation = Joi24.object({
+      id: Joi24.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
@@ -7418,8 +7592,8 @@ function usePermissionController() {
   }
   async function deleteById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi22.object({
-      id: Joi22.string().hex().required()
+    const validation = Joi24.object({
+      id: Joi24.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
@@ -7436,7 +7610,7 @@ function usePermissionController() {
   }
   async function updateById(req, res, next) {
     const id = req.params.id;
-    const { error: errorId } = Joi22.string().hex().required().validate(id);
+    const { error: errorId } = Joi24.string().hex().required().validate(id);
     if (errorId) {
       next(new BadRequestError39(errorId.message));
       return;
@@ -7466,17 +7640,17 @@ function usePermissionController() {
 
 // src/resources/permission/permission.group.model.ts
 import { BadRequestError as BadRequestError40 } from "@goweekdays/utils";
-import Joi23 from "joi";
-var schemaPermissionGroup = Joi23.object({
-  app: Joi23.string().required(),
-  key: Joi23.string().required(),
-  label: Joi23.string().required(),
-  order: Joi23.number().integer().optional().allow("", null)
+import Joi25 from "joi";
+var schemaPermissionGroup = Joi25.object({
+  app: Joi25.string().required(),
+  key: Joi25.string().required(),
+  label: Joi25.string().required(),
+  order: Joi25.number().integer().optional().allow("", null)
 });
-var schemaPermissionGroupUpdate = Joi23.object({
-  key: Joi23.string().optional().allow("", null),
-  label: Joi23.string().optional().allow("", null),
-  order: Joi23.number().integer().optional().allow("", null)
+var schemaPermissionGroupUpdate = Joi25.object({
+  key: Joi25.string().optional().allow("", null),
+  label: Joi25.string().optional().allow("", null),
+  order: Joi25.number().integer().optional().allow("", null)
 });
 function modelPermissionGroup(value) {
   const { error } = schemaPermissionGroup.validate(value);
@@ -7501,15 +7675,17 @@ import {
   AppError as AppError15,
   BadRequestError as BadRequestError41,
   InternalServerError as InternalServerError21,
-  logger as logger23,
+  logger as logger24,
   makeCacheKey as makeCacheKey15,
   paginate as paginate11,
-  useAtlas as useAtlas20,
+  useAtlas as useAtlas21,
   useCache as useCache16
 } from "@goweekdays/utils";
 import { ObjectId as ObjectId21 } from "mongodb";
+import Joi26 from "joi";
+var init3 = false;
 function usePermissionGroupRepo() {
-  const db = useAtlas20.getDb();
+  const db = useAtlas21.getDb();
   if (!db) {
     throw new Error("Unable to connect to server.");
   }
@@ -7536,17 +7712,24 @@ function usePermissionGroupRepo() {
       throw new Error("Failed to create index on permission groups.");
     }
   }
-  createIndexes().catch((error) => {
-    logger23.log({ level: "error", message: `Index creation error: ${error}` });
-  });
+  if (!init3) {
+    createIndexes().catch((error) => {
+      logger24.log({
+        level: "error",
+        message: `Index creation error: ${error}`
+      });
+    });
+    init3 = true;
+  }
   async function add(value, session) {
     try {
       value = modelPermissionGroup(value);
+      console.log(value);
       const res = await collection.insertOne(value, { session });
       delCachedData();
       return res.insertedId;
     } catch (error) {
-      logger23.log({
+      logger24.log({
         level: "error",
         message: error.message
       });
@@ -7555,7 +7738,7 @@ function usePermissionGroupRepo() {
       } else {
         const isDuplicated = error.message.includes("duplicate");
         if (isDuplicated) {
-          throw new BadRequestError41("App already exists.");
+          throw new BadRequestError41("Permission group already exists.");
         }
         throw new Error("Failed to create permission group.");
       }
@@ -7580,7 +7763,7 @@ function usePermissionGroupRepo() {
       delCachedData();
       return res;
     } catch (error2) {
-      logger23.log({
+      logger24.log({
         level: "error",
         message: error2.message
       });
@@ -7618,14 +7801,14 @@ function usePermissionGroupRepo() {
       cacheParams.app = app;
     }
     const cacheKey = makeCacheKey15(namespace_collection, cacheParams);
-    logger23.log({
+    logger24.log({
       level: "info",
       message: `Cache key for getAll permission groups: ${cacheKey}`
     });
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger23.log({
+        logger24.log({
           level: "info",
           message: `Cache hit for getAll permission groups: ${cacheKey}`
         });
@@ -7640,19 +7823,19 @@ function usePermissionGroupRepo() {
       const length = await collection.countDocuments(query);
       const data = paginate11(items, page, limit, length);
       setCache(cacheKey, data, 600).then(() => {
-        logger23.log({
+        logger24.log({
           level: "info",
           message: `Cache set for getAll permission groups: ${cacheKey}`
         });
       }).catch((err) => {
-        logger23.log({
+        logger24.log({
           level: "error",
           message: `Failed to set cache for getAll permission groups: ${err.message}`
         });
       });
       return data;
     } catch (error) {
-      logger23.log({ level: "error", message: `${error}` });
+      logger24.log({ level: "error", message: `${error}` });
       throw error;
     }
   }
@@ -7666,7 +7849,7 @@ function usePermissionGroupRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger23.log({
+        logger24.log({
           level: "info",
           message: `Cache hit for getById permission group: ${cacheKey}`
         });
@@ -7676,12 +7859,12 @@ function usePermissionGroupRepo() {
         _id
       });
       setCache(cacheKey, result, 300).then(() => {
-        logger23.log({
+        logger24.log({
           level: "info",
           message: `Cache set for permission group by id: ${cacheKey}`
         });
       }).catch((err) => {
-        logger23.log({
+        logger24.log({
           level: "error",
           message: `Failed to set cache for permission group by id: ${err.message}`
         });
@@ -7695,6 +7878,52 @@ function usePermissionGroupRepo() {
       }
     }
   }
+  async function getByKey(key, app) {
+    const validation = Joi26.object({
+      key: Joi26.string().required(),
+      app: Joi26.string().optional().allow(null, "")
+    });
+    const { error } = validation.validate({ key, app });
+    if (error) {
+      throw new BadRequestError41("Invalid key.");
+    }
+    const query = { key };
+    const cacheKeyOptions = { key, tag: "byKey" };
+    if (app) {
+      query.app = app;
+      cacheKeyOptions.app = app;
+    }
+    const cacheKey = makeCacheKey15(namespace_collection, cacheKeyOptions);
+    try {
+      const cached = await getCache(cacheKey);
+      if (cached) {
+        logger24.log({
+          level: "info",
+          message: `Cache hit for getById permission group: ${cacheKey}`
+        });
+        return cached;
+      }
+      const result = await collection.findOne(query);
+      setCache(cacheKey, result, 300).then(() => {
+        logger24.log({
+          level: "info",
+          message: `Cache set for permission group by key: ${cacheKey}`
+        });
+      }).catch((err) => {
+        logger24.log({
+          level: "error",
+          message: `Failed to set cache for permission group by key: ${err.message}`
+        });
+      });
+      return result;
+    } catch (error2) {
+      if (error2 instanceof AppError15) {
+        throw error2;
+      } else {
+        throw new InternalServerError21("Failed to get permission group.");
+      }
+    }
+  }
   async function deleteById(_id, session) {
     try {
       _id = new ObjectId21(_id);
@@ -7709,7 +7938,7 @@ function usePermissionGroupRepo() {
       delCachedData();
       return res;
     } catch (error) {
-      logger23.log({
+      logger24.log({
         level: "error",
         message: error.message
       });
@@ -7722,12 +7951,12 @@ function usePermissionGroupRepo() {
   }
   function delCachedData() {
     delNamespace().then(() => {
-      logger23.log({
+      logger24.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
       });
     }).catch((err) => {
-      logger23.log({
+      logger24.log({
         level: "error",
         message: `Failed to clear cache namespace for ${namespace_collection}: ${err.message}`
       });
@@ -7738,19 +7967,345 @@ function usePermissionGroupRepo() {
     add,
     getAll,
     getById,
+    getByKey,
     updateById,
     deleteById
   };
 }
 
 // src/resources/permission/permission.group.service.ts
+import {
+  AppError as AppError16,
+  BadRequestError as BadRequestError42,
+  InternalServerError as InternalServerError22,
+  logger as logger25,
+  useAtlas as useAtlas22
+} from "@goweekdays/utils";
+var init4 = false;
 function usePermissionGroupService() {
   const {
     updateById: _updateById,
     getById: _getById,
-    deleteById: _deleteById
+    deleteById: _deleteById,
+    getByKey: _getByKey,
+    add: _add
   } = usePermissionGroupRepo();
-  const { countByGroup } = usePermissionRepo();
+  const { getAll: getAllApps } = useAppRepo();
+  const {
+    countByGroup,
+    getByKey: getPermissionByKey,
+    add: addPermission
+  } = usePermissionRepo();
+  async function addDefaultModule() {
+    const session = useAtlas22.getClient()?.startSession();
+    if (!session) {
+      throw new Error("Failed to start database session.");
+    }
+    try {
+      session?.startTransaction();
+      const apps = await getAllApps({ limit: 20 });
+      if (apps && apps.items && apps.items.length) {
+        const modules = [
+          {
+            key: "members",
+            label: "Members",
+            permissions: [
+              {
+                key: "members.view",
+                description: "View members"
+              },
+              {
+                key: "members.view.details",
+                description: "View member details"
+              },
+              {
+                key: "members.add",
+                description: "Add new members"
+              },
+              {
+                key: "members.edit.details",
+                description: "Edit member details"
+              },
+              {
+                key: "members.delete",
+                description: "Delete members"
+              }
+            ]
+          },
+          {
+            key: "roles",
+            label: "Roles",
+            permissions: [
+              {
+                key: "roles.view",
+                description: "View roles"
+              },
+              { key: "roles.view.details", description: "View role details" },
+              {
+                key: "roles.add",
+                description: "Add new roles"
+              },
+              {
+                key: "roles.edit.details",
+                description: "Edit role details"
+              },
+              {
+                key: "roles.delete",
+                description: "Delete roles"
+              }
+            ]
+          },
+          {
+            key: "invitations",
+            label: "Invitations",
+            permissions: [
+              {
+                key: "invitations.view",
+                description: "View invitations"
+              },
+              {
+                key: "invitations.view.details",
+                description: "View invitation details"
+              },
+              { key: "invitations.send", description: "Send invitations" },
+              { key: "invitations.revoke", description: "Revoke invitations" }
+            ]
+          }
+        ];
+        for (const app of apps.items) {
+          for (const module of modules) {
+            const existingGroup = await _getByKey(module.key);
+            if (!existingGroup) {
+              await _add({
+                app: app.code,
+                key: module.key,
+                label: module.label
+              });
+              logger25.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,
+                  description: permission.description
+                });
+              }
+            }
+          }
+          if (app.code === "admin") {
+            const modules2 = [
+              {
+                key: "applications",
+                label: "Applications",
+                permissions: [
+                  {
+                    key: "applications.add",
+                    description: "Add new applications"
+                  },
+                  {
+                    key: "applications.view",
+                    description: "View applications"
+                  },
+                  {
+                    key: "applications.view.details",
+                    description: "View application details"
+                  },
+                  {
+                    key: "applications.edit",
+                    description: "Edit existing applications"
+                  },
+                  {
+                    key: "applications.update.details",
+                    description: "Update application details"
+                  },
+                  {
+                    key: "applications.delete",
+                    description: "Delete applications"
+                  }
+                ]
+              },
+              {
+                key: "organizations",
+                label: "Organizations",
+                permissions: [
+                  {
+                    key: "organizations.add",
+                    description: "Add new organizations"
+                  },
+                  {
+                    key: "organizations.view",
+                    description: "View organizations"
+                  },
+                  {
+                    key: "organizations.view.details",
+                    description: "View organization details"
+                  },
+                  {
+                    key: "organizations.edit.status",
+                    description: "Edit organization status"
+                  },
+                  {
+                    key: "organizations.delete",
+                    description: "Delete organizations"
+                  }
+                ]
+              },
+              {
+                key: "users",
+                label: "Users",
+                permissions: [
+                  {
+                    key: "users.add",
+                    description: "Add new users"
+                  },
+                  {
+                    key: "users.view",
+                    description: "View users"
+                  },
+                  {
+                    key: "users.view.details",
+                    description: "View user details"
+                  },
+                  {
+                    key: "users.edit.status",
+                    description: "Edit user status"
+                  },
+                  {
+                    key: "users.delete",
+                    description: "Delete users"
+                  }
+                ]
+              },
+              {
+                key: "subscriptions",
+                label: "Subscriptions",
+                permissions: [
+                  {
+                    key: "subscriptions.view",
+                    description: "View subscriptions"
+                  },
+                  {
+                    key: "subscriptions.view.details",
+                    description: "View subscription details"
+                  },
+                  {
+                    key: "subscriptions.edit.details",
+                    description: "Edit subscription details"
+                  }
+                ]
+              },
+              {
+                key: "promo.codes",
+                label: "Promo Codes",
+                permissions: [
+                  {
+                    key: "promo.codes.view",
+                    description: "View promo codes"
+                  },
+                  {
+                    key: "promo.codes.view.details",
+                    description: "View promo code details"
+                  },
+                  {
+                    key: "promo.codes.add",
+                    description: "Add new promo codes"
+                  },
+                  {
+                    key: "promo.codes.edit.details",
+                    description: "Edit promo code details"
+                  },
+                  {
+                    key: "promo.codes.update.status",
+                    description: "Update promo code status"
+                  },
+                  {
+                    key: "promo.codes.delete",
+                    description: "Delete promo codes"
+                  }
+                ]
+              },
+              {
+                key: "affiliates",
+                label: "Affiliates",
+                permissions: [
+                  {
+                    key: "affiliates.view",
+                    description: "View affiliates"
+                  },
+                  {
+                    key: "affiliates.view.details",
+                    description: "View affiliate details"
+                  },
+                  {
+                    key: "affiliates.edit.status",
+                    description: "Edit affiliate status"
+                  }
+                ]
+              }
+            ];
+            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
+                });
+                logger25.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,
+                    description: permission.description
+                  });
+                }
+              }
+            }
+          }
+        }
+        await session.commitTransaction();
+      }
+      logger25.log({
+        level: "info",
+        message: "Default permission groups added successfully."
+      });
+      return;
+    } catch (error) {
+      console.log(error);
+      await session.abortTransaction();
+      throw error;
+    } finally {
+      await session.endSession();
+    }
+  }
+  if (!init4) {
+    addDefaultModule().catch((error) => {
+      logger25.log({
+        level: "error",
+        message: `Error in addDefaultModule: ${error}`
+      });
+    });
+    init4 = true;
+  }
   async function deleteById(id) {
     const permission = await _getById(id);
     if (!permission) {
@@ -7758,7 +8313,7 @@ function usePermissionGroupService() {
     }
     const associatedPermissionsCount = await countByGroup(permission.key);
     if (associatedPermissionsCount > 0) {
-      throw new Error(
+      throw new BadRequestError42(
         "Cannot delete Permission Group with associated Permissions."
       );
     }
@@ -7766,7 +8321,11 @@ function usePermissionGroupService() {
       await _deleteById(id);
       return "Permission deleted successfully.";
     } catch (error) {
-      throw error;
+      if (error instanceof AppError16) {
+        throw error;
+      } else {
+        throw new InternalServerError22("Failed to delete Permission Group.");
+      }
     }
   }
   return {
@@ -7775,8 +8334,8 @@ function usePermissionGroupService() {
 }
 
 // src/resources/permission/permission.group.controller.ts
-import { BadRequestError as BadRequestError42, logger as logger24 } from "@goweekdays/utils";
-import Joi24 from "joi";
+import { BadRequestError as BadRequestError43, logger as logger26 } from "@goweekdays/utils";
+import Joi27 from "joi";
 function usePermissionGroupController() {
   const {
     getAll: _getAll,
@@ -7789,8 +8348,8 @@ function usePermissionGroupController() {
     const value = req.body;
     const { error } = schemaPermissionGroup.validate(value);
     if (error) {
-      next(new BadRequestError42(error.message));
-      logger24.info(`Controller: ${error.message}`);
+      next(new BadRequestError43(error.message));
+      logger26.info(`Controller: ${error.message}`);
       return;
     }
     try {
@@ -7803,16 +8362,16 @@ function usePermissionGroupController() {
   }
   async function getAll(req, res, next) {
     const query = req.query;
-    const validation = Joi24.object({
-      page: Joi24.number().min(1).optional().allow("", null),
-      limit: Joi24.number().min(1).optional().allow("", null),
-      search: Joi24.string().optional().allow("", null),
-      app: Joi24.string().optional().allow("", null),
-      status: Joi24.string().optional().allow("", null)
+    const validation = Joi27.object({
+      page: Joi27.number().min(1).optional().allow("", null),
+      limit: Joi27.number().min(1).optional().allow("", null),
+      search: Joi27.string().optional().allow("", null),
+      app: Joi27.string().optional().allow("", null),
+      status: Joi27.string().optional().allow("", null)
     });
     const { error } = validation.validate(query);
     if (error) {
-      next(new BadRequestError42(error.message));
+      next(new BadRequestError43(error.message));
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
@@ -7846,12 +8405,12 @@ function usePermissionGroupController() {
   }
   async function getById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi24.object({
-      id: Joi24.string().hex().required()
+    const validation = Joi27.object({
+      id: Joi27.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError42(error.message));
+      next(new BadRequestError43(error.message));
       return;
     }
     try {
@@ -7867,12 +8426,12 @@ function usePermissionGroupController() {
   }
   async function deleteById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi24.object({
-      id: Joi24.string().hex().required()
+    const validation = Joi27.object({
+      id: Joi27.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError42(error.message));
+      next(new BadRequestError43(error.message));
       return;
     }
     try {
@@ -7885,15 +8444,15 @@ function usePermissionGroupController() {
   }
   async function updateById(req, res, next) {
     const id = req.params.id;
-    const { error: errorId } = Joi24.string().hex().required().validate(id);
+    const { error: errorId } = Joi27.string().hex().required().validate(id);
     if (errorId) {
-      next(new BadRequestError42(errorId.message));
+      next(new BadRequestError43(errorId.message));
       return;
     }
     const payload = req.body;
     const { error } = schemaPermissionGroupUpdate.validate(payload);
     if (error) {
-      next(new BadRequestError42(error.message));
+      next(new BadRequestError43(error.message));
       return;
     }
     try {