@goweekdays/core 2.1.2 → 2.1.3

package/dist/index.mjs

@@ -6876,259 +6876,27 @@ function useAppRepo() {
 }
 
 // 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,
-    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);
-      return "App deleted successfully.";
-    } catch (error) {
-      throw error;
-    }
-  }
-  return {
-    deleteById
-  };
-}
+import { logger as logger25, useAtlas as useAtlas22 } from "@goweekdays/utils";
 
-// src/resources/app/app.controller.ts
+// src/resources/permission/permission.model.ts
 import { BadRequestError as BadRequestError36 } from "@goweekdays/utils";
 import Joi21 from "joi";
-function useAppController() {
-  const {
-    getAll: _getAll,
-    getById: _getById,
-    add: _add,
-    updateById: _updateById
-  } = useAppRepo();
-  const { deleteById: _deleteById } = useAppService();
-  async function add(req, res, next) {
-    const value = req.body;
-    const { error } = schemaApp.validate(value);
-    if (error) {
-      next(new BadRequestError36(error.message));
-      return;
-    }
-    try {
-      const result = await _add(value);
-      res.json(result);
-      return;
-    } catch (error2) {
-      next(error2);
-    }
-  }
-  async function updateById(req, res, next) {
-    const id = req.params.id ?? "";
-    const { error: errorId } = Joi21.string().hex().required().validate(id);
-    if (errorId) {
-      next(new BadRequestError36(errorId.message));
-      return;
-    }
-    const value = req.body;
-    const { error } = schemaAppUpdate.validate(value);
-    if (error) {
-      next(new BadRequestError36(error.message));
-      return;
-    }
-    try {
-      const result = await _updateById(req.params.id, value);
-      res.json(result);
-      return;
-    } catch (error2) {
-      next(error2);
-    }
-  }
-  async function getAll(req, res, next) {
-    const query = req.query;
-    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) {
-      next(new BadRequestError36(error.message));
-      return;
-    }
-    const page = parseInt(req.query.page) ?? 1;
-    let limit = parseInt(req.query.limit) ?? 20;
-    limit = isNaN(limit) ? 20 : limit;
-    const sort = req.query.sort ? String(req.query.sort).split(",") : "";
-    const sortOrder = req.query.sortOrder ? String(req.query.sortOrder).split(",") : "";
-    const sortObj = {};
-    if (sort && Array.isArray(sort) && sort.length && sortOrder && Array.isArray(sortOrder) && sortOrder.length) {
-      sort.forEach((field, index) => {
-        sortObj[field] = sortOrder[index] === "desc" ? -1 : 1;
-      });
-    }
-    const status = req.query.status ?? "active";
-    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,
-        search,
-        type
-      });
-      res.json(buildings);
-      return;
-    } catch (error2) {
-      next(error2);
-    }
-  }
-  async function getById(req, res, next) {
-    const id = req.params.id;
-    const validation = Joi21.object({
-      id: Joi21.string().hex().required()
-    });
-    const { error } = validation.validate({ id });
-    if (error) {
-      next(new BadRequestError36(error.message));
-      return;
-    }
-    try {
-      const data = await _getById(id);
-      res.json({
-        message: "Successfully retrieved app.",
-        data
-      });
-      return;
-    } catch (error2) {
-      next(error2);
-    }
-  }
-  async function deleteById(req, res, next) {
-    const id = req.params.id;
-    const validation = Joi21.object({
-      id: Joi21.string().hex().required()
-    });
-    const { error } = validation.validate({ id });
-    if (error) {
-      next(new BadRequestError36(error.message));
-      return;
-    }
-    try {
-      const message = await _deleteById(id);
-      res.json(message);
-      return;
-    } catch (error2) {
-      next(error2);
-    }
-  }
-  return {
-    add,
-    updateById,
-    getAll,
-    getById,
-    deleteById
-  };
-}
-
-// src/resources/permission/permission.model.ts
-import { BadRequestError as BadRequestError37 } from "@goweekdays/utils";
-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 schemaPermission = Joi21.object({
+  app: Joi21.string().required(),
+  key: Joi21.string().required(),
+  group: Joi21.string().required(),
+  description: Joi21.string().required(),
+  deprecated: Joi21.boolean().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)
+var schemaPermissionUpdate = Joi21.object({
+  key: Joi21.string().optional().allow("", null),
+  group: Joi21.string().optional().allow("", null),
+  description: Joi21.string().max(1024).optional().allow("", null)
 });
 function modelPermission(value) {
   const { error } = schemaPermission.validate(value);
   if (error) {
-    throw new BadRequestError37(error.message);
+    throw new BadRequestError36(error.message);
   }
   return {
     _id: value._id,
@@ -7147,18 +6915,18 @@ function modelPermission(value) {
 // src/resources/permission/permission.repository.ts
 import {
   AppError as AppError14,
-  BadRequestError as BadRequestError38,
+  BadRequestError as BadRequestError37,
   InternalServerError as InternalServerError20,
-  logger as logger22,
+  logger as logger20,
   makeCacheKey as makeCacheKey14,
   paginate as paginate10,
-  useAtlas as useAtlas20,
+  useAtlas as useAtlas19,
   useCache as useCache15
 } from "@goweekdays/utils";
 import { ObjectId as ObjectId20 } from "mongodb";
-import Joi23 from "joi";
+import Joi22 from "joi";
 function usePermissionRepo() {
-  const db = useAtlas20.getDb();
+  const db = useAtlas19.getDb();
   if (!db) {
     throw new Error("Unable to connect to server.");
   }
@@ -7186,7 +6954,7 @@ function usePermissionRepo() {
     }
   }
   createIndexes().catch((error) => {
-    logger22.log({ level: "error", message: `Index creation error: ${error}` });
+    logger20.log({ level: "error", message: `Index creation error: ${error}` });
   });
   async function add(value, session) {
     try {
@@ -7195,7 +6963,7 @@ function usePermissionRepo() {
       delCachedData();
       return res.insertedId;
     } catch (error) {
-      logger22.log({
+      logger20.log({
         level: "error",
         message: error.message
       });
@@ -7204,7 +6972,7 @@ function usePermissionRepo() {
       } else {
         const isDuplicated = error.message.includes("duplicate");
         if (isDuplicated) {
-          throw new BadRequestError38("Permission already exists.");
+          throw new BadRequestError37("Permission already exists.");
         }
         throw new Error("Failed to create permission.");
       }
@@ -7214,11 +6982,11 @@ function usePermissionRepo() {
     try {
       _id = new ObjectId20(_id);
     } catch (error2) {
-      throw new BadRequestError38("Invalid ID.");
+      throw new BadRequestError37("Invalid ID.");
     }
     const { error } = schemaPermissionUpdate.validate(value);
     if (error) {
-      throw new BadRequestError38(`Invalid data: ${error.message}`);
+      throw new BadRequestError37(`Invalid data: ${error.message}`);
     }
     try {
       const res = await collection.updateOne(
@@ -7229,7 +6997,7 @@ function usePermissionRepo() {
       delCachedData();
       return res;
     } catch (error2) {
-      logger22.log({
+      logger20.log({
         level: "error",
         message: error2.message
       });
@@ -7267,14 +7035,14 @@ function usePermissionRepo() {
       cacheParams.app = app;
     }
     const cacheKey = makeCacheKey14(namespace_collection, cacheParams);
-    logger22.log({
+    logger20.log({
       level: "info",
       message: `Cache key for getAll permissions: ${cacheKey}`
     });
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger22.log({
+        logger20.log({
           level: "info",
           message: `Cache hit for getAll permissions: ${cacheKey}`
         });
@@ -7289,19 +7057,19 @@ function usePermissionRepo() {
       const length = await collection.countDocuments(query);
       const data = paginate10(items, page, limit, length);
       setCache(cacheKey, data, 600).then(() => {
-        logger22.log({
+        logger20.log({
           level: "info",
           message: `Cache set for getAll permissions: ${cacheKey}`
         });
       }).catch((err) => {
-        logger22.log({
+        logger20.log({
           level: "error",
           message: `Failed to set cache for getAll permissions: ${err.message}`
         });
       });
       return data;
     } catch (error) {
-      logger22.log({ level: "error", message: `${error}` });
+      logger20.log({ level: "error", message: `${error}` });
       throw error;
     }
   }
@@ -7309,13 +7077,13 @@ function usePermissionRepo() {
     try {
       _id = new ObjectId20(_id);
     } catch (error) {
-      throw new BadRequestError38("Invalid ID.");
+      throw new BadRequestError37("Invalid ID.");
     }
     const cacheKey = makeCacheKey14(namespace_collection, { _id: String(_id) });
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger22.log({
+        logger20.log({
           level: "info",
           message: `Cache hit for getById permission: ${cacheKey}`
         });
@@ -7325,12 +7093,12 @@ function usePermissionRepo() {
         _id
       });
       setCache(cacheKey, result, 300).then(() => {
-        logger22.log({
+        logger20.log({
           level: "info",
           message: `Cache set for permission by id: ${cacheKey}`
         });
       }).catch((err) => {
-        logger22.log({
+        logger20.log({
           level: "error",
           message: `Failed to set cache for permission by id: ${err.message}`
         });
@@ -7344,14 +7112,15 @@ function usePermissionRepo() {
       }
     }
   }
-  async function getByKey(key, group) {
-    const validation = Joi23.object({
-      key: Joi23.string().required(),
-      group: Joi23.string().optional().allow("", null)
+  async function getByKey(key, group, app) {
+    const validation = Joi22.object({
+      key: Joi22.string().required(),
+      group: Joi22.string().optional().allow("", null),
+      app: Joi22.string().optional().allow("", null)
     });
     const { error } = validation.validate({ key, group });
     if (error) {
-      throw new BadRequestError38(`Invalid data: ${error.message}`);
+      throw new BadRequestError37(`Invalid data: ${error.message}`);
     }
     const query = {};
     const cacheKeyOptions = {};
@@ -7361,11 +7130,15 @@ function usePermissionRepo() {
       query.group = group;
       cacheKeyOptions.group = group;
     }
+    if (app) {
+      query.app = app;
+      cacheKeyOptions.app = app;
+    }
     const cacheKey = makeCacheKey14(namespace_collection, cacheKeyOptions);
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger22.log({
+        logger20.log({
           level: "info",
           message: `Cache hit for getById permission: ${cacheKey}`
         });
@@ -7373,12 +7146,12 @@ function usePermissionRepo() {
       }
       const result = await collection.findOne(query);
       setCache(cacheKey, result, 300).then(() => {
-        logger22.log({
+        logger20.log({
           level: "info",
           message: `Cache set for permission by key: ${cacheKey}`
         });
       }).catch((err) => {
-        logger22.log({
+        logger20.log({
           level: "error",
           message: `Failed to set cache for permission by key: ${err.message}`
         });
@@ -7400,7 +7173,7 @@ function usePermissionRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger22.log({
+        logger20.log({
           level: "info",
           message: `Cache hit for getById permission: ${cacheKey}`
         });
@@ -7410,12 +7183,12 @@ function usePermissionRepo() {
         group
       });
       setCache(cacheKey, result, 300).then(() => {
-        logger22.log({
+        logger20.log({
           level: "info",
           message: `Cache set for permission count by group: ${cacheKey}`
         });
       }).catch((err) => {
-        logger22.log({
+        logger20.log({
           level: "error",
           message: `Failed to set cache for permission by group: ${err.message}`
         });
@@ -7433,7 +7206,7 @@ function usePermissionRepo() {
     try {
       _id = new ObjectId20(_id);
     } catch (error) {
-      throw new BadRequestError38("Invalid ID.");
+      throw new BadRequestError37("Invalid ID.");
     }
     try {
       const res = await collection.updateOne(
@@ -7443,7 +7216,7 @@ function usePermissionRepo() {
       delCachedData();
       return res;
     } catch (error) {
-      logger22.log({
+      logger20.log({
         level: "error",
         message: error.message
       });
@@ -7456,12 +7229,12 @@ function usePermissionRepo() {
   }
   function delCachedData() {
     delNamespace().then(() => {
-      logger22.log({
+      logger20.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
       });
     }).catch((err) => {
-      logger22.log({
+      logger20.log({
         level: "error",
         message: `Failed to clear cache namespace for ${namespace_collection}: ${err.message}`
       });
@@ -7500,8 +7273,8 @@ function usePermissionService() {
 }
 
 // src/resources/permission/permission.controller.ts
-import { BadRequestError as BadRequestError39, logger as logger23 } from "@goweekdays/utils";
-import Joi24 from "joi";
+import { BadRequestError as BadRequestError38, logger as logger21 } from "@goweekdays/utils";
+import Joi23 from "joi";
 function usePermissionController() {
   const {
     getAll: _getAll,
@@ -7514,8 +7287,8 @@ function usePermissionController() {
     const value = req.body;
     const { error } = schemaPermission.validate(value);
     if (error) {
-      next(new BadRequestError39(error.message));
-      logger23.info(`Controller: ${error.message}`);
+      next(new BadRequestError38(error.message));
+      logger21.info(`Controller: ${error.message}`);
       return;
     }
     try {
@@ -7528,16 +7301,16 @@ function usePermissionController() {
   }
   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 = Joi23.object({
+      page: Joi23.number().min(1).optional().allow("", null),
+      limit: Joi23.number().min(1).optional().allow("", null),
+      search: Joi23.string().optional().allow("", null),
+      app: Joi23.string().optional().allow("", null),
+      status: Joi23.string().optional().allow("", null)
     });
     const { error } = validation.validate(query);
     if (error) {
-      next(new BadRequestError39(error.message));
+      next(new BadRequestError38(error.message));
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
@@ -7571,12 +7344,12 @@ function usePermissionController() {
   }
   async function getById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi24.object({
-      id: Joi24.string().hex().required()
+    const validation = Joi23.object({
+      id: Joi23.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError39(error.message));
+      next(new BadRequestError38(error.message));
       return;
     }
     try {
@@ -7592,12 +7365,12 @@ function usePermissionController() {
   }
   async function deleteById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi24.object({
-      id: Joi24.string().hex().required()
+    const validation = Joi23.object({
+      id: Joi23.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError39(error.message));
+      next(new BadRequestError38(error.message));
       return;
     }
     try {
@@ -7610,15 +7383,15 @@ function usePermissionController() {
   }
   async function updateById(req, res, next) {
     const id = req.params.id;
-    const { error: errorId } = Joi24.string().hex().required().validate(id);
+    const { error: errorId } = Joi23.string().hex().required().validate(id);
     if (errorId) {
-      next(new BadRequestError39(errorId.message));
+      next(new BadRequestError38(errorId.message));
       return;
     }
     const payload = req.body;
     const { error } = schemaPermissionUpdate.validate(payload);
     if (error) {
-      next(new BadRequestError39(error.message));
+      next(new BadRequestError38(error.message));
       return;
     }
     try {
@@ -7639,23 +7412,23 @@ function usePermissionController() {
 }
 
 // src/resources/permission/permission.group.model.ts
-import { BadRequestError as BadRequestError40 } from "@goweekdays/utils";
-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)
+import { BadRequestError as BadRequestError39 } from "@goweekdays/utils";
+import Joi24 from "joi";
+var schemaPermissionGroup = Joi24.object({
+  app: Joi24.string().required(),
+  key: Joi24.string().required(),
+  label: Joi24.string().required(),
+  order: Joi24.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)
+var schemaPermissionGroupUpdate = Joi24.object({
+  key: Joi24.string().optional().allow("", null),
+  label: Joi24.string().optional().allow("", null),
+  order: Joi24.number().integer().optional().allow("", null)
 });
 function modelPermissionGroup(value) {
   const { error } = schemaPermissionGroup.validate(value);
   if (error) {
-    throw new BadRequestError40(error.message);
+    throw new BadRequestError39(error.message);
   }
   return {
     _id: value._id,
@@ -7673,19 +7446,19 @@ function modelPermissionGroup(value) {
 // src/resources/permission/permission.group.repository.ts
 import {
   AppError as AppError15,
-  BadRequestError as BadRequestError41,
+  BadRequestError as BadRequestError40,
   InternalServerError as InternalServerError21,
-  logger as logger24,
+  logger as logger22,
   makeCacheKey as makeCacheKey15,
   paginate as paginate11,
-  useAtlas as useAtlas21,
+  useAtlas as useAtlas20,
   useCache as useCache16
 } from "@goweekdays/utils";
 import { ObjectId as ObjectId21 } from "mongodb";
-import Joi26 from "joi";
-var init3 = false;
+import Joi25 from "joi";
+var init2 = false;
 function usePermissionGroupRepo() {
-  const db = useAtlas21.getDb();
+  const db = useAtlas20.getDb();
   if (!db) {
     throw new Error("Unable to connect to server.");
   }
@@ -7712,24 +7485,23 @@ function usePermissionGroupRepo() {
       throw new Error("Failed to create index on permission groups.");
     }
   }
-  if (!init3) {
+  if (!init2) {
     createIndexes().catch((error) => {
-      logger24.log({
+      logger22.log({
         level: "error",
         message: `Index creation error: ${error}`
       });
     });
-    init3 = true;
+    init2 = 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) {
-      logger24.log({
+      logger22.log({
         level: "error",
         message: error.message
       });
@@ -7738,7 +7510,7 @@ function usePermissionGroupRepo() {
       } else {
         const isDuplicated = error.message.includes("duplicate");
         if (isDuplicated) {
-          throw new BadRequestError41("Permission group already exists.");
+          throw new BadRequestError40("Permission group already exists.");
         }
         throw new Error("Failed to create permission group.");
       }
@@ -7748,11 +7520,11 @@ function usePermissionGroupRepo() {
     try {
       _id = new ObjectId21(_id);
     } catch (error2) {
-      throw new BadRequestError41("Invalid ID.");
+      throw new BadRequestError40("Invalid ID.");
     }
     const { error } = schemaPermissionGroupUpdate.validate(value);
     if (error) {
-      throw new BadRequestError41(`Invalid data: ${error.message}`);
+      throw new BadRequestError40(`Invalid data: ${error.message}`);
     }
     try {
       const res = await collection.updateOne(
@@ -7763,7 +7535,7 @@ function usePermissionGroupRepo() {
       delCachedData();
       return res;
     } catch (error2) {
-      logger24.log({
+      logger22.log({
         level: "error",
         message: error2.message
       });
@@ -7801,14 +7573,14 @@ function usePermissionGroupRepo() {
       cacheParams.app = app;
     }
     const cacheKey = makeCacheKey15(namespace_collection, cacheParams);
-    logger24.log({
+    logger22.log({
       level: "info",
       message: `Cache key for getAll permission groups: ${cacheKey}`
     });
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger24.log({
+        logger22.log({
           level: "info",
           message: `Cache hit for getAll permission groups: ${cacheKey}`
         });
@@ -7823,19 +7595,19 @@ function usePermissionGroupRepo() {
       const length = await collection.countDocuments(query);
       const data = paginate11(items, page, limit, length);
       setCache(cacheKey, data, 600).then(() => {
-        logger24.log({
+        logger22.log({
           level: "info",
           message: `Cache set for getAll permission groups: ${cacheKey}`
         });
       }).catch((err) => {
-        logger24.log({
+        logger22.log({
           level: "error",
           message: `Failed to set cache for getAll permission groups: ${err.message}`
         });
       });
       return data;
     } catch (error) {
-      logger24.log({ level: "error", message: `${error}` });
+      logger22.log({ level: "error", message: `${error}` });
       throw error;
     }
   }
@@ -7843,13 +7615,13 @@ function usePermissionGroupRepo() {
     try {
       _id = new ObjectId21(_id);
     } catch (error) {
-      throw new BadRequestError41("Invalid ID.");
+      throw new BadRequestError40("Invalid ID.");
     }
     const cacheKey = makeCacheKey15(namespace_collection, { _id: String(_id) });
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger24.log({
+        logger22.log({
           level: "info",
           message: `Cache hit for getById permission group: ${cacheKey}`
         });
@@ -7859,12 +7631,12 @@ function usePermissionGroupRepo() {
         _id
       });
       setCache(cacheKey, result, 300).then(() => {
-        logger24.log({
+        logger22.log({
           level: "info",
           message: `Cache set for permission group by id: ${cacheKey}`
         });
       }).catch((err) => {
-        logger24.log({
+        logger22.log({
           level: "error",
           message: `Failed to set cache for permission group by id: ${err.message}`
         });
@@ -7879,13 +7651,13 @@ function usePermissionGroupRepo() {
     }
   }
   async function getByKey(key, app) {
-    const validation = Joi26.object({
-      key: Joi26.string().required(),
-      app: Joi26.string().optional().allow(null, "")
+    const validation = Joi25.object({
+      key: Joi25.string().required(),
+      app: Joi25.string().optional().allow(null, "")
     });
     const { error } = validation.validate({ key, app });
     if (error) {
-      throw new BadRequestError41("Invalid key.");
+      throw new BadRequestError40("Invalid key.");
     }
     const query = { key };
     const cacheKeyOptions = { key, tag: "byKey" };
@@ -7897,7 +7669,7 @@ function usePermissionGroupRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger24.log({
+        logger22.log({
           level: "info",
           message: `Cache hit for getById permission group: ${cacheKey}`
         });
@@ -7905,12 +7677,12 @@ function usePermissionGroupRepo() {
       }
       const result = await collection.findOne(query);
       setCache(cacheKey, result, 300).then(() => {
-        logger24.log({
+        logger22.log({
           level: "info",
           message: `Cache set for permission group by key: ${cacheKey}`
         });
       }).catch((err) => {
-        logger24.log({
+        logger22.log({
           level: "error",
           message: `Failed to set cache for permission group by key: ${err.message}`
         });
@@ -7928,7 +7700,7 @@ function usePermissionGroupRepo() {
     try {
       _id = new ObjectId21(_id);
     } catch (error) {
-      throw new BadRequestError41("Invalid ID.");
+      throw new BadRequestError40("Invalid ID.");
     }
     try {
       const res = await collection.updateOne(
@@ -7938,7 +7710,7 @@ function usePermissionGroupRepo() {
       delCachedData();
       return res;
     } catch (error) {
-      logger24.log({
+      logger22.log({
         level: "error",
         message: error.message
       });
@@ -7951,12 +7723,12 @@ function usePermissionGroupRepo() {
   }
   function delCachedData() {
     delNamespace().then(() => {
-      logger24.log({
+      logger22.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
       });
     }).catch((err) => {
-      logger24.log({
+      logger22.log({
         level: "error",
         message: `Failed to clear cache namespace for ${namespace_collection}: ${err.message}`
       });
@@ -7976,12 +7748,11 @@ function usePermissionGroupRepo() {
 // src/resources/permission/permission.group.service.ts
 import {
   AppError as AppError16,
-  BadRequestError as BadRequestError42,
+  BadRequestError as BadRequestError41,
   InternalServerError as InternalServerError22,
-  logger as logger25,
-  useAtlas as useAtlas22
+  logger as logger23,
+  useAtlas as useAtlas21
 } from "@goweekdays/utils";
-var init4 = false;
 function usePermissionGroupService() {
   const {
     updateById: _updateById,
@@ -7997,7 +7768,7 @@ function usePermissionGroupService() {
     add: addPermission
   } = usePermissionRepo();
   async function addDefaultModule() {
-    const session = useAtlas22.getClient()?.startSession();
+    const session = useAtlas21.getClient()?.startSession();
     if (!session) {
       throw new Error("Failed to start database session.");
     }
@@ -8074,14 +7845,14 @@ function usePermissionGroupService() {
         ];
         for (const app of apps.items) {
           for (const module of modules) {
-            const existingGroup = await _getByKey(module.key);
+            const existingGroup = await _getByKey(module.key, app.code);
             if (!existingGroup) {
               await _add({
                 app: app.code,
                 key: module.key,
                 label: module.label
               });
-              logger25.log({
+              logger23.log({
                 level: "info",
                 message: `Default permission group added: ${app.code} - ${module.key}`
               });
@@ -8089,7 +7860,8 @@ function usePermissionGroupService() {
             for (const permission of module.permissions) {
               const existingPermission = await getPermissionByKey(
                 permission.key,
-                module.key
+                module.key,
+                app.code
               );
               if (!existingPermission) {
                 await addPermission({
@@ -8260,7 +8032,7 @@ function usePermissionGroupService() {
                   key: module.key,
                   label: module.label
                 });
-                logger25.log({
+                logger23.log({
                   level: "info",
                   message: `Default permission group added: ${app.code} - ${module.key}`
                 });
@@ -8284,7 +8056,7 @@ function usePermissionGroupService() {
         }
         await session.commitTransaction();
       }
-      logger25.log({
+      logger23.log({
         level: "info",
         message: "Default permission groups added successfully."
       });
@@ -8297,15 +8069,6 @@ function usePermissionGroupService() {
       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) {
@@ -8313,7 +8076,7 @@ function usePermissionGroupService() {
     }
     const associatedPermissionsCount = await countByGroup(permission.key);
     if (associatedPermissionsCount > 0) {
-      throw new BadRequestError42(
+      throw new BadRequestError41(
         "Cannot delete Permission Group with associated Permissions."
       );
     }
@@ -8329,13 +8092,14 @@ function usePermissionGroupService() {
     }
   }
   return {
+    addDefaultModule,
     deleteById
   };
 }
 
 // src/resources/permission/permission.group.controller.ts
-import { BadRequestError as BadRequestError43, logger as logger26 } from "@goweekdays/utils";
-import Joi27 from "joi";
+import { BadRequestError as BadRequestError42, logger as logger24 } from "@goweekdays/utils";
+import Joi26 from "joi";
 function usePermissionGroupController() {
   const {
     getAll: _getAll,
@@ -8348,8 +8112,8 @@ function usePermissionGroupController() {
     const value = req.body;
     const { error } = schemaPermissionGroup.validate(value);
     if (error) {
-      next(new BadRequestError43(error.message));
-      logger26.info(`Controller: ${error.message}`);
+      next(new BadRequestError42(error.message));
+      logger24.info(`Controller: ${error.message}`);
       return;
     }
     try {
@@ -8362,16 +8126,16 @@ function usePermissionGroupController() {
   }
   async function getAll(req, res, next) {
     const query = req.query;
-    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 validation = Joi26.object({
+      page: Joi26.number().min(1).optional().allow("", null),
+      limit: Joi26.number().min(1).optional().allow("", null),
+      search: Joi26.string().optional().allow("", null),
+      app: Joi26.string().optional().allow("", null),
+      status: Joi26.string().optional().allow("", null)
     });
     const { error } = validation.validate(query);
     if (error) {
-      next(new BadRequestError43(error.message));
+      next(new BadRequestError42(error.message));
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
@@ -8405,12 +8169,12 @@ function usePermissionGroupController() {
   }
   async function getById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi27.object({
-      id: Joi27.string().hex().required()
+    const validation = Joi26.object({
+      id: Joi26.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError43(error.message));
+      next(new BadRequestError42(error.message));
       return;
     }
     try {
@@ -8426,12 +8190,12 @@ function usePermissionGroupController() {
   }
   async function deleteById(req, res, next) {
     const id = req.params.id;
-    const validation = Joi27.object({
-      id: Joi27.string().hex().required()
+    const validation = Joi26.object({
+      id: Joi26.string().hex().required()
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError43(error.message));
+      next(new BadRequestError42(error.message));
       return;
     }
     try {
@@ -8444,15 +8208,15 @@ function usePermissionGroupController() {
   }
   async function updateById(req, res, next) {
     const id = req.params.id;
-    const { error: errorId } = Joi27.string().hex().required().validate(id);
+    const { error: errorId } = Joi26.string().hex().required().validate(id);
     if (errorId) {
-      next(new BadRequestError43(errorId.message));
+      next(new BadRequestError42(errorId.message));
       return;
     }
     const payload = req.body;
     const { error } = schemaPermissionGroupUpdate.validate(payload);
     if (error) {
-      next(new BadRequestError43(error.message));
+      next(new BadRequestError42(error.message));
       return;
     }
     try {
@@ -8471,6 +8235,248 @@ function usePermissionGroupController() {
     updateById
   };
 }
+
+// src/resources/app/app.service.ts
+var init3 = false;
+function useAppService() {
+  const {
+    updateById: _updateById,
+    getById: _getById,
+    deleteById: _deleteById,
+    getByCode: _getByCode,
+    add: _add
+  } = useAppRepo();
+  const { addDefaultModule } = usePermissionGroupService();
+  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 = useAtlas22.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();
+      logger25.log({
+        level: "info",
+        message: "Default apps added successfully."
+      });
+      return;
+    } catch (error) {
+      await session.abortTransaction();
+      logger25.log({
+        level: "error",
+        message: `Failed to add default apps: ${error}`
+      });
+      throw error;
+    } finally {
+      await session.endSession();
+    }
+  }
+  if (!init3) {
+    addDefaultApps().catch((error) => {
+      logger25.log({
+        level: "error",
+        message: `Error in addDefaultApps: ${error}`
+      });
+    }).then(() => {
+      addDefaultModule().catch((error) => {
+        logger25.log({
+          level: "error",
+          message: `Error in addDefaultModule: ${error}`
+        });
+      });
+    });
+    init3 = true;
+  }
+  async function deleteById(id) {
+    try {
+      await _deleteById(id);
+      return "App deleted successfully.";
+    } catch (error) {
+      throw error;
+    }
+  }
+  return {
+    deleteById
+  };
+}
+
+// src/resources/app/app.controller.ts
+import { BadRequestError as BadRequestError43 } from "@goweekdays/utils";
+import Joi27 from "joi";
+function useAppController() {
+  const {
+    getAll: _getAll,
+    getById: _getById,
+    add: _add,
+    updateById: _updateById
+  } = useAppRepo();
+  const { deleteById: _deleteById } = useAppService();
+  async function add(req, res, next) {
+    const value = req.body;
+    const { error } = schemaApp.validate(value);
+    if (error) {
+      next(new BadRequestError43(error.message));
+      return;
+    }
+    try {
+      const result = await _add(value);
+      res.json(result);
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
+  async function updateById(req, res, next) {
+    const id = req.params.id ?? "";
+    const { error: errorId } = Joi27.string().hex().required().validate(id);
+    if (errorId) {
+      next(new BadRequestError43(errorId.message));
+      return;
+    }
+    const value = req.body;
+    const { error } = schemaAppUpdate.validate(value);
+    if (error) {
+      next(new BadRequestError43(error.message));
+      return;
+    }
+    try {
+      const result = await _updateById(req.params.id, value);
+      res.json(result);
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
+  async function getAll(req, res, next) {
+    const query = req.query;
+    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),
+      status: Joi27.string().optional().allow("", null),
+      type: Joi27.string().optional().allow("", null)
+    });
+    const { error } = validation.validate(query);
+    if (error) {
+      next(new BadRequestError43(error.message));
+      return;
+    }
+    const page = parseInt(req.query.page) ?? 1;
+    let limit = parseInt(req.query.limit) ?? 20;
+    limit = isNaN(limit) ? 20 : limit;
+    const sort = req.query.sort ? String(req.query.sort).split(",") : "";
+    const sortOrder = req.query.sortOrder ? String(req.query.sortOrder).split(",") : "";
+    const sortObj = {};
+    if (sort && Array.isArray(sort) && sort.length && sortOrder && Array.isArray(sortOrder) && sortOrder.length) {
+      sort.forEach((field, index) => {
+        sortObj[field] = sortOrder[index] === "desc" ? -1 : 1;
+      });
+    }
+    const status = req.query.status ?? "active";
+    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,
+        search,
+        type
+      });
+      res.json(buildings);
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
+  async function getById(req, res, next) {
+    const id = req.params.id;
+    const validation = Joi27.object({
+      id: Joi27.string().hex().required()
+    });
+    const { error } = validation.validate({ id });
+    if (error) {
+      next(new BadRequestError43(error.message));
+      return;
+    }
+    try {
+      const data = await _getById(id);
+      res.json({
+        message: "Successfully retrieved app.",
+        data
+      });
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
+  async function deleteById(req, res, next) {
+    const id = req.params.id;
+    const validation = Joi27.object({
+      id: Joi27.string().hex().required()
+    });
+    const { error } = validation.validate({ id });
+    if (error) {
+      next(new BadRequestError43(error.message));
+      return;
+    }
+    try {
+      const message = await _deleteById(id);
+      res.json(message);
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
+  return {
+    add,
+    updateById,
+    getAll,
+    getById,
+    deleteById
+  };
+}
 export {
   ACCESS_TOKEN_EXPIRY,
   ACCESS_TOKEN_SECRET,