@7365admin1/core 3.72.1-staging.323 → 3.72.1-staging.324

package/.changeset/real-estate-developer-lookup-both-types.md

@@ -0,0 +1,5 @@
+---
+"@7365admin1/core": patch
+---
+
+Membership and role lookups by type match every stored spelling of an application: a Property Management lookup finds rows stored as `real_estate_developer` (written before 3.75.0) as well as `property_management_agency`, including the module deny list and the owner-grant cap.

package/dist/index.js

@@ -3996,6 +3996,20 @@ function serviceAppType(type) {
     return type;
   return APP_TYPE_ALIASES[type] ?? type;
 }
+function storedAppTypes(type) {
+  const app = serviceAppType(type);
+  return [
+    app,
+    ...Object.keys(APP_TYPE_ALIASES).filter((alias) => APP_TYPE_ALIASES[alias] === app)
+  ];
+}
+function appTypeQuery(type) {
+  const types = storedAppTypes(type);
+  return types.length === 1 ? types[0] : { $in: types };
+}
+function sameAppType(a, b) {
+  return !!a && !!b && serviceAppType(a) === serviceAppType(b);
+}
 
 // src/repositories/member.repo.ts
 var import_node_server_utils14 = require("@7365admin1/node-server-utils");
@@ -4293,7 +4307,7 @@ function useMemberRepo() {
       return cachedData;
     }
     try {
-      const data = await collection.findOne({ user, type });
+      const data = await collection.findOne({ user, type: appTypeQuery(type) });
       if (!data) {
         throw new import_node_server_utils14.NotFoundError("Member not found.");
       }
@@ -4437,7 +4451,7 @@ function useMemberRepo() {
     search = search || "";
     page = page > 0 ? page - 1 : 0;
     const query2 = {
-      type: serviceAppType(type),
+      type: type ? appTypeQuery(type) : type,
       status
     };
     const cacheOptions = {
@@ -4566,7 +4580,7 @@ function useMemberRepo() {
     const query2 = {
       user,
       org: { $nin: [null, ""] },
-      type
+      type: appTypeQuery(type)
     };
     const cacheOptions = {
       page,
@@ -4983,7 +4997,7 @@ function useMemberRepo() {
     try {
       const data = await collection.findOne({
         user,
-        type,
+        type: appTypeQuery(type),
         org
       });
       if (!data) {
@@ -10584,7 +10598,7 @@ function pickSiteMembership(rows, type, site, org = "") {
   if (!site)
     return null;
   const live = rows.filter(
-    (m) => m.type === type && isLiveMembership(m) && (!org || idOf2(m.org) === org)
+    (m) => sameAppType(m.type, type) && isLiveMembership(m) && (!org || idOf2(m.org) === org)
   );
   const atSite = live.find((m) => idOf2(m.siteId) === site);
   if (atSite)
@@ -10598,10 +10612,10 @@ function pickLookupMembership(rows, type, site = "", org = "") {
   const atSite = site ? pickSiteMembership(list, type, site, org) : null;
   if (atSite)
     return atSite;
-  const inOrg = org ? list.find((m) => m.type === type && idOf2(m.org) === org.toLowerCase()) : void 0;
+  const inOrg = org ? list.find((m) => sameAppType(m.type, type) && idOf2(m.org) === org.toLowerCase()) : void 0;
   if (inOrg && isLiveMembership(inOrg))
     return inOrg;
-  return list.find((m) => m.type === type) ?? null;
+  return list.find((m) => sameAppType(m.type, type)) ?? null;
 }
 function memberListSiteScope(memberships, org) {
   const inOrg = (memberships ?? []).filter((m) => idOf2(m.org) === idOf2(org));
@@ -12591,7 +12605,7 @@ function useRoleRepo() {
       return cachedData;
     }
     try {
-      const data = await collection.find({ org, permissions: "*", type, status: "active" }).toArray();
+      const data = await collection.find({ org, permissions: "*", type: appTypeQuery(type), status: "active" }).toArray();
       setCache(cacheKey, data, 15 * 60).then(() => {
         import_node_server_utils42.logger.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
@@ -12631,7 +12645,7 @@ function useRoleRepo() {
       throw new import_node_server_utils42.BadRequestError("Role name is required.");
     }
     type = serviceAppType(type);
-    const query2 = type ? { name, type } : { name };
+    const query2 = type ? { name, type: appTypeQuery(type) } : { name };
     try {
       const cacheKey = (0, import_node_server_utils42.makeCacheKey)(namespace_collection3, query2);
       const cachedData = await getCache(cacheKey);
@@ -12687,8 +12701,8 @@ function useRoleRepo() {
       cacheOptions.search = search;
     }
     if (type) {
-      query2.type = serviceAppType(type);
-      cacheOptions.type = query2.type;
+      query2.type = appTypeQuery(type);
+      cacheOptions.type = serviceAppType(type);
     }
     const cacheKey = (0, import_node_server_utils42.makeCacheKey)(namespace_collection3, cacheOptions);
     const cachedData = await getCache(cacheKey);
@@ -15580,12 +15594,11 @@ async function ownerGrantCeiling(org, type) {
     return null;
   try {
     const orgDoc = await useOrgRepo().getById(orgId).catch(() => null);
-    const appType = serviceAppType(orgDoc?.nature);
-    if (!orgDoc?.invitedRole || appType !== type)
+    if (!orgDoc?.invitedRole || !sameAppType(orgDoc?.nature, 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 === appType && Array.isArray(permissions) && permissions.length > 0 && !permissions.includes("*");
+    const chosen = role && String(role.org ?? "") === orgId && role.default === true && sameAppType(role.type, type) && Array.isArray(permissions) && permissions.length > 0 && !permissions.includes("*");
     return chosen ? permissions.map(String) : null;
   } catch {
     return null;
@@ -26537,7 +26550,7 @@ function useOrgController() {
         invitedModules?.permissions
       );
       const appOwnerRole = invitedModules?.permissions.length ? seededRoles.find(
-        (role) => role.type === serviceAppType(body.nature) && role.name === "owner"
+        (role) => sameAppType(role.type, body.nature) && role.name === "owner"
       ) : void 0;
       if (appOwnerRole) {
         try {