@7365admin1/core 3.74.0 → 3.75.0

package/dist/index.mjs

@@ -3166,6 +3166,16 @@ import {
 } from "@7365admin1/node-server-utils";
 import { v4 as uuidv4 } from "uuid";
 
+// src/utils/service-app-type.util.ts
+var APP_TYPE_ALIASES = Object.freeze({
+  real_estate_developer: "property_management_agency"
+});
+function serviceAppType(type) {
+  if (typeof type !== "string")
+    return type;
+  return APP_TYPE_ALIASES[type] ?? type;
+}
+
 // src/repositories/member.repo.ts
 import {
   AppError as AppError2,
@@ -3328,7 +3338,7 @@ function useMemberRepo() {
   }
   async function add(value, session) {
     try {
-      value = MMember(value);
+      value = MMember({ ...value, type: serviceAppType(value.type) });
       await collection.insertOne(value, { session });
       delNamespace().then(() => {
         logger7.info(`Cache cleared for namespace: ${namespace_collection3}`);
@@ -3456,6 +3466,7 @@ function useMemberRepo() {
     }
   }
   async function getByUserIdType(user, type) {
+    type = serviceAppType(type);
     try {
       user = new ObjectId13(user);
     } catch (error) {
@@ -3615,7 +3626,7 @@ function useMemberRepo() {
     search = search || "";
     page = page > 0 ? page - 1 : 0;
     const query2 = {
-      type,
+      type: serviceAppType(type),
       status
     };
     const cacheOptions = {
@@ -4137,6 +4148,7 @@ function useMemberRepo() {
     }
   }
   async function getByUserIdTypeOrg(user, type, org) {
+    type = serviceAppType(type);
     try {
       user = new ObjectId13(user);
     } catch {
@@ -11751,7 +11763,7 @@ function useRoleRepo() {
   const { delNamespace, setCache, getCache } = useCache14(namespace_collection3);
   const { delNamespace: _delDashboardNameSpace } = useCache14("dashboard");
   async function addRole(value, session) {
-    value = new MRole(value);
+    value = new MRole({ ...value, type: serviceAppType(value.type) });
     try {
       const res = await collection.insertOne(value, { session });
       delNamespace().then(() => {
@@ -11854,6 +11866,7 @@ function useRoleRepo() {
     if (!name) {
       throw new BadRequestError33("Role name is required.");
     }
+    type = serviceAppType(type);
     const query2 = type ? { name, type } : { name };
     try {
       const cacheKey = makeCacheKey11(namespace_collection3, query2);
@@ -11910,8 +11923,8 @@ function useRoleRepo() {
       cacheOptions.search = search;
     }
     if (type) {
-      query2.type = type;
-      cacheOptions.type = type;
+      query2.type = serviceAppType(type);
+      cacheOptions.type = query2.type;
     }
     const cacheKey = makeCacheKey11(namespace_collection3, cacheOptions);
     const cachedData = await getCache(cacheKey);
@@ -14552,13 +14565,14 @@ function defaultOwnerRoles(org, nature, appOwnerPermissions) {
     { ...owner, type: "organization" },
     { ...administrator, type: "organization" }
   ];
-  if (nature && APP_SERVICE_TYPES.has(nature)) {
+  const appType = serviceAppType(nature);
+  if (appType && APP_SERVICE_TYPES.has(appType)) {
     roles.push({
       ...owner,
-      type: nature,
+      type: appType,
       ...appOwnerPermissions?.length && { permissions: [...appOwnerPermissions] }
     });
-    roles.push({ ...administrator, type: nature });
+    roles.push({ ...administrator, type: appType });
   }
   return roles;
 }
@@ -14643,15 +14657,17 @@ async function moduleCeiling(org, site) {
 }
 async function ownerGrantCeiling(org, type) {
   const orgId = org?.toString() ?? "";
+  type = serviceAppType(type);
   if (!orgId || !type)
     return null;
   try {
     const orgDoc = await useOrgRepo().getById(orgId).catch(() => null);
-    if (!orgDoc?.invitedRole || orgDoc.nature !== type)
+    const appType = serviceAppType(orgDoc?.nature);
+    if (!orgDoc?.invitedRole || appType !== type)
       return null;
     const role = await useRoleRepo().getRoleById(String(orgDoc.invitedRole)).catch(() => null);
     const permissions = role?.permissions;
-    const chosen = role && String(role.org ?? "") === orgId && role.default === true && role.type === orgDoc.nature && Array.isArray(permissions) && permissions.length > 0 && !permissions.includes("*");
+    const chosen = role && String(role.org ?? "") === orgId && role.default === true && role.type === appType && Array.isArray(permissions) && permissions.length > 0 && !permissions.includes("*");
     return chosen ? permissions.map(String) : null;
   } catch {
     return null;
@@ -25657,7 +25673,7 @@ function useOrgController() {
         invitedModules?.permissions
       );
       const appOwnerRole = invitedModules?.permissions.length ? seededRoles.find(
-        (role) => role.type === body.nature && role.name === "owner"
+        (role) => role.type === serviceAppType(body.nature) && role.name === "owner"
       ) : void 0;
       if (appOwnerRole) {
         try {