@eeplatform/core 1.0.1 → 1.0.3

package/dist/index.js

@@ -11478,9 +11478,9 @@ function useVerificationRepo() {
   }
   const namespace_collection = "verifications";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils2.useCache)();
+  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils2.useCache)(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
+    delNamespace().then(() => {
       import_nodejs_utils2.logger.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
@@ -11568,7 +11568,7 @@ function useVerificationRepo() {
         return cached;
       }
       const data = await collection.findOne({ _id });
-      setCache(cacheKey, data, 300, namespace_collection).then(() => {
+      setCache(cacheKey, data, 300).then(() => {
         import_nodejs_utils2.logger.log({
           level: "info",
           message: `Cache set for verification by id: ${cacheKey}`
@@ -11648,7 +11648,7 @@ function useVerificationRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = (0, import_nodejs_utils2.paginate)(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
+      setCache(cacheKey, data, 600).then(() => {
         import_nodejs_utils2.logger.log({
           level: "info",
           message: `Cache set for getVerifications: ${cacheKey}`
@@ -11679,7 +11679,7 @@ function useVerificationRepo() {
         return cached;
       }
       const data = await collection.find({ type }).toArray();
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
+      setCache(cacheKey, data, 600).then(() => {
         import_nodejs_utils2.logger.log({
           level: "info",
           message: `Cache set for verification by type: ${cacheKey}`
@@ -11804,10 +11804,12 @@ var MUser = class {
     this.createdAt = value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString();
     this.updatedAt = value.updatedAt ?? "";
     this.deletedAt = value.deletedAt ?? "";
-    try {
-      value.defaultOrg = new import_mongodb3.ObjectId(value.defaultOrg);
-    } catch (error) {
-      throw new Error("Invalid defaultOrg ID.");
+    if (value.defaultOrg) {
+      try {
+        value.defaultOrg = new import_mongodb3.ObjectId(value.defaultOrg);
+      } catch (error) {
+        throw new Error("Invalid defaultOrg ID.");
+      }
     }
     this.defaultOrg = value.defaultOrg;
   }
@@ -11822,9 +11824,9 @@ function useUserRepo() {
   }
   const namespace_collection = "users";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils3.useCache)();
+  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils3.useCache)(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
+    delNamespace().then(() => {
       import_nodejs_utils3.logger.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
@@ -11886,7 +11888,7 @@ function useUserRepo() {
       }
       const result = await collection.findOne({ email });
       if (result) {
-        setCache(cacheKey, result, 300, namespace_collection).then(() => {
+        setCache(cacheKey, result, 300).then(() => {
           import_nodejs_utils3.logger.log({
             level: "info",
             message: `Cache set for user by email: ${cacheKey}`
@@ -11916,7 +11918,7 @@ function useUserRepo() {
       }
       const result = await collection.findOne({ referralCode });
       if (result) {
-        setCache(cacheKey, result, 300, namespace_collection).then(() => {
+        setCache(cacheKey, result, 300).then(() => {
           import_nodejs_utils3.logger.log({
             level: "info",
             message: `Cache set for user by referral code: ${cacheKey}`
@@ -11951,7 +11953,7 @@ function useUserRepo() {
       }
       const result = await collection.findOne({ _id });
       if (result) {
-        setCache(cacheKey, result, 300, namespace_collection).then(() => {
+        setCache(cacheKey, result, 300).then(() => {
           import_nodejs_utils3.logger.log({
             level: "info",
             message: `Cache set for user by id: ${cacheKey}`
@@ -12025,7 +12027,7 @@ function useUserRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = (0, import_nodejs_utils3.paginate)(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
+      setCache(cacheKey, data, 600).then(() => {
         import_nodejs_utils3.logger.log({
           level: "info",
           message: `Cache set for getUsers: ${cacheKey}`
@@ -12239,9 +12241,9 @@ function useMemberRepo() {
   }
   const namespace_collection = "members";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils5.useCache)();
+  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils5.useCache)(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
+    delNamespace().then(() => {
       import_nodejs_utils5.logger.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
@@ -12332,7 +12334,7 @@ function useMemberRepo() {
         return cached;
       }
       const data = await collection.findOne({ _id });
-      setCache(cacheKey, data, 300, namespace_collection).then(() => {
+      setCache(cacheKey, data, 300).then(() => {
         import_nodejs_utils5.logger.log({
           level: "info",
           message: `Cache set for member by id: ${cacheKey}`
@@ -12369,7 +12371,7 @@ function useMemberRepo() {
         return cached;
       }
       const data = await collection.findOne({ user });
-      setCache(cacheKey, data, 300, namespace_collection).then(() => {
+      setCache(cacheKey, data, 300).then(() => {
         import_nodejs_utils5.logger.log({
           level: "info",
           message: `Cache set for member by user ID: ${cacheKey}`
@@ -12422,7 +12424,7 @@ function useMemberRepo() {
         return cached;
       }
       const data = await collection.findOne(query);
-      setCache(cacheKey, data, 300, namespace_collection).then(() => {
+      setCache(cacheKey, data, 300).then(() => {
         import_nodejs_utils5.logger.log({
           level: "info",
           message: `Cache set for member by user ID: ${cacheKey}`
@@ -12526,7 +12528,7 @@ function useMemberRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = (0, import_nodejs_utils5.paginate)(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
+      setCache(cacheKey, data, 600).then(() => {
         import_nodejs_utils5.logger.log({
           level: "info",
           message: `Cache set for getAll members: ${cacheKey}`
@@ -12561,7 +12563,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(() => {
         import_nodejs_utils5.logger.log({
           level: "info",
           message: `Cache set for countByOrg members: ${cacheKey}`
@@ -12598,7 +12600,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(() => {
         import_nodejs_utils5.logger.log({
           level: "info",
           message: `Cache set for countByUser members: ${cacheKey}`
@@ -12672,7 +12674,7 @@ function useMemberRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = (0, import_nodejs_utils5.paginate)(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
+      setCache(cacheKey, data, 600).then(() => {
         import_nodejs_utils5.logger.log({
           level: "info",
           message: `Cache set for getOrgsByMembership members: ${cacheKey}`
@@ -12750,7 +12752,7 @@ function useMemberRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = (0, import_nodejs_utils5.paginate)(items, page, limit, length);
-      setCache(cacheKey, data, 300, namespace_collection).then(() => {
+      setCache(cacheKey, data, 300).then(() => {
         import_nodejs_utils5.logger.log({
           level: "info",
           message: `Cache set for getOrgsByUserId members: ${cacheKey}`
@@ -12847,9 +12849,6 @@ function useVerificationService() {
     if (!metadata.app) {
       throw new import_nodejs_utils6.BadRequestError("App metadata is required.");
     }
-    if (!metadata.org || !metadata.orgName) {
-      throw new import_nodejs_utils6.BadRequestError("Organization metadata is required.");
-    }
     try {
       const user = await getUserByEmail(email);
       const dir = __dirname;
@@ -12861,7 +12860,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
         });
@@ -13032,11 +13031,6 @@ function useVerificationService() {
             "App metadata is required for member invite."
           );
         }
-        if (!_id.metadata?.org || !_id.metadata?.orgName) {
-          throw new import_nodejs_utils6.BadRequestError(
-            "Organization metadata is required for member invite."
-          );
-        }
         if (!_id.metadata?.role || !_id.metadata?.roleName) {
           throw new import_nodejs_utils6.BadRequestError(
             "Role metadata is required for member invite."
@@ -13046,8 +13040,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}`
@@ -13166,8 +13160,8 @@ function useVerificationController() {
       app: import_joi2.default.string().required(),
       role: import_joi2.default.string().hex().required(),
       roleName: import_joi2.default.string().required(),
-      org: import_joi2.default.string().required(),
-      orgName: import_joi2.default.string().required()
+      org: import_joi2.default.string().hex().optional().optional().allow("", null),
+      orgName: import_joi2.default.string().optional().optional().allow("", null)
     });
     const { error } = validation.validate(req.body);
     if (error) {
@@ -13321,9 +13315,9 @@ function useTokenRepo() {
   }
   const namespace_collection = "tokens";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils8.useCache)();
+  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils8.useCache)(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
+    delNamespace().then(() => {
       import_nodejs_utils8.logger.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
@@ -13362,7 +13356,7 @@ function useTokenRepo() {
       }
       const data = await collection.findOne({ token });
       if (data) {
-        setCache(cacheKey, data, 300, namespace_collection).then(() => {
+        setCache(cacheKey, data, 300).then(() => {
           import_nodejs_utils8.logger.log({
             level: "info",
             message: `Cache set for token: ${cacheKey}`
@@ -13421,9 +13415,9 @@ function useFileRepo() {
   }
   const namespace_collection = "files";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils9.useCache)();
+  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils9.useCache)(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
+    delNamespace().then(() => {
       import_nodejs_utils9.logger.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
@@ -13471,7 +13465,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(() => {
         import_nodejs_utils9.logger.log({
           level: "info",
           message: `Cache set for getAllDraftedFiles: ${cacheKey}`
@@ -13544,6 +13538,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");
@@ -13571,6 +13575,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;
@@ -13581,6 +13588,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;
@@ -13777,6 +13787,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) ? [] : {};
@@ -13826,6 +13839,7 @@ var utils_default = {
   isBoolean,
   isObject,
   isPlainObject,
+  isEmptyObject,
   isReadableStream,
   isRequest,
   isResponse,
@@ -14270,15 +14284,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
@@ -14791,7 +14806,7 @@ var import_follow_redirects = __toESM(require_follow_redirects(), 1);
 var import_zlib = __toESM(require("zlib"), 1);
 
 // 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) {
@@ -15133,7 +15148,7 @@ function throttle(fn, freq) {
       clearTimeout(timer);
       timer = null;
     }
-    fn.apply(null, args);
+    fn(...args);
   };
   const throttled = (...args) => {
     const now = Date.now();
@@ -15808,7 +15823,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);
@@ -16522,8 +16537,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) {
@@ -17497,9 +17512,9 @@ function useRoleRepo() {
   }
   const namespace_collection = "roles";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils11.useCache)();
+  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils11.useCache)(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
+    delNamespace().then(() => {
       import_nodejs_utils11.logger.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
@@ -17572,7 +17587,7 @@ function useRoleRepo() {
         return cached;
       }
       const data = await collection.findOne({ user: value });
-      setCache(cacheKey, data, 300, namespace_collection).then(() => {
+      setCache(cacheKey, data, 300).then(() => {
         import_nodejs_utils11.logger.log({
           level: "info",
           message: `Cache set for role by user ID: ${cacheKey}`
@@ -17607,7 +17622,7 @@ function useRoleRepo() {
         return cached;
       }
       const data = await collection.findOne({ _id });
-      setCache(cacheKey, data, 300, namespace_collection).then(() => {
+      setCache(cacheKey, data, 300).then(() => {
         import_nodejs_utils11.logger.log({
           level: "info",
           message: `Cache set for role by id: ${cacheKey}`
@@ -17640,7 +17655,7 @@ function useRoleRepo() {
         return cached;
       }
       const data = await collection.findOne({ name });
-      setCache(cacheKey, data, 300, namespace_collection).then(() => {
+      setCache(cacheKey, data, 300).then(() => {
         import_nodejs_utils11.logger.log({
           level: "info",
           message: `Cache set for role by name: ${cacheKey}`
@@ -17714,7 +17729,7 @@ function useRoleRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = (0, import_nodejs_utils11.paginate)(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
+      setCache(cacheKey, data, 600).then(() => {
         import_nodejs_utils11.logger.log({
           level: "info",
           message: `Cache set for getRoles: ${cacheKey}`
@@ -17980,9 +17995,6 @@ function useUserService() {
         throw new import_nodejs_utils12.BadRequestError("Invitation expired.");
       }
       const email = invitation.email;
-      if (!invitation.metadata.org) {
-        throw new import_nodejs_utils12.BadRequestError("Invitation does not have an organization.");
-      }
       const _user = await getUserByEmail(invitation.email);
       let userId = _user?._id ?? "";
       if (!_user) {
@@ -18007,8 +18019,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
       );
@@ -18423,8 +18435,10 @@ function useUserController() {
 // src/services/auth.service.ts
 var import_nodejs_utils14 = require("@eeplatform/nodejs-utils");
 var import_jsonwebtoken = __toESM(require("jsonwebtoken"));
+var import_uuid = require("uuid");
 function useAuthService() {
   const expiresIn = "1m";
+  const { setCache, delCache } = (0, import_nodejs_utils14.useCache)("sessions");
   async function login({ email, password } = {}) {
     if (!email) {
       throw new import_nodejs_utils14.BadRequestError("Email is required");
@@ -18456,34 +18470,14 @@ function useAuthService() {
     if (!isPasswordValid) {
       throw new import_nodejs_utils14.BadRequestError("Invalid password");
     }
-    const metadata = { user: _user._id };
-    let refreshToken2;
-    try {
-      refreshToken2 = (0, import_nodejs_utils14.generateToken)({
-        secret: REFRESH_TOKEN_SECRET,
-        metadata,
-        options: { expiresIn: "7d" }
-      });
-    } catch (error) {
-      throw new import_nodejs_utils14.BadRequestError("Error generating refresh token");
-    }
-    let accessToken;
-    try {
-      accessToken = (0, import_nodejs_utils14.generateToken)({
-        secret: ACCESS_TOKEN_SECRET,
-        metadata,
-        options: { expiresIn }
-      });
-    } catch (error) {
-      throw new import_nodejs_utils14.BadRequestError("Error generating access token");
-    }
-    const user = _user._id ?? "";
-    try {
-      await useTokenRepo().createToken({ token: refreshToken2, user });
-    } catch (error) {
-      throw new import_nodejs_utils14.BadRequestError("Error creating refresh token");
-    }
-    return { accessToken, refreshToken: refreshToken2, id: _user._id };
+    const sid = (0, import_uuid.v4)();
+    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;
@@ -18517,26 +18511,13 @@ function useAuthService() {
     }
     return accessToken;
   }
-  async function logout(token) {
-    let _token;
-    try {
-      _token = await useTokenRepo().getToken(token);
-      if (!_token) {
-        throw new import_nodejs_utils14.NotFoundError("Invalid token");
-      }
-    } catch (error) {
-      if (error instanceof import_nodejs_utils14.AppError) {
-        throw error;
-      } else {
-        throw new import_nodejs_utils14.InternalServerError(`${error}`);
-      }
-    }
+  async function logout(sid) {
     try {
-      await useTokenRepo().deleteToken(token);
+      await delCache(`sid:${sid}`);
+      return "Session deleted successfully";
     } catch (error) {
       throw new import_nodejs_utils14.InternalServerError("Error deleting token");
     }
-    return "Logged out successfully";
   }
   return {
     login,
@@ -18560,16 +18541,26 @@ function useAuthController() {
     const { error } = validation.validate({ email, password });
     if (error) {
       next(new import_nodejs_utils15.BadRequestError(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) {
+      import_nodejs_utils15.logger.log({
+        level: "error",
+        message: `Error during login: ${error2.message}`
+      });
+      console.log(`Error during login: ${error2}`);
       if (error2 instanceof import_nodejs_utils15.AppError) {
         next(error2);
       } else {
         next(new import_nodejs_utils15.InternalServerError("An unexpected error occurred"));
       }
+      return;
     }
   }
   async function refreshToken(req, res, next) {
@@ -18590,13 +18581,13 @@ function useAuthController() {
     }
   }
   async function logout(req, res, next) {
-    const token = req.params.id || "";
-    if (!token) {
-      next(new import_nodejs_utils15.BadRequestError("Token is required"));
+    const sid = req.headers["authorization"] ?? "";
+    if (!sid) {
+      next(new import_nodejs_utils15.BadRequestError("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 import_nodejs_utils15.AppError) {
@@ -18992,9 +18983,9 @@ function useEntityRepo() {
   }
   const namespace_collection = "entities";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils19.useCache)();
+  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils19.useCache)(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
+    delNamespace().then(() => {
       import_nodejs_utils19.logger.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
@@ -19074,7 +19065,7 @@ function useEntityRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = (0, import_nodejs_utils19.paginate)(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
+      setCache(cacheKey, data, 600).then(() => {
         import_nodejs_utils19.logger.log({
           level: "info",
           message: `Cache set for getEntities: ${cacheKey}`
@@ -19351,9 +19342,9 @@ function useSubscriptionRepo() {
   }
   const namespace_collection = "subscriptions";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils22.useCache)();
+  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils22.useCache)(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
+    delNamespace().then(() => {
       import_nodejs_utils22.logger.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
@@ -19419,7 +19410,7 @@ function useSubscriptionRepo() {
       }
       const data = await collection.findOne({ _id });
       if (data) {
-        setCache(cacheKey, data, 300, namespace_collection).then(() => {
+        setCache(cacheKey, data, 300).then(() => {
           import_nodejs_utils22.logger.log({
             level: "info",
             message: `Cache set for subscription by ID: ${cacheKey}`
@@ -19454,7 +19445,7 @@ function useSubscriptionRepo() {
       }
       const data = await collection.findOne({ user });
       if (data) {
-        setCache(cacheKey, data, 300, namespace_collection).then(() => {
+        setCache(cacheKey, data, 300).then(() => {
           import_nodejs_utils22.logger.log({
             level: "info",
             message: `Cache set for subscription by user ID: ${cacheKey}`
@@ -19514,7 +19505,7 @@ function useSubscriptionRepo() {
       }
       const data = await collection.findOne({ subscriptionId });
       if (data) {
-        setCache(cacheKey, data, 300, namespace_collection).then(() => {
+        setCache(cacheKey, data, 300).then(() => {
           import_nodejs_utils22.logger.log({
             level: "info",
             message: `Cache set for subscription by subscription ID: ${cacheKey}`
@@ -19570,7 +19561,7 @@ function useSubscriptionRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = (0, import_nodejs_utils22.paginate)(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
+      setCache(cacheKey, data, 600).then(() => {
         import_nodejs_utils22.logger.log({
           level: "info",
           message: `Cache set for getSubscriptions: ${cacheKey}`
@@ -20039,7 +20030,7 @@ function useOrgRepo() {
   }
   const namespace_collection = "organizations";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils24.useCache)();
+  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils24.useCache)(namespace_collection);
   async function createIndex() {
     try {
       await collection.createIndex([
@@ -20074,7 +20065,7 @@ function useOrgRepo() {
     }
   }
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
+    delNamespace().then(() => {
       import_nodejs_utils24.logger.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
@@ -20158,7 +20149,7 @@ function useOrgRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = (0, import_nodejs_utils24.paginate)(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
+      setCache(cacheKey, data, 600).then(() => {
         import_nodejs_utils24.logger.log({
           level: "info",
           message: `Cache set for getAll organizations: ${cacheKey}`
@@ -20195,7 +20186,7 @@ function useOrgRepo() {
       if (!result) {
         throw new import_nodejs_utils24.BadRequestError("Organization not found.");
       }
-      setCache(cacheKey, result, 300, namespace_collection).then(() => {
+      setCache(cacheKey, result, 300).then(() => {
         import_nodejs_utils24.logger.log({
           level: "info",
           message: `Cache set for organization by id: ${cacheKey}`
@@ -20230,7 +20221,7 @@ function useOrgRepo() {
       if (!result) {
         throw new import_nodejs_utils24.BadRequestError("Organization not found.");
       }
-      setCache(cacheKey, result, 300, namespace_collection).then(() => {
+      setCache(cacheKey, result, 300).then(() => {
         import_nodejs_utils24.logger.log({
           level: "info",
           message: `Cache set for organization by name: ${cacheKey}`
@@ -20362,9 +20353,9 @@ function useAddressRepo() {
   }
   const namespace_collection = "addresses";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils26.useCache)();
+  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils26.useCache)(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
+    delNamespace().then(() => {
       import_nodejs_utils26.logger.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
@@ -20440,7 +20431,7 @@ function useAddressRepo() {
       }
       const data = await collection.findOne({ user });
       if (data) {
-        setCache(cacheKey, data, 300, namespace_collection).then(() => {
+        setCache(cacheKey, data, 300).then(() => {
           import_nodejs_utils26.logger.log({
             level: "info",
             message: `Cache set for address by user ID: ${cacheKey}`
@@ -20475,7 +20466,7 @@ function useAddressRepo() {
       }
       const data = await collection.findOne({ org });
       if (data) {
-        setCache(cacheKey, data, 300, namespace_collection).then(() => {
+        setCache(cacheKey, data, 300).then(() => {
           import_nodejs_utils26.logger.log({
             level: "info",
             message: `Cache set for address by org ID: ${cacheKey}`
@@ -20561,9 +20552,9 @@ function usePromoCodeRepo() {
   }
   const namespace_collection = "promo-codes";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils28.useCache)();
+  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils28.useCache)(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
+    delNamespace().then(() => {
       import_nodejs_utils28.logger.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
@@ -20643,7 +20634,7 @@ function usePromoCodeRepo() {
       }
       const data = await collection.findOne(query);
       if (data) {
-        setCache(cacheKey, data, 300, namespace_collection).then(() => {
+        setCache(cacheKey, data, 300).then(() => {
           import_nodejs_utils28.logger.log({
             level: "info",
             message: `Cache set for promo code by code: ${cacheKey}`
@@ -20685,7 +20676,7 @@ function usePromoCodeRepo() {
       }
       const data = await collection.findOne({ _id });
       if (data) {
-        setCache(cacheKey, data, 300, namespace_collection).then(() => {
+        setCache(cacheKey, data, 300).then(() => {
           import_nodejs_utils28.logger.log({
             level: "info",
             message: `Cache set for promo code by ID: ${cacheKey}`
@@ -20744,7 +20735,7 @@ function usePromoCodeRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = (0, import_nodejs_utils28.paginate)(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
+      setCache(cacheKey, data, 600).then(() => {
         import_nodejs_utils28.logger.log({
           level: "info",
           message: `Cache set for getPromoCodes: ${cacheKey}`
@@ -21110,9 +21101,9 @@ function useCounterRepo() {
   }
   const namespace_collection = "counters";
   const { collection, createCounter } = useCounterModel(db);
-  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils32.useCache)();
+  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils32.useCache)(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
+    delNamespace().then(() => {
       import_nodejs_utils32.logger.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
@@ -21182,7 +21173,7 @@ function useCounterRepo() {
       }
       const data = await collection.findOne({ type });
       if (data) {
-        setCache(cacheKey, data, 300, namespace_collection).then(() => {
+        setCache(cacheKey, data, 300).then(() => {
           import_nodejs_utils32.logger.log({
             level: "info",
             message: `Cache set for counter by type: ${cacheKey}`
@@ -21375,9 +21366,9 @@ function usePriceRepo() {
   }
   const namespace_collection = "prices";
   const { collection, createPrice } = usePriceModel(db);
-  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils35.useCache)();
+  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils35.useCache)(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
+    delNamespace().then(() => {
       import_nodejs_utils35.logger.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
@@ -21447,7 +21438,7 @@ function usePriceRepo() {
       }
       const data = await collection.findOne({ name, type });
       if (data) {
-        setCache(cacheKey, data, 300, namespace_collection).then(() => {
+        setCache(cacheKey, data, 300).then(() => {
           import_nodejs_utils35.logger.log({
             level: "info",
             message: `Cache set for price by name and type: ${cacheKey}`
@@ -24700,9 +24691,9 @@ function useOrderRepo() {
   }
   const namespace_collection = "orders";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils49.useCache)();
+  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils49.useCache)(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
+    delNamespace().then(() => {
       import_nodejs_utils49.logger.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
@@ -24789,7 +24780,7 @@ function useOrderRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = (0, import_nodejs_utils49.paginate)(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
+      setCache(cacheKey, data, 600).then(() => {
         import_nodejs_utils49.logger.log({
           level: "info",
           message: `Cache set for getOrders: ${cacheKey}`
@@ -25339,7 +25330,7 @@ function useRegionRepo() {
   }
   const namespace_collection = "regions";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils56.useCache)();
+  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils56.useCache)(namespace_collection);
   async function createIndex() {
     try {
       await collection.createIndex([
@@ -25376,7 +25367,7 @@ function useRegionRepo() {
     }
   }
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
+    delNamespace().then(() => {
       import_nodejs_utils56.logger.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
@@ -25454,7 +25445,7 @@ function useRegionRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = (0, import_nodejs_utils56.paginate)(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
+      setCache(cacheKey, data, 600).then(() => {
         import_nodejs_utils56.logger.log({
           level: "info",
           message: `Cache set for getAll regions: ${cacheKey}`
@@ -25494,7 +25485,7 @@ function useRegionRepo() {
       if (!result) {
         throw new import_nodejs_utils56.BadRequestError("Region not found.");
       }
-      setCache(cacheKey, result, 300, namespace_collection).then(() => {
+      setCache(cacheKey, result, 300).then(() => {
         import_nodejs_utils56.logger.log({
           level: "info",
           message: `Cache set for region by id: ${cacheKey}`
@@ -25532,7 +25523,7 @@ function useRegionRepo() {
       if (!result) {
         throw new import_nodejs_utils56.BadRequestError("Region not found.");
       }
-      setCache(cacheKey, result, 300, namespace_collection).then(() => {
+      setCache(cacheKey, result, 300).then(() => {
         import_nodejs_utils56.logger.log({
           level: "info",
           message: `Cache set for region by name: ${cacheKey}`
@@ -25869,7 +25860,7 @@ function useDivisionRepo() {
   }
   const namespace_collection = "divisions";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils60.useCache)();
+  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils60.useCache)(namespace_collection);
   async function createIndex() {
     try {
       await collection.createIndex([
@@ -25908,7 +25899,7 @@ function useDivisionRepo() {
     }
   }
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
+    delNamespace().then(() => {
       import_nodejs_utils60.logger.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
@@ -26002,7 +25993,7 @@ function useDivisionRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = (0, import_nodejs_utils60.paginate)(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
+      setCache(cacheKey, data, 600).then(() => {
         import_nodejs_utils60.logger.log({
           level: "info",
           message: `Cache set for getAll divisions: ${cacheKey}`
@@ -26042,7 +26033,7 @@ function useDivisionRepo() {
       if (!result) {
         throw new import_nodejs_utils60.BadRequestError("Division not found.");
       }
-      setCache(cacheKey, result, 300, namespace_collection).then(() => {
+      setCache(cacheKey, result, 300).then(() => {
         import_nodejs_utils60.logger.log({
           level: "info",
           message: `Cache set for division by id: ${cacheKey}`
@@ -26080,7 +26071,7 @@ function useDivisionRepo() {
       if (!result) {
         throw new import_nodejs_utils60.BadRequestError("Division not found.");
       }
-      setCache(cacheKey, result, 300, namespace_collection).then(() => {
+      setCache(cacheKey, result, 300).then(() => {
         import_nodejs_utils60.logger.log({
           level: "info",
           message: `Cache set for division by name: ${cacheKey}`
@@ -26463,9 +26454,9 @@ function useSchoolRepo() {
   }
   const namespace_collection = "schools";
   const collection = db.collection(namespace_collection);
-  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils63.useCache)();
+  const { getCache, setCache, delNamespace } = (0, import_nodejs_utils63.useCache)(namespace_collection);
   function delCachedData() {
-    delNamespace(namespace_collection).then(() => {
+    delNamespace().then(() => {
       import_nodejs_utils63.logger.log({
         level: "info",
         message: `Cache namespace cleared for ${namespace_collection}`
@@ -26524,8 +26515,8 @@ function useSchoolRepo() {
     limit = 20,
     sort = {},
     status = "active",
-    region = "",
-    division = "",
+    org = "",
+    app = "admin",
     search = ""
   } = {}) {
     page = Math.max(0, page - 1);
@@ -26543,20 +26534,12 @@ function useSchoolRepo() {
       query.$text = { $search: search };
       cacheKeyOptions.search = search;
     }
-    if (region) {
-      try {
-        query.region = new import_mongodb38.ObjectId(region);
-        cacheKeyOptions.region = region;
-      } catch (error) {
-        throw new import_nodejs_utils63.BadRequestError("Invalid region.");
-      }
-    }
-    if (division) {
+    if (org) {
       try {
-        query.division = new import_mongodb38.ObjectId(division);
-        cacheKeyOptions.division = division;
+        query[app] = new import_mongodb38.ObjectId(org);
+        cacheKeyOptions[app] = org;
       } catch (error) {
-        throw new import_nodejs_utils63.BadRequestError("Invalid division.");
+        throw new import_nodejs_utils63.BadRequestError("Invalid org.");
       }
     }
     try {
@@ -26573,7 +26556,7 @@ function useSchoolRepo() {
       ]).toArray();
       const length = await collection.countDocuments(query);
       const data = (0, import_nodejs_utils63.paginate)(items, page, limit, length);
-      setCache(cacheKey, data, 600, namespace_collection).then(() => {
+      setCache(cacheKey, data, 600).then(() => {
         import_nodejs_utils63.logger.log({
           level: "info",
           message: `Cache set for key ${cacheKey}`
@@ -26664,7 +26647,7 @@ function useSchoolRepo() {
     }
     try {
       const school = await collection.findOne({ createdBy, status: "pending" });
-      setCache(cacheKey, school, 600, namespace_collection).then(() => {
+      setCache(cacheKey, school, 600).then(() => {
         import_nodejs_utils63.logger.log({
           level: "info",
           message: `Cache set for school by createdBy: ${cacheKey}`
@@ -26696,7 +26679,7 @@ function useSchoolRepo() {
     }
     try {
       const school = await collection.findOne({ _id, status: "pending" });
-      setCache(cacheKey, school, 600, namespace_collection).then(() => {
+      setCache(cacheKey, school, 600).then(() => {
         import_nodejs_utils63.logger.log({
           level: "info",
           message: `Cache set for school by ID: ${cacheKey}`
@@ -26846,8 +26829,8 @@ function useSchoolController() {
       sort: import_joi32.default.string().optional().allow(null, ""),
       sortOrder: import_joi32.default.string().optional().allow(null, ""),
       status: import_joi32.default.string().optional().allow(null, ""),
-      region: import_joi32.default.string().hex().optional().allow(null, ""),
-      division: import_joi32.default.string().hex().optional().allow(null, ""),
+      org: import_joi32.default.string().hex().optional().allow(null, ""),
+      app: import_joi32.default.string().optional().allow(null, ""),
       search: import_joi32.default.string().optional().allow(null, "")
     });
     const { error } = validation.validate(req.query);
@@ -26867,8 +26850,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({
@@ -26876,8 +26859,8 @@ function useSchoolController() {
         limit,
         sort: sortObj,
         status,
-        region,
-        division,
+        org,
+        app,
         search
       });
       res.status(200).json(schools);