@eeplatform/core 1.0.1 → 1.0.3

package/dist/index.mjs

@@ -11368,9 +11368,9 @@ function useVerificationRepo() {
   }
   const namespace_collection = "verifications";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = useCache();
+  const { getCache, setCache, delNamespace } = useCache(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
+    delNamespace().then(() => {
       logger.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
@@ -11458,7 +11458,7 @@ function useVerificationRepo() {
         return cached;
       }
       const data = await collection.findOne({ _id });
-      setCache(cacheKey, data, 300, namespace_collection).then(() => {
+      setCache(cacheKey, data, 300).then(() => {
         logger.log({
           level: "info",
           message: `Cache set for verification by id: ${cacheKey}`
@@ -11538,7 +11538,7 @@ function useVerificationRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = paginate(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
+      setCache(cacheKey, data, 600).then(() => {
         logger.log({
           level: "info",
           message: `Cache set for getVerifications: ${cacheKey}`
@@ -11569,7 +11569,7 @@ function useVerificationRepo() {
         return cached;
       }
       const data = await collection.find({ type }).toArray();
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
+      setCache(cacheKey, data, 600).then(() => {
         logger.log({
           level: "info",
           message: `Cache set for verification by type: ${cacheKey}`
@@ -11703,10 +11703,12 @@ var MUser = class {
     this.createdAt = value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString();
     this.updatedAt = value.updatedAt ?? "";
     this.deletedAt = value.deletedAt ?? "";
-    try {
-      value.defaultOrg = new ObjectId3(value.defaultOrg);
-    } catch (error) {
-      throw new Error("Invalid defaultOrg ID.");
+    if (value.defaultOrg) {
+      try {
+        value.defaultOrg = new ObjectId3(value.defaultOrg);
+      } catch (error) {
+        throw new Error("Invalid defaultOrg ID.");
+      }
     }
     this.defaultOrg = value.defaultOrg;
   }
@@ -11729,9 +11731,9 @@ function useUserRepo() {
   }
   const namespace_collection = "users";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = useCache2();
+  const { getCache, setCache, delNamespace } = useCache2(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
+    delNamespace().then(() => {
       logger2.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
@@ -11793,7 +11795,7 @@ function useUserRepo() {
       }
       const result = await collection.findOne({ email });
       if (result) {
-        setCache(cacheKey, result, 300, namespace_collection).then(() => {
+        setCache(cacheKey, result, 300).then(() => {
           logger2.log({
             level: "info",
             message: `Cache set for user by email: ${cacheKey}`
@@ -11823,7 +11825,7 @@ function useUserRepo() {
       }
       const result = await collection.findOne({ referralCode });
       if (result) {
-        setCache(cacheKey, result, 300, namespace_collection).then(() => {
+        setCache(cacheKey, result, 300).then(() => {
           logger2.log({
             level: "info",
             message: `Cache set for user by referral code: ${cacheKey}`
@@ -11858,7 +11860,7 @@ function useUserRepo() {
       }
       const result = await collection.findOne({ _id });
       if (result) {
-        setCache(cacheKey, result, 300, namespace_collection).then(() => {
+        setCache(cacheKey, result, 300).then(() => {
           logger2.log({
             level: "info",
             message: `Cache set for user by id: ${cacheKey}`
@@ -11932,7 +11934,7 @@ function useUserRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = paginate2(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
+      setCache(cacheKey, data, 600).then(() => {
         logger2.log({
           level: "info",
           message: `Cache set for getUsers: ${cacheKey}`
@@ -12155,9 +12157,9 @@ function useMemberRepo() {
   }
   const namespace_collection = "members";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = useCache3();
+  const { getCache, setCache, delNamespace } = useCache3(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
+    delNamespace().then(() => {
       logger3.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
@@ -12248,7 +12250,7 @@ function useMemberRepo() {
         return cached;
       }
       const data = await collection.findOne({ _id });
-      setCache(cacheKey, data, 300, namespace_collection).then(() => {
+      setCache(cacheKey, data, 300).then(() => {
         logger3.log({
           level: "info",
           message: `Cache set for member by id: ${cacheKey}`
@@ -12285,7 +12287,7 @@ function useMemberRepo() {
         return cached;
       }
       const data = await collection.findOne({ user });
-      setCache(cacheKey, data, 300, namespace_collection).then(() => {
+      setCache(cacheKey, data, 300).then(() => {
         logger3.log({
           level: "info",
           message: `Cache set for member by user ID: ${cacheKey}`
@@ -12338,7 +12340,7 @@ function useMemberRepo() {
         return cached;
       }
       const data = await collection.findOne(query);
-      setCache(cacheKey, data, 300, namespace_collection).then(() => {
+      setCache(cacheKey, data, 300).then(() => {
         logger3.log({
           level: "info",
           message: `Cache set for member by user ID: ${cacheKey}`
@@ -12442,7 +12444,7 @@ function useMemberRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = paginate3(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
+      setCache(cacheKey, data, 600).then(() => {
         logger3.log({
           level: "info",
           message: `Cache set for getAll members: ${cacheKey}`
@@ -12477,7 +12479,7 @@ function useMemberRepo() {
         return cached;
       }
       const data = await collection.countDocuments({ org, status: "active" });
-      setCache(cacheKey, data, 300, namespace_collection).then(() => {
+      setCache(cacheKey, data, 300).then(() => {
         logger3.log({
           level: "info",
           message: `Cache set for countByOrg members: ${cacheKey}`
@@ -12514,7 +12516,7 @@ function useMemberRepo() {
         return cached;
       }
       const data = await collection.countDocuments({ user, status: "active" });
-      setCache(cacheKey, data, 300, namespace_collection).then(() => {
+      setCache(cacheKey, data, 300).then(() => {
         logger3.log({
           level: "info",
           message: `Cache set for countByUser members: ${cacheKey}`
@@ -12588,7 +12590,7 @@ function useMemberRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = paginate3(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
+      setCache(cacheKey, data, 600).then(() => {
         logger3.log({
           level: "info",
           message: `Cache set for getOrgsByMembership members: ${cacheKey}`
@@ -12666,7 +12668,7 @@ function useMemberRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = paginate3(items, page, limit, length);
-      setCache(cacheKey, data, 300, namespace_collection).then(() => {
+      setCache(cacheKey, data, 300).then(() => {
         logger3.log({
           level: "info",
           message: `Cache set for getOrgsByUserId members: ${cacheKey}`
@@ -12763,9 +12765,6 @@ function useVerificationService() {
     if (!metadata.app) {
       throw new BadRequestError6("App metadata is required.");
     }
-    if (!metadata.org || !metadata.orgName) {
-      throw new BadRequestError6("Organization metadata is required.");
-    }
     try {
       const user = await getUserByEmail(email);
       const dir = __dirname;
@@ -12777,7 +12776,7 @@ function useVerificationService() {
           context: {
             validity: VERIFICATION_USER_INVITE_DURATION,
             link: `${APP_MAIN}/verify/member-invite/${res2}`,
-            organization_name: metadata.orgName
+            organization_name: metadata.app === "admin" ? "Admin" : metadata.orgName
           },
           filePath: filePath2
         });
@@ -12948,11 +12947,6 @@ function useVerificationService() {
             "App metadata is required for member invite."
           );
         }
-        if (!_id.metadata?.org || !_id.metadata?.orgName) {
-          throw new BadRequestError6(
-            "Organization metadata is required for member invite."
-          );
-        }
         if (!_id.metadata?.role || !_id.metadata?.roleName) {
           throw new BadRequestError6(
             "Role metadata is required for member invite."
@@ -12962,8 +12956,8 @@ function useVerificationService() {
           {
             user: user._id?.toString() ?? "",
             type: _id.metadata?.app,
-            org: _id.metadata?.org,
-            orgName: _id.metadata?.orgName,
+            org: _id.metadata?.org ?? "",
+            orgName: _id.metadata?.orgName ?? "",
             role: _id.metadata?.role,
             roleName: _id.metadata?.roleName,
             name: `${user.firstName} ${user.lastName}`
@@ -13086,8 +13080,8 @@ function useVerificationController() {
       app: Joi2.string().required(),
       role: Joi2.string().hex().required(),
       roleName: Joi2.string().required(),
-      org: Joi2.string().required(),
-      orgName: Joi2.string().required()
+      org: Joi2.string().hex().optional().optional().allow("", null),
+      orgName: Joi2.string().optional().optional().allow("", null)
     });
     const { error } = validation.validate(req.body);
     if (error) {
@@ -13247,9 +13241,9 @@ function useTokenRepo() {
   }
   const namespace_collection = "tokens";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = useCache4();
+  const { getCache, setCache, delNamespace } = useCache4(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
+    delNamespace().then(() => {
       logger5.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
@@ -13288,7 +13282,7 @@ function useTokenRepo() {
       }
       const data = await collection.findOne({ token });
       if (data) {
-        setCache(cacheKey, data, 300, namespace_collection).then(() => {
+        setCache(cacheKey, data, 300).then(() => {
           logger5.log({
             level: "info",
             message: `Cache set for token: ${cacheKey}`
@@ -13364,9 +13358,9 @@ function useFileRepo() {
   }
   const namespace_collection = "files";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = useCache5();
+  const { getCache, setCache, delNamespace } = useCache5(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
+    delNamespace().then(() => {
       logger6.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
@@ -13414,7 +13408,7 @@ function useFileRepo() {
         return cached;
       }
       const data = await collection.find({ $and: [{ status: "draft" }, { status: null }] }).toArray();
-      setCache(cacheKey, data, 300, namespace_collection).then(() => {
+      setCache(cacheKey, data, 300).then(() => {
         logger6.log({
           level: "info",
           message: `Cache set for getAllDraftedFiles: ${cacheKey}`
@@ -13487,6 +13481,16 @@ var isPlainObject = (val) => {
   const prototype3 = getPrototypeOf(val);
   return (prototype3 === null || prototype3 === Object.prototype || Object.getPrototypeOf(prototype3) === null) && !(toStringTag in val) && !(iterator in val);
 };
+var isEmptyObject = (val) => {
+  if (!isObject(val) || isBuffer(val)) {
+    return false;
+  }
+  try {
+    return Object.keys(val).length === 0 && Object.getPrototypeOf(val) === Object.prototype;
+  } catch (e) {
+    return false;
+  }
+};
 var isDate = kindOfTest("Date");
 var isFile = kindOfTest("File");
 var isBlob = kindOfTest("Blob");
@@ -13514,6 +13518,9 @@ function forEach(obj, fn, { allOwnKeys = false } = {}) {
       fn.call(null, obj[i], i, obj);
     }
   } else {
+    if (isBuffer(obj)) {
+      return;
+    }
     const keys = allOwnKeys ? Object.getOwnPropertyNames(obj) : Object.keys(obj);
     const len = keys.length;
     let key;
@@ -13524,6 +13531,9 @@ function forEach(obj, fn, { allOwnKeys = false } = {}) {
   }
 }
 function findKey(obj, key) {
+  if (isBuffer(obj)) {
+    return null;
+  }
   key = key.toLowerCase();
   const keys = Object.keys(obj);
   let i = keys.length;
@@ -13720,6 +13730,9 @@ var toJSONObject = (obj) => {
       if (stack.indexOf(source) >= 0) {
         return;
       }
+      if (isBuffer(source)) {
+        return source;
+      }
       if (!("toJSON" in source)) {
         stack[i] = source;
         const target = isArray(source) ? [] : {};
@@ -13769,6 +13782,7 @@ var utils_default = {
   isBoolean,
   isObject,
   isPlainObject,
+  isEmptyObject,
   isReadableStream,
   isRequest,
   isResponse,
@@ -14213,15 +14227,16 @@ var platform_default = {
 
 // node_modules/axios/lib/helpers/toURLEncodedForm.js
 function toURLEncodedForm(data, options) {
-  return toFormData_default(data, new platform_default.classes.URLSearchParams(), Object.assign({
+  return toFormData_default(data, new platform_default.classes.URLSearchParams(), {
     visitor: function(value, key, path, helpers) {
       if (platform_default.isNode && utils_default.isBuffer(value)) {
         this.append(key, value.toString("base64"));
         return false;
       }
       return helpers.defaultVisitor.apply(this, arguments);
-    }
-  }, options));
+    },
+    ...options
+  });
 }
 
 // node_modules/axios/lib/helpers/formDataToJSON.js
@@ -14734,7 +14749,7 @@ import util2 from "util";
 import zlib from "zlib";
 
 // node_modules/axios/lib/env/data.js
-var VERSION = "1.10.0";
+var VERSION = "1.11.0";
 
 // node_modules/axios/lib/helpers/parseProtocol.js
 function parseProtocol(url2) {
@@ -15076,7 +15091,7 @@ function throttle(fn, freq) {
       clearTimeout(timer);
       timer = null;
     }
-    fn.apply(null, args);
+    fn(...args);
   };
   const throttled = (...args) => {
     const now = Date.now();
@@ -15751,7 +15766,7 @@ function mergeConfig(config1, config2) {
     validateStatus: mergeDirectKeys,
     headers: (a, b, prop) => mergeDeepProperties(headersToObject(a), headersToObject(b), prop, true)
   };
-  utils_default.forEach(Object.keys(Object.assign({}, config1, config2)), function computeConfigValue(prop) {
+  utils_default.forEach(Object.keys({ ...config1, ...config2 }), function computeConfigValue(prop) {
     const merge2 = mergeMap[prop] || mergeDeepProperties;
     const configValue = merge2(config1[prop], config2[prop], prop);
     utils_default.isUndefined(configValue) && merge2 !== mergeDirectKeys || (config3[prop] = configValue);
@@ -16465,8 +16480,8 @@ var Axios = class {
     let len;
     if (!synchronousRequestInterceptors) {
       const chain = [dispatchRequest.bind(this), void 0];
-      chain.unshift.apply(chain, requestInterceptorChain);
-      chain.push.apply(chain, responseInterceptorChain);
+      chain.unshift(...requestInterceptorChain);
+      chain.push(...responseInterceptorChain);
       len = chain.length;
       promise = Promise.resolve(config2);
       while (i < len) {
@@ -17448,9 +17463,9 @@ function useRoleRepo() {
   }
   const namespace_collection = "roles";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = useCache6();
+  const { getCache, setCache, delNamespace } = useCache6(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
+    delNamespace().then(() => {
       logger8.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
@@ -17523,7 +17538,7 @@ function useRoleRepo() {
         return cached;
       }
       const data = await collection.findOne({ user: value });
-      setCache(cacheKey, data, 300, namespace_collection).then(() => {
+      setCache(cacheKey, data, 300).then(() => {
         logger8.log({
           level: "info",
           message: `Cache set for role by user ID: ${cacheKey}`
@@ -17558,7 +17573,7 @@ function useRoleRepo() {
         return cached;
       }
       const data = await collection.findOne({ _id });
-      setCache(cacheKey, data, 300, namespace_collection).then(() => {
+      setCache(cacheKey, data, 300).then(() => {
         logger8.log({
           level: "info",
           message: `Cache set for role by id: ${cacheKey}`
@@ -17591,7 +17606,7 @@ function useRoleRepo() {
         return cached;
       }
       const data = await collection.findOne({ name });
-      setCache(cacheKey, data, 300, namespace_collection).then(() => {
+      setCache(cacheKey, data, 300).then(() => {
         logger8.log({
           level: "info",
           message: `Cache set for role by name: ${cacheKey}`
@@ -17665,7 +17680,7 @@ function useRoleRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = paginate4(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
+      setCache(cacheKey, data, 600).then(() => {
         logger8.log({
           level: "info",
           message: `Cache set for getRoles: ${cacheKey}`
@@ -17931,9 +17946,6 @@ function useUserService() {
         throw new BadRequestError11("Invitation expired.");
       }
       const email = invitation.email;
-      if (!invitation.metadata.org) {
-        throw new BadRequestError11("Invitation does not have an organization.");
-      }
       const _user = await getUserByEmail(invitation.email);
       let userId = _user?._id ?? "";
       if (!_user) {
@@ -17958,8 +17970,8 @@ function useUserService() {
           role: invitation.metadata?.role,
           roleName: invitation.metadata?.roleName,
           type: invitation.metadata?.app,
-          org: invitation.metadata?.org,
-          orgName: invitation.metadata?.orgName
+          org: invitation.metadata?.org ?? "",
+          orgName: invitation.metadata?.orgName ?? ""
         },
         session
       );
@@ -18382,11 +18394,14 @@ import {
   comparePassword,
   generateToken,
   InternalServerError as InternalServerError11,
-  NotFoundError as NotFoundError3
+  NotFoundError as NotFoundError3,
+  useCache as useCache8
 } from "@eeplatform/nodejs-utils";
 import jwt from "jsonwebtoken";
+import { v4 as uuidv4 } from "uuid";
 function useAuthService() {
   const expiresIn = "1m";
+  const { setCache, delCache } = useCache8("sessions");
   async function login({ email, password } = {}) {
     if (!email) {
       throw new BadRequestError13("Email is required");
@@ -18418,34 +18433,14 @@ function useAuthService() {
     if (!isPasswordValid) {
       throw new BadRequestError13("Invalid password");
     }
-    const metadata = { user: _user._id };
-    let refreshToken2;
-    try {
-      refreshToken2 = generateToken({
-        secret: REFRESH_TOKEN_SECRET,
-        metadata,
-        options: { expiresIn: "7d" }
-      });
-    } catch (error) {
-      throw new BadRequestError13("Error generating refresh token");
-    }
-    let accessToken;
-    try {
-      accessToken = generateToken({
-        secret: ACCESS_TOKEN_SECRET,
-        metadata,
-        options: { expiresIn }
-      });
-    } catch (error) {
-      throw new BadRequestError13("Error generating access token");
-    }
-    const user = _user._id ?? "";
-    try {
-      await useTokenRepo().createToken({ token: refreshToken2, user });
-    } catch (error) {
-      throw new BadRequestError13("Error creating refresh token");
-    }
-    return { accessToken, refreshToken: refreshToken2, id: _user._id };
+    const sid = uuidv4();
+    const cacheKey = `sid:${sid}`;
+    setCache(cacheKey, _user, 14400).then(() => {
+      console.log("Session ID cached successfully");
+    }).catch((error) => {
+      console.error("Error caching session ID:", error);
+    });
+    return { sid, user: _user._id?.toString() ?? "" };
   }
   async function refreshToken(token) {
     let decoded;
@@ -18479,26 +18474,13 @@ function useAuthService() {
     }
     return accessToken;
   }
-  async function logout(token) {
-    let _token;
-    try {
-      _token = await useTokenRepo().getToken(token);
-      if (!_token) {
-        throw new NotFoundError3("Invalid token");
-      }
-    } catch (error) {
-      if (error instanceof AppError5) {
-        throw error;
-      } else {
-        throw new InternalServerError11(`${error}`);
-      }
-    }
+  async function logout(sid) {
     try {
-      await useTokenRepo().deleteToken(token);
+      await delCache(`sid:${sid}`);
+      return "Session deleted successfully";
     } catch (error) {
       throw new InternalServerError11("Error deleting token");
     }
-    return "Logged out successfully";
   }
   return {
     login,
@@ -18512,7 +18494,8 @@ import Joi5 from "joi";
 import {
   AppError as AppError6,
   BadRequestError as BadRequestError14,
-  InternalServerError as InternalServerError12
+  InternalServerError as InternalServerError12,
+  logger as logger10
 } from "@eeplatform/nodejs-utils";
 function useAuthController() {
   const { signUp: _signUp } = useVerificationService();
@@ -18526,16 +18509,26 @@ function useAuthController() {
     const { error } = validation.validate({ email, password });
     if (error) {
       next(new BadRequestError14(error.message));
+      return;
     }
     try {
-      const token = await useAuthService().login({ email, password });
-      res.json(token);
+      const session = await useAuthService().login({
+        email,
+        password
+      });
+      res.json(session);
     } catch (error2) {
+      logger10.log({
+        level: "error",
+        message: `Error during login: ${error2.message}`
+      });
+      console.log(`Error during login: ${error2}`);
       if (error2 instanceof AppError6) {
         next(error2);
       } else {
         next(new InternalServerError12("An unexpected error occurred"));
       }
+      return;
     }
   }
   async function refreshToken(req, res, next) {
@@ -18556,13 +18549,13 @@ function useAuthController() {
     }
   }
   async function logout(req, res, next) {
-    const token = req.params.id || "";
-    if (!token) {
-      next(new BadRequestError14("Token is required"));
+    const sid = req.headers["authorization"] ?? "";
+    if (!sid) {
+      next(new BadRequestError14("Session ID is required"));
       return;
     }
     try {
-      await useAuthService().logout(token);
+      await useAuthService().logout(sid);
       res.json({ message: "Logged out successfully" });
     } catch (error) {
       if (error instanceof AppError6) {
@@ -18637,7 +18630,7 @@ function useAuthController() {
 }
 
 // src/services/file.service.ts
-import { logger as logger10, useS3 as useS32, useAtlas as useAtlas9 } from "@eeplatform/nodejs-utils";
+import { logger as logger11, useS3 as useS32, useAtlas as useAtlas9 } from "@eeplatform/nodejs-utils";
 import cron from "node-cron";
 function useFileService() {
   const {
@@ -18698,12 +18691,12 @@ function useFileService() {
         const file = files[index];
         try {
           await deleteFile(file._id.toString());
-          await logger10.log({
+          await logger11.log({
             level: "info",
             message: "Successfully deleted draft files."
           });
         } catch (error) {
-          logger10.log({
+          logger11.log({
             level: "info",
             message: "Successfully deleted draft files."
           });
@@ -18957,11 +18950,11 @@ import { ObjectId as ObjectId16 } from "mongodb";
 import {
   BadRequestError as BadRequestError17,
   InternalServerError as InternalServerError15,
-  logger as logger11,
+  logger as logger12,
   makeCacheKey as makeCacheKey8,
   paginate as paginate5,
   useAtlas as useAtlas10,
-  useCache as useCache8
+  useCache as useCache9
 } from "@eeplatform/nodejs-utils";
 function useEntityRepo() {
   const db = useAtlas10.getDb();
@@ -18970,15 +18963,15 @@ function useEntityRepo() {
   }
   const namespace_collection = "entities";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = useCache8();
+  const { getCache, setCache, delNamespace } = useCache9(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
-      logger11.log({
+    delNamespace().then(() => {
+      logger12.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
       });
     }).catch((err) => {
-      logger11.log({
+      logger12.log({
         level: "error",
         message: `Failed to clear cache namespace for ${namespace_collection}: ${err.message}`
       });
@@ -19008,7 +19001,7 @@ function useEntityRepo() {
       delCachedData();
       return res.insertedId.toString();
     } catch (error) {
-      logger11.log({ level: "error", message: `${error}` });
+      logger12.log({ level: "error", message: `${error}` });
       const isDuplicated = error.message.includes("duplicate");
       if (isDuplicated) {
         throw new BadRequestError17("Entity name already exists.");
@@ -19038,7 +19031,7 @@ function useEntityRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger11.log({
+        logger12.log({
           level: "info",
           message: `Cache hit for getEntities: ${cacheKey}`
         });
@@ -19052,20 +19045,20 @@ function useEntityRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = paginate5(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
-        logger11.log({
+      setCache(cacheKey, data, 600).then(() => {
+        logger12.log({
           level: "info",
           message: `Cache set for getEntities: ${cacheKey}`
         });
       }).catch((err) => {
-        logger11.log({
+        logger12.log({
           level: "error",
           message: `Failed to set cache for getEntities: ${err.message}`
         });
       });
       return data;
     } catch (error) {
-      logger11.log({ level: "error", message: `${error}` });
+      logger12.log({ level: "error", message: `${error}` });
       throw error;
     }
   }
@@ -19321,11 +19314,11 @@ function MSubscription(value) {
 // src/repositories/subscription.repository.ts
 import {
   BadRequestError as BadRequestError20,
-  logger as logger12,
+  logger as logger13,
   makeCacheKey as makeCacheKey9,
   paginate as paginate6,
   useAtlas as useAtlas11,
-  useCache as useCache9
+  useCache as useCache10
 } from "@eeplatform/nodejs-utils";
 import { ObjectId as ObjectId18 } from "mongodb";
 import Joi10 from "joi";
@@ -19336,15 +19329,15 @@ function useSubscriptionRepo() {
   }
   const namespace_collection = "subscriptions";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = useCache9();
+  const { getCache, setCache, delNamespace } = useCache10(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
-      logger12.log({
+    delNamespace().then(() => {
+      logger13.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
       });
     }).catch((err) => {
-      logger12.log({
+      logger13.log({
         level: "error",
         message: `Failed to clear cache namespace for ${namespace_collection}: ${err.message}`
       });
@@ -19396,7 +19389,7 @@ function useSubscriptionRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger12.log({
+        logger13.log({
           level: "info",
           message: `Cache hit for getById subscription: ${cacheKey}`
         });
@@ -19404,13 +19397,13 @@ function useSubscriptionRepo() {
       }
       const data = await collection.findOne({ _id });
       if (data) {
-        setCache(cacheKey, data, 300, namespace_collection).then(() => {
-          logger12.log({
+        setCache(cacheKey, data, 300).then(() => {
+          logger13.log({
             level: "info",
             message: `Cache set for subscription by ID: ${cacheKey}`
           });
         }).catch((err) => {
-          logger12.log({
+          logger13.log({
             level: "error",
             message: `Failed to set cache for subscription by ID: ${err.message}`
           });
@@ -19431,7 +19424,7 @@ function useSubscriptionRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger12.log({
+        logger13.log({
           level: "info",
           message: `Cache hit for getByUserId subscription: ${cacheKey}`
         });
@@ -19439,13 +19432,13 @@ function useSubscriptionRepo() {
       }
       const data = await collection.findOne({ user });
       if (data) {
-        setCache(cacheKey, data, 300, namespace_collection).then(() => {
-          logger12.log({
+        setCache(cacheKey, data, 300).then(() => {
+          logger13.log({
             level: "info",
             message: `Cache set for subscription by user ID: ${cacheKey}`
           });
         }).catch((err) => {
-          logger12.log({
+          logger13.log({
             level: "error",
             message: `Failed to set cache for subscription by user ID: ${err.message}`
           });
@@ -19491,7 +19484,7 @@ function useSubscriptionRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger12.log({
+        logger13.log({
           level: "info",
           message: `Cache hit for getBySubscriptionId: ${cacheKey}`
         });
@@ -19499,13 +19492,13 @@ function useSubscriptionRepo() {
       }
       const data = await collection.findOne({ subscriptionId });
       if (data) {
-        setCache(cacheKey, data, 300, namespace_collection).then(() => {
-          logger12.log({
+        setCache(cacheKey, data, 300).then(() => {
+          logger13.log({
             level: "info",
             message: `Cache set for subscription by subscription ID: ${cacheKey}`
           });
         }).catch((err) => {
-          logger12.log({
+          logger13.log({
             level: "error",
             message: `Failed to set cache for subscription by subscription ID: ${err.message}`
           });
@@ -19541,7 +19534,7 @@ function useSubscriptionRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger12.log({
+        logger13.log({
           level: "info",
           message: `Cache hit for getSubscriptions: ${cacheKey}`
         });
@@ -19555,20 +19548,20 @@ function useSubscriptionRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = paginate6(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
-        logger12.log({
+      setCache(cacheKey, data, 600).then(() => {
+        logger13.log({
           level: "info",
           message: `Cache set for getSubscriptions: ${cacheKey}`
         });
       }).catch((err) => {
-        logger12.log({
+        logger13.log({
           level: "error",
           message: `Failed to set cache for getSubscriptions: ${err.message}`
         });
       });
       return data;
     } catch (error) {
-      logger12.log({ level: "error", message: `${error}` });
+      logger13.log({ level: "error", message: `${error}` });
       throw error;
     }
   }
@@ -19715,10 +19708,10 @@ function useSubscriptionRepo() {
         },
         { session }
       );
-      logger12.info(`${res.modifiedCount} subscription updated.`);
+      logger13.info(`${res.modifiedCount} subscription updated.`);
       return "Successfully updated subscription.";
     } catch (error2) {
-      logger12.error(`${error2}`);
+      logger13.error(`${error2}`);
       throw new BadRequestError20("Failed to update subscription.");
     }
   }
@@ -19970,7 +19963,7 @@ function useSubscriptionRepo() {
 import {
   AppError as AppError9,
   BadRequestError as BadRequestError33,
-  logger as logger20,
+  logger as logger21,
   useAtlas as useAtlas19
 } from "@eeplatform/nodejs-utils";
 
@@ -19979,11 +19972,11 @@ import {
   AppError as AppError8,
   BadRequestError as BadRequestError22,
   InternalServerError as InternalServerError16,
-  logger as logger13,
+  logger as logger14,
   makeCacheKey as makeCacheKey10,
   paginate as paginate7,
   useAtlas as useAtlas12,
-  useCache as useCache10
+  useCache as useCache11
 } from "@eeplatform/nodejs-utils";
 
 // src/models/organization.model.ts
@@ -20038,7 +20031,7 @@ function useOrgRepo() {
   }
   const namespace_collection = "organizations";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = useCache10();
+  const { getCache, setCache, delNamespace } = useCache11(namespace_collection);
   async function createIndex() {
     try {
       await collection.createIndex([
@@ -20073,13 +20066,13 @@ function useOrgRepo() {
     }
   }
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
-      logger13.log({
+    delNamespace().then(() => {
+      logger14.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
       });
     }).catch((err) => {
-      logger13.log({
+      logger14.log({
         level: "error",
         message: `Failed to clear cache namespace for ${namespace_collection}: ${err.message}`
       });
@@ -20092,7 +20085,7 @@ function useOrgRepo() {
       delCachedData();
       return res.insertedId;
     } catch (error) {
-      logger13.log({
+      logger14.log({
         level: "error",
         message: error.message
       });
@@ -20127,14 +20120,14 @@ function useOrgRepo() {
       sort: JSON.stringify(sort),
       status
     });
-    logger13.log({
+    logger14.log({
       level: "info",
       message: `Cache key for getAll organizations: ${cacheKey}`
     });
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger13.log({
+        logger14.log({
           level: "info",
           message: `Cache hit for getAll organizations: ${cacheKey}`
         });
@@ -20157,20 +20150,20 @@ function useOrgRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = paginate7(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
-        logger13.log({
+      setCache(cacheKey, data, 600).then(() => {
+        logger14.log({
           level: "info",
           message: `Cache set for getAll organizations: ${cacheKey}`
         });
       }).catch((err) => {
-        logger13.log({
+        logger14.log({
           level: "error",
           message: `Failed to set cache for getAll organizations: ${err.message}`
         });
       });
       return data;
     } catch (error) {
-      logger13.log({ level: "error", message: `${error}` });
+      logger14.log({ level: "error", message: `${error}` });
       throw error;
     }
   }
@@ -20184,7 +20177,7 @@ function useOrgRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger13.log({
+        logger14.log({
           level: "info",
           message: `Cache hit for getById organization: ${cacheKey}`
         });
@@ -20194,13 +20187,13 @@ function useOrgRepo() {
       if (!result) {
         throw new BadRequestError22("Organization not found.");
       }
-      setCache(cacheKey, result, 300, namespace_collection).then(() => {
-        logger13.log({
+      setCache(cacheKey, result, 300).then(() => {
+        logger14.log({
           level: "info",
           message: `Cache set for organization by id: ${cacheKey}`
         });
       }).catch((err) => {
-        logger13.log({
+        logger14.log({
           level: "error",
           message: `Failed to set cache for organization by id: ${err.message}`
         });
@@ -20219,7 +20212,7 @@ function useOrgRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger13.log({
+        logger14.log({
           level: "info",
           message: `Cache hit for getByName organization: ${cacheKey}`
         });
@@ -20229,13 +20222,13 @@ function useOrgRepo() {
       if (!result) {
         throw new BadRequestError22("Organization not found.");
       }
-      setCache(cacheKey, result, 300, namespace_collection).then(() => {
-        logger13.log({
+      setCache(cacheKey, result, 300).then(() => {
+        logger14.log({
           level: "info",
           message: `Cache set for organization by name: ${cacheKey}`
         });
       }).catch((err) => {
-        logger13.log({
+        logger14.log({
           level: "error",
           message: `Failed to set cache for organization by name: ${err.message}`
         });
@@ -20308,9 +20301,9 @@ function useOrgRepo() {
 import {
   BadRequestError as BadRequestError24,
   useAtlas as useAtlas13,
-  useCache as useCache11,
+  useCache as useCache12,
   makeCacheKey as makeCacheKey11,
-  logger as logger14
+  logger as logger15
 } from "@eeplatform/nodejs-utils";
 
 // src/models/address.model.ts
@@ -20367,15 +20360,15 @@ function useAddressRepo() {
   }
   const namespace_collection = "addresses";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = useCache11();
+  const { getCache, setCache, delNamespace } = useCache12(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
-      logger14.log({
+    delNamespace().then(() => {
+      logger15.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
       });
     }).catch((err) => {
-      logger14.log({
+      logger15.log({
         level: "error",
         message: `Failed to clear cache namespace for ${namespace_collection}: ${err.message}`
       });
@@ -20437,7 +20430,7 @@ function useAddressRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger14.log({
+        logger15.log({
           level: "info",
           message: `Cache hit for getByUserId address: ${cacheKey}`
         });
@@ -20445,13 +20438,13 @@ function useAddressRepo() {
       }
       const data = await collection.findOne({ user });
       if (data) {
-        setCache(cacheKey, data, 300, namespace_collection).then(() => {
-          logger14.log({
+        setCache(cacheKey, data, 300).then(() => {
+          logger15.log({
             level: "info",
             message: `Cache set for address by user ID: ${cacheKey}`
           });
         }).catch((err) => {
-          logger14.log({
+          logger15.log({
             level: "error",
             message: `Failed to set cache for address by user ID: ${err.message}`
           });
@@ -20472,7 +20465,7 @@ function useAddressRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger14.log({
+        logger15.log({
           level: "info",
           message: `Cache hit for getByOrgId address: ${cacheKey}`
         });
@@ -20480,13 +20473,13 @@ function useAddressRepo() {
       }
       const data = await collection.findOne({ org });
       if (data) {
-        setCache(cacheKey, data, 300, namespace_collection).then(() => {
-          logger14.log({
+        setCache(cacheKey, data, 300).then(() => {
+          logger15.log({
             level: "info",
             message: `Cache set for address by org ID: ${cacheKey}`
           });
         }).catch((err) => {
-          logger14.log({
+          logger15.log({
             level: "error",
             message: `Failed to set cache for address by org ID: ${err.message}`
           });
@@ -20510,11 +20503,11 @@ function useAddressRepo() {
 import {
   BadRequestError as BadRequestError26,
   InternalServerError as InternalServerError17,
-  logger as logger15,
+  logger as logger16,
   makeCacheKey as makeCacheKey12,
   paginate as paginate8,
   useAtlas as useAtlas14,
-  useCache as useCache12
+  useCache as useCache13
 } from "@eeplatform/nodejs-utils";
 
 // src/validations/promo-code.schema.ts
@@ -20574,15 +20567,15 @@ function usePromoCodeRepo() {
   }
   const namespace_collection = "promo-codes";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = useCache12();
+  const { getCache, setCache, delNamespace } = useCache13(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
-      logger15.log({
+    delNamespace().then(() => {
+      logger16.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
       });
     }).catch((err) => {
-      logger15.log({
+      logger16.log({
         level: "error",
         message: `Failed to clear cache namespace for ${namespace_collection}: ${err.message}`
       });
@@ -20615,7 +20608,7 @@ function usePromoCodeRepo() {
       await collection.insertOne(value);
       delCachedData();
     } catch (error) {
-      logger15.log({ level: "error", message: `${error}` });
+      logger16.log({ level: "error", message: `${error}` });
       const isDuplicated = error.message.includes("duplicate");
       if (isDuplicated) {
         throw new BadRequestError26("Promo code already exists.");
@@ -20648,7 +20641,7 @@ function usePromoCodeRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger15.log({
+        logger16.log({
           level: "info",
           message: `Cache hit for getByCode promo code: ${cacheKey}`
         });
@@ -20656,13 +20649,13 @@ function usePromoCodeRepo() {
       }
       const data = await collection.findOne(query);
       if (data) {
-        setCache(cacheKey, data, 300, namespace_collection).then(() => {
-          logger15.log({
+        setCache(cacheKey, data, 300).then(() => {
+          logger16.log({
             level: "info",
             message: `Cache set for promo code by code: ${cacheKey}`
           });
         }).catch((err) => {
-          logger15.log({
+          logger16.log({
             level: "error",
             message: `Failed to set cache for promo code by code: ${err.message}`
           });
@@ -20690,7 +20683,7 @@ function usePromoCodeRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger15.log({
+        logger16.log({
           level: "info",
           message: `Cache hit for getById promo code: ${cacheKey}`
         });
@@ -20698,13 +20691,13 @@ function usePromoCodeRepo() {
       }
       const data = await collection.findOne({ _id });
       if (data) {
-        setCache(cacheKey, data, 300, namespace_collection).then(() => {
-          logger15.log({
+        setCache(cacheKey, data, 300).then(() => {
+          logger16.log({
             level: "info",
             message: `Cache set for promo code by ID: ${cacheKey}`
           });
         }).catch((err) => {
-          logger15.log({
+          logger16.log({
             level: "error",
             message: `Failed to set cache for promo code by ID: ${err.message}`
           });
@@ -20743,7 +20736,7 @@ function usePromoCodeRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger15.log({
+        logger16.log({
           level: "info",
           message: `Cache hit for getPromoCodes: ${cacheKey}`
         });
@@ -20757,20 +20750,20 @@ function usePromoCodeRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = paginate8(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
-        logger15.log({
+      setCache(cacheKey, data, 600).then(() => {
+        logger16.log({
           level: "info",
           message: `Cache set for getPromoCodes: ${cacheKey}`
         });
       }).catch((err) => {
-        logger15.log({
+        logger16.log({
           level: "error",
           message: `Failed to set cache for getPromoCodes: ${err.message}`
         });
       });
       return data;
     } catch (error) {
-      logger15.log({ level: "error", message: `${error}` });
+      logger16.log({ level: "error", message: `${error}` });
       throw new InternalServerError17("Internal server error.");
     }
   }
@@ -20817,7 +20810,7 @@ import Joi15 from "joi";
 import {
   BadRequestError as BadRequestError28,
   InternalServerError as InternalServerError18,
-  logger as logger16,
+  logger as logger17,
   paginate as paginate9,
   useAtlas as useAtlas15
 } from "@eeplatform/nodejs-utils";
@@ -20952,7 +20945,7 @@ function useInvoiceRepo() {
       value = createInvoice(value);
       await collection.insertOne(value, { session });
     } catch (error) {
-      logger16.log({ level: "error", message: `${error}` });
+      logger17.log({ level: "error", message: `${error}` });
       const isDuplicated = error.message.includes("duplicate");
       if (isDuplicated) {
         throw new BadRequestError28("Invoice already exists.");
@@ -21087,9 +21080,9 @@ function useInvoiceRepo() {
 // src/repositories/counter.repository.ts
 import {
   useAtlas as useAtlas16,
-  useCache as useCache13,
+  useCache as useCache14,
   makeCacheKey as makeCacheKey13,
-  logger as logger17
+  logger as logger18
 } from "@eeplatform/nodejs-utils";
 
 // src/models/counter.model.ts
@@ -21134,15 +21127,15 @@ function useCounterRepo() {
   }
   const namespace_collection = "counters";
   const { collection, createCounter } = useCounterModel(db);
-  const { getCache, setCache, delNamespace } = useCache13();
+  const { getCache, setCache, delNamespace } = useCache14(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
-      logger17.log({
+    delNamespace().then(() => {
+      logger18.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
       });
     }).catch((err) => {
-      logger17.log({
+      logger18.log({
         level: "error",
         message: `Failed to clear cache namespace for ${namespace_collection}: ${err.message}`
       });
@@ -21198,7 +21191,7 @@ function useCounterRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger17.log({
+        logger18.log({
           level: "info",
           message: `Cache hit for getByType counter: ${cacheKey}`
         });
@@ -21206,13 +21199,13 @@ function useCounterRepo() {
       }
       const data = await collection.findOne({ type });
       if (data) {
-        setCache(cacheKey, data, 300, namespace_collection).then(() => {
-          logger17.log({
+        setCache(cacheKey, data, 300).then(() => {
+          logger18.log({
             level: "info",
             message: `Cache set for counter by type: ${cacheKey}`
           });
         }).catch((err) => {
-          logger17.log({
+          logger18.log({
             level: "error",
             message: `Failed to set cache for counter by type: ${err.message}`
           });
@@ -21236,7 +21229,7 @@ function useCounterRepo() {
 import {
   BadRequestError as BadRequestError30,
   InternalServerError as InternalServerError19,
-  logger as logger18,
+  logger as logger19,
   paginate as paginate10,
   useAtlas as useAtlas17
 } from "@eeplatform/nodejs-utils";
@@ -21281,7 +21274,7 @@ function usePaymentRepo() {
       value = createPayment(value);
       await collection.insertOne(value, { session });
     } catch (error) {
-      logger18.log({ level: "error", message: `${error}` });
+      logger19.log({ level: "error", message: `${error}` });
       const isDuplicated = error.message.includes("duplicate");
       if (isDuplicated) {
         throw new BadRequestError30("Payment already exists.");
@@ -21326,7 +21319,7 @@ function usePaymentRepo() {
       const length = await collection.countDocuments(query);
       return paginate10(items, page, limit, length);
     } catch (error) {
-      logger18.log({ level: "error", message: `${error}` });
+      logger19.log({ level: "error", message: `${error}` });
       throw new InternalServerError19("Internal server error.");
     }
   }
@@ -21354,9 +21347,9 @@ function usePaymentRepo() {
 // src/repositories/price.repository.ts
 import {
   useAtlas as useAtlas18,
-  useCache as useCache14,
+  useCache as useCache15,
   makeCacheKey as makeCacheKey14,
-  logger as logger19
+  logger as logger20
 } from "@eeplatform/nodejs-utils";
 
 // src/models/price.model.ts
@@ -21410,15 +21403,15 @@ function usePriceRepo() {
   }
   const namespace_collection = "prices";
   const { collection, createPrice } = usePriceModel(db);
-  const { getCache, setCache, delNamespace } = useCache14();
+  const { getCache, setCache, delNamespace } = useCache15(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
-      logger19.log({
+    delNamespace().then(() => {
+      logger20.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
       });
     }).catch((err) => {
-      logger19.log({
+      logger20.log({
         level: "error",
         message: `Failed to clear cache namespace for ${namespace_collection}: ${err.message}`
       });
@@ -21474,7 +21467,7 @@ function usePriceRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger19.log({
+        logger20.log({
           level: "info",
           message: `Cache hit for getByNameType price: ${cacheKey}`
         });
@@ -21482,13 +21475,13 @@ function usePriceRepo() {
       }
       const data = await collection.findOne({ name, type });
       if (data) {
-        setCache(cacheKey, data, 300, namespace_collection).then(() => {
-          logger19.log({
+        setCache(cacheKey, data, 300).then(() => {
+          logger20.log({
             level: "info",
             message: `Cache set for price by name and type: ${cacheKey}`
           });
         }).catch((err) => {
-          logger19.log({
+          logger20.log({
             level: "error",
             message: `Failed to set cache for price by name and type: ${err.message}`
           });
@@ -22260,7 +22253,7 @@ function useSubscriptionService() {
     while (true) {
       const subscriptions = await getDueSubscriptions(batchSize);
       if (subscriptions.length === 0) {
-        logger20.log({
+        logger21.log({
           level: "info",
           message: "No more subscriptions to process."
         });
@@ -22400,14 +22393,14 @@ function useSubscriptionService() {
               );
               await session?.commitTransaction();
             }
-            logger20.log({
+            logger21.log({
               level: "info",
               message: `Processed subscription ${sub._id} successfully.`
             });
             return;
           } catch (error) {
             await session?.abortTransaction();
-            logger20.log({
+            logger21.log({
               level: "error",
               message: `Failed to process ${sub._id}: ${error}`
             });
@@ -22419,7 +22412,7 @@ function useSubscriptionService() {
           }
         })
       );
-      logger20.log({
+      logger21.log({
         level: "info",
         message: "Processed a batch of subscriptions."
       });
@@ -22716,7 +22709,7 @@ function useSubscriptionService() {
       await session?.commitTransaction();
     } catch (error2) {
       await session?.abortTransaction();
-      logger20.log({
+      logger21.log({
         level: "error",
         message: `Failed to update subscription seats: ${error2}`
       });
@@ -22917,7 +22910,7 @@ function useSubscriptionService() {
       await session?.commitTransaction();
     } catch (error2) {
       await session?.abortTransaction();
-      logger20.log({
+      logger21.log({
         level: "error",
         message: `Failed to update subscription seats: ${error2}`
       });
@@ -23018,7 +23011,7 @@ function useSubscriptionService() {
       await session?.commitTransaction();
     } catch (error) {
       await session?.abortTransaction();
-      logger20.log({
+      logger21.log({
         level: "error",
         message: `Failed to process subscription payment: ${error}`
       });
@@ -23521,7 +23514,7 @@ function MPaymentMethod(value) {
 import {
   BadRequestError as BadRequestError36,
   InternalServerError as InternalServerError20,
-  logger as logger21,
+  logger as logger22,
   useAtlas as useAtlas20
 } from "@eeplatform/nodejs-utils";
 import { ObjectId as ObjectId30 } from "mongodb";
@@ -23567,7 +23560,7 @@ function usePaymentMethodRepo() {
       await collection.insertOne(value, { session });
       return "Successfully added payment method.";
     } catch (error) {
-      logger21.log({ level: "error", message: `${error}` });
+      logger22.log({ level: "error", message: `${error}` });
       const isDuplicated = error.message.includes("duplicate");
       if (isDuplicated) {
         throw new BadRequestError36("Payment method already exist.");
@@ -24740,11 +24733,11 @@ import {
   AppError as AppError11,
   BadRequestError as BadRequestError44,
   InternalServerError as InternalServerError22,
-  logger as logger22,
+  logger as logger23,
   makeCacheKey as makeCacheKey15,
   paginate as paginate11,
   useAtlas as useAtlas23,
-  useCache as useCache15
+  useCache as useCache16
 } from "@eeplatform/nodejs-utils";
 import { ObjectId as ObjectId32 } from "mongodb";
 function useOrderRepo() {
@@ -24754,15 +24747,15 @@ function useOrderRepo() {
   }
   const namespace_collection = "orders";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = useCache15();
+  const { getCache, setCache, delNamespace } = useCache16(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
-      logger22.log({
+    delNamespace().then(() => {
+      logger23.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
       });
     }).catch((err) => {
-      logger22.log({
+      logger23.log({
         level: "error",
         message: `Failed to clear cache namespace for ${namespace_collection}: ${err.message}`
       });
@@ -24785,7 +24778,7 @@ function useOrderRepo() {
       collection.insertOne(value, { session });
       delCachedData();
     } catch (error) {
-      logger22.log({ level: "error", message: `${error}` });
+      logger23.log({ level: "error", message: `${error}` });
       if (error instanceof AppError11) {
         throw error;
       }
@@ -24829,7 +24822,7 @@ function useOrderRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger22.log({
+        logger23.log({
           level: "info",
           message: `Cache hit for getOrders: ${cacheKey}`
         });
@@ -24843,20 +24836,20 @@ function useOrderRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = paginate11(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
-        logger22.log({
+      setCache(cacheKey, data, 600).then(() => {
+        logger23.log({
           level: "info",
           message: `Cache set for getOrders: ${cacheKey}`
         });
       }).catch((err) => {
-        logger22.log({
+        logger23.log({
           level: "error",
           message: `Failed to set cache for getOrders: ${err.message}`
         });
       });
       return data;
     } catch (error) {
-      logger22.log({ level: "error", message: `${error}` });
+      logger23.log({ level: "error", message: `${error}` });
       throw new InternalServerError22("Internal server error.");
     }
   }
@@ -24912,7 +24905,7 @@ function useOrderController() {
 // src/services/invoice.service.ts
 import {
   BadRequestError as BadRequestError46,
-  logger as logger23,
+  logger as logger24,
   NotFoundError as NotFoundError7,
   useAtlas as useAtlas24
 } from "@eeplatform/nodejs-utils";
@@ -24934,7 +24927,7 @@ function useInvoiceService() {
     while (true) {
       const overdueInvoices = await getOverdueInvoices(BATCH_SIZE);
       if (!overdueInvoices.length) {
-        logger23.log({
+        logger24.log({
           level: "info",
           message: "No overdue invoices found."
         });
@@ -24944,21 +24937,21 @@ function useInvoiceService() {
         overdueInvoices.map(async (invoice) => {
           const session = useAtlas24.getClient()?.startSession();
           if (!session) {
-            logger23.log({
+            logger24.log({
               level: "error",
               message: "Failed to start session."
             });
             return;
           }
           if (!invoice._id) {
-            logger23.log({
+            logger24.log({
               level: "error",
               message: "Invoice ID is missing."
             });
             return;
           }
           if (!invoice.metadata?.subscriptionId) {
-            logger23.log({
+            logger24.log({
               level: "error",
               message: "Subscription ID is missing."
             });
@@ -24968,14 +24961,14 @@ function useInvoiceService() {
             invoice.metadata.subscriptionId
           ).catch(() => null);
           if (!subscription) {
-            logger23.log({
+            logger24.log({
               level: "error",
               message: "Subscription not found."
             });
             return;
           }
           if (!subscription._id) {
-            logger23.log({
+            logger24.log({
               level: "error",
               message: "Subscription ID is missing."
             });
@@ -25055,7 +25048,7 @@ function useInvoiceService() {
               return;
             }
           } catch (error) {
-            logger23.log({
+            logger24.log({
               level: "error",
               message: String(error)
             });
@@ -25065,7 +25058,7 @@ function useInvoiceService() {
           }
         })
       );
-      logger23.log({
+      logger24.log({
         level: "info",
         message: "Successfully processed overdue invoices."
       });
@@ -25077,7 +25070,7 @@ function useInvoiceService() {
     }
     const session = useAtlas24.getClient()?.startSession();
     if (!session) {
-      logger23.log({
+      logger24.log({
         level: "error",
         message: "Failed to start session."
       });
@@ -25146,7 +25139,7 @@ function useInvoiceService() {
       return "Payment processed successfully.";
     } catch (error) {
       session.abortTransaction();
-      logger23.log({
+      logger24.log({
         level: "error",
         message: String(error)
       });
@@ -25393,11 +25386,11 @@ import {
   AppError as AppError12,
   BadRequestError as BadRequestError51,
   InternalServerError as InternalServerError23,
-  logger as logger24,
+  logger as logger25,
   makeCacheKey as makeCacheKey16,
   paginate as paginate12,
   useAtlas as useAtlas25,
-  useCache as useCache16
+  useCache as useCache17
 } from "@eeplatform/nodejs-utils";
 import { ObjectId as ObjectId34 } from "mongodb";
 function useRegionRepo() {
@@ -25407,7 +25400,7 @@ function useRegionRepo() {
   }
   const namespace_collection = "regions";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = useCache16();
+  const { getCache, setCache, delNamespace } = useCache17(namespace_collection);
   async function createIndex() {
     try {
       await collection.createIndex([
@@ -25444,13 +25437,13 @@ function useRegionRepo() {
     }
   }
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
-      logger24.log({
+    delNamespace().then(() => {
+      logger25.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
       });
     }).catch((err) => {
-      logger24.log({
+      logger25.log({
         level: "error",
         message: `Failed to clear cache namespace for ${namespace_collection}: ${err.message}`
       });
@@ -25463,7 +25456,7 @@ function useRegionRepo() {
       delCachedData();
       return res.insertedId;
     } catch (error) {
-      logger24.log({
+      logger25.log({
         level: "error",
         message: error.message
       });
@@ -25491,14 +25484,14 @@ function useRegionRepo() {
       limit,
       sort: JSON.stringify(sort)
     });
-    logger24.log({
+    logger25.log({
       level: "info",
       message: `Cache key for getAll regions: ${cacheKey}`
     });
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger24.log({
+        logger25.log({
           level: "info",
           message: `Cache hit for getAll regions: ${cacheKey}`
         });
@@ -25522,20 +25515,20 @@ function useRegionRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = paginate12(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
-        logger24.log({
+      setCache(cacheKey, data, 600).then(() => {
+        logger25.log({
           level: "info",
           message: `Cache set for getAll regions: ${cacheKey}`
         });
       }).catch((err) => {
-        logger24.log({
+        logger25.log({
           level: "error",
           message: `Failed to set cache for getAll regions: ${err.message}`
         });
       });
       return data;
     } catch (error) {
-      logger24.log({ level: "error", message: `${error}` });
+      logger25.log({ level: "error", message: `${error}` });
       throw error;
     }
   }
@@ -25549,7 +25542,7 @@ function useRegionRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger24.log({
+        logger25.log({
           level: "info",
           message: `Cache hit for getById region: ${cacheKey}`
         });
@@ -25562,13 +25555,13 @@ function useRegionRepo() {
       if (!result) {
         throw new BadRequestError51("Region not found.");
       }
-      setCache(cacheKey, result, 300, namespace_collection).then(() => {
-        logger24.log({
+      setCache(cacheKey, result, 300).then(() => {
+        logger25.log({
           level: "info",
           message: `Cache set for region by id: ${cacheKey}`
         });
       }).catch((err) => {
-        logger24.log({
+        logger25.log({
           level: "error",
           message: `Failed to set cache for region by id: ${err.message}`
         });
@@ -25587,7 +25580,7 @@ function useRegionRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger24.log({
+        logger25.log({
           level: "info",
           message: `Cache hit for getByName region: ${cacheKey}`
         });
@@ -25600,13 +25593,13 @@ function useRegionRepo() {
       if (!result) {
         throw new BadRequestError51("Region not found.");
       }
-      setCache(cacheKey, result, 300, namespace_collection).then(() => {
-        logger24.log({
+      setCache(cacheKey, result, 300).then(() => {
+        logger25.log({
           level: "info",
           message: `Cache set for region by name: ${cacheKey}`
         });
       }).catch((err) => {
-        logger24.log({
+        logger25.log({
           level: "error",
           message: `Failed to set cache for region by name: ${err.message}`
         });
@@ -25932,11 +25925,11 @@ import {
   AppError as AppError13,
   BadRequestError as BadRequestError54,
   InternalServerError as InternalServerError24,
-  logger as logger25,
+  logger as logger26,
   makeCacheKey as makeCacheKey17,
   paginate as paginate13,
   useAtlas as useAtlas27,
-  useCache as useCache17
+  useCache as useCache18
 } from "@eeplatform/nodejs-utils";
 import { ObjectId as ObjectId36 } from "mongodb";
 function useDivisionRepo() {
@@ -25946,7 +25939,7 @@ function useDivisionRepo() {
   }
   const namespace_collection = "divisions";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = useCache17();
+  const { getCache, setCache, delNamespace } = useCache18(namespace_collection);
   async function createIndex() {
     try {
       await collection.createIndex([
@@ -25985,13 +25978,13 @@ function useDivisionRepo() {
     }
   }
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
-      logger25.log({
+    delNamespace().then(() => {
+      logger26.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
       });
     }).catch((err) => {
-      logger25.log({
+      logger26.log({
         level: "error",
         message: `Failed to clear cache namespace for ${namespace_collection}: ${err.message}`
       });
@@ -26004,7 +25997,7 @@ function useDivisionRepo() {
       delCachedData();
       return res.insertedId;
     } catch (error) {
-      logger25.log({
+      logger26.log({
         level: "error",
         message: error.message
       });
@@ -26046,14 +26039,14 @@ function useDivisionRepo() {
       sort: JSON.stringify(sort),
       region
     });
-    logger25.log({
+    logger26.log({
       level: "info",
       message: `Cache key for getAll divisions: ${cacheKey}`
     });
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger25.log({
+        logger26.log({
           level: "info",
           message: `Cache hit for getAll divisions: ${cacheKey}`
         });
@@ -26079,20 +26072,20 @@ function useDivisionRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = paginate13(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
-        logger25.log({
+      setCache(cacheKey, data, 600).then(() => {
+        logger26.log({
           level: "info",
           message: `Cache set for getAll divisions: ${cacheKey}`
         });
       }).catch((err) => {
-        logger25.log({
+        logger26.log({
           level: "error",
           message: `Failed to set cache for getAll divisions: ${err.message}`
         });
       });
       return data;
     } catch (error) {
-      logger25.log({ level: "error", message: `${error}` });
+      logger26.log({ level: "error", message: `${error}` });
       throw error;
     }
   }
@@ -26106,7 +26099,7 @@ function useDivisionRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger25.log({
+        logger26.log({
           level: "info",
           message: `Cache hit for getById division: ${cacheKey}`
         });
@@ -26119,13 +26112,13 @@ function useDivisionRepo() {
       if (!result) {
         throw new BadRequestError54("Division not found.");
       }
-      setCache(cacheKey, result, 300, namespace_collection).then(() => {
-        logger25.log({
+      setCache(cacheKey, result, 300).then(() => {
+        logger26.log({
           level: "info",
           message: `Cache set for division by id: ${cacheKey}`
         });
       }).catch((err) => {
-        logger25.log({
+        logger26.log({
           level: "error",
           message: `Failed to set cache for division by id: ${err.message}`
         });
@@ -26144,7 +26137,7 @@ function useDivisionRepo() {
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
-        logger25.log({
+        logger26.log({
           level: "info",
           message: `Cache hit for getByName division: ${cacheKey}`
         });
@@ -26157,13 +26150,13 @@ function useDivisionRepo() {
       if (!result) {
         throw new BadRequestError54("Division not found.");
       }
-      setCache(cacheKey, result, 300, namespace_collection).then(() => {
-        logger25.log({
+      setCache(cacheKey, result, 300).then(() => {
+        logger26.log({
           level: "info",
           message: `Cache set for division by name: ${cacheKey}`
         });
       }).catch((err) => {
-        logger25.log({
+        logger26.log({
           level: "error",
           message: `Failed to set cache for division by name: ${err.message}`
         });
@@ -26533,11 +26526,11 @@ function MSchool(value) {
 // src/repositories/school.repository.ts
 import {
   BadRequestError as BadRequestError56,
-  logger as logger26,
+  logger as logger27,
   makeCacheKey as makeCacheKey18,
   paginate as paginate14,
   useAtlas as useAtlas29,
-  useCache as useCache18
+  useCache as useCache19
 } from "@eeplatform/nodejs-utils";
 import { ObjectId as ObjectId38 } from "mongodb";
 function useSchoolRepo() {
@@ -26547,15 +26540,15 @@ function useSchoolRepo() {
   }
   const namespace_collection = "schools";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = useCache18();
+  const { getCache, setCache, delNamespace } = useCache19(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
-      logger26.log({
+    delNamespace().then(() => {
+      logger27.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
       });
     }).catch((err) => {
-      logger26.log({
+      logger27.log({
         level: "error",
         message: `Failed to clear cache namespace for ${namespace_collection}: ${err.message}`
       });
@@ -26592,7 +26585,7 @@ function useSchoolRepo() {
       delCachedData();
       return res.insertedId;
     } catch (error) {
-      logger26.log({
+      logger27.log({
         level: "error",
         message: `Failed to add school: ${error}`
       });
@@ -26608,8 +26601,8 @@ function useSchoolRepo() {
     limit = 20,
     sort = {},
     status = "active",
-    region = "",
-    division = "",
+    org = "",
+    app = "admin",
     search = ""
   } = {}) {
     page = Math.max(0, page - 1);
@@ -26627,20 +26620,12 @@ function useSchoolRepo() {
       query.$text = { $search: search };
       cacheKeyOptions.search = search;
     }
-    if (region) {
-      try {
-        query.region = new ObjectId38(region);
-        cacheKeyOptions.region = region;
-      } catch (error) {
-        throw new BadRequestError56("Invalid region.");
-      }
-    }
-    if (division) {
+    if (org) {
       try {
-        query.division = new ObjectId38(division);
-        cacheKeyOptions.division = division;
+        query[app] = new ObjectId38(org);
+        cacheKeyOptions[app] = org;
       } catch (error) {
-        throw new BadRequestError56("Invalid division.");
+        throw new BadRequestError56("Invalid org.");
       }
     }
     try {
@@ -26657,20 +26642,20 @@ function useSchoolRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = paginate14(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
-        logger26.log({
+      setCache(cacheKey, data, 600).then(() => {
+        logger27.log({
           level: "info",
           message: `Cache set for key ${cacheKey}`
         });
       }).catch((err) => {
-        logger26.log({
+        logger27.log({
           level: "error",
           message: `Failed to set cache for key ${cacheKey}: ${err.message}`
         });
       });
       return data;
     } catch (error) {
-      logger26.log({
+      logger27.log({
         level: "error",
         message: `Failed to get all schools: ${error}`
       });
@@ -26748,13 +26733,13 @@ function useSchoolRepo() {
     }
     try {
       const school = await collection.findOne({ createdBy, status: "pending" });
-      setCache(cacheKey, school, 600, namespace_collection).then(() => {
-        logger26.log({
+      setCache(cacheKey, school, 600).then(() => {
+        logger27.log({
           level: "info",
           message: `Cache set for school by createdBy: ${cacheKey}`
         });
       }).catch((err) => {
-        logger26.log({
+        logger27.log({
           level: "error",
           message: `Failed to set cache for school by createdBy: ${err.message}`
         });
@@ -26780,13 +26765,13 @@ function useSchoolRepo() {
     }
     try {
       const school = await collection.findOne({ _id, status: "pending" });
-      setCache(cacheKey, school, 600, namespace_collection).then(() => {
-        logger26.log({
+      setCache(cacheKey, school, 600).then(() => {
+        logger27.log({
           level: "info",
           message: `Cache set for school by ID: ${cacheKey}`
         });
       }).catch((err) => {
-        logger26.log({
+        logger27.log({
           level: "error",
           message: `Failed to set cache for school by ID: ${err.message}`
         });
@@ -26808,7 +26793,7 @@ function useSchoolRepo() {
 }
 
 // src/services/school.service.ts
-import { BadRequestError as BadRequestError57, useAtlas as useAtlas30, logger as logger27 } from "@eeplatform/nodejs-utils";
+import { BadRequestError as BadRequestError57, useAtlas as useAtlas30, logger as logger28 } from "@eeplatform/nodejs-utils";
 function useSchoolService() {
   const { add, getPendingByCreatedBy, updateStatusById, getPendingById } = useSchoolRepo();
   const { addRole } = useRoleRepo();
@@ -26881,7 +26866,7 @@ function useSchoolService() {
       await session.commitTransaction();
       return "School registration has been approved.";
     } catch (error) {
-      logger27.log({
+      logger28.log({
         level: "error",
         message: `Error approving school registration: ${error.message}`
       });
@@ -26930,8 +26915,8 @@ function useSchoolController() {
       sort: Joi32.string().optional().allow(null, ""),
       sortOrder: Joi32.string().optional().allow(null, ""),
       status: Joi32.string().optional().allow(null, ""),
-      region: Joi32.string().hex().optional().allow(null, ""),
-      division: Joi32.string().hex().optional().allow(null, ""),
+      org: Joi32.string().hex().optional().allow(null, ""),
+      app: Joi32.string().optional().allow(null, ""),
       search: Joi32.string().optional().allow(null, "")
     });
     const { error } = validation.validate(req.query);
@@ -26951,8 +26936,8 @@ function useSchoolController() {
       });
     }
     const status = req.query.status ?? "active";
-    const region = req.query.region ?? "";
-    const division = req.query.division ?? "";
+    const org = req.query.org ?? "";
+    const app = req.query.app ?? "admin";
     const search = req.query.search ?? "";
     try {
       const schools = await _getAll({
@@ -26960,8 +26945,8 @@ function useSchoolController() {
         limit,
         sort: sortObj,
         status,
-        region,
-        division,
+        org,
+        app,
         search
       });
       res.status(200).json(schools);