@7365admin1/core 3.139.1 → 3.140.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 3.140.0
+
+### Minor Changes
+
+- ff48585: A person's memberships list (`GET /members/users/:id`) leaves out taken-away (inactive / deleted) memberships by default; `?include=removed` returns the history. One shared entitlement test (`isEntitledMembership`, `entitledMemberships`) now also drives the site/org membership lookup, notification categories and role permissions.
+
 ## 3.139.1
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1095,7 +1095,9 @@ declare function useMemberService(): {
     updateSiteById: (id: string, siteId: string, siteName: string) => Promise<{
         message: string;
     }>;
-    getAllByUser: (user: string) => Promise<{
+    getAllByUser: (user: string, { includeRemoved }?: {
+        includeRemoved?: boolean | undefined;
+    }) => Promise<{
         items: TMember[];
         total: number;
     }>;

package/dist/index.js

@@ -4374,7 +4374,10 @@ function sameAppType(a, b) {
 // src/utils/member-lookup.util.ts
 var idOf = (v) => v == null ? "" : String(v?._id ?? v).toLowerCase();
 function isLiveMembership(m) {
-  return m.status !== "deleted" && !m.deletedAt;
+  return !TAKEN_AWAY_MEMBER_STATUSES.includes(String(m?.status ?? "")) && !m?.deletedAt;
+}
+function entitledMemberships(rows) {
+  return (Array.isArray(rows) ? rows : []).filter(isLiveMembership);
 }
 function pickSiteMembership(rows, type, site, org = "") {
   site = site.toLowerCase();
@@ -23154,7 +23157,8 @@ async function getUserPermissions(params) {
   if (!roleId || !import_mongodb51.ObjectId.isValid(roleId)) {
     const memberQuery = {
       user: new import_mongodb51.ObjectId(user),
-      status: { $ne: "deleted" }
+      // A taken-away (inactive) row grants no permissions either.
+      status: { $nin: TAKEN_AWAY_MEMBER_STATUSES }
     };
     if (org && import_mongodb51.ObjectId.isValid(org)) {
       memberQuery.org = new import_mongodb51.ObjectId(org);
@@ -29442,9 +29446,10 @@ function useMemberService() {
       throw error;
     }
   }
-  async function getAllByUser(user) {
+  async function getAllByUser(user, { includeRemoved = false } = {}) {
     try {
-      const members = await _getAllByUserId(user);
+      const all = await _getAllByUserId(user);
+      const members = includeRemoved ? all : entitledMemberships(all);
       return {
         items: members,
         total: members.length
@@ -30005,7 +30010,9 @@ function useMemberController() {
       return;
     }
     try {
-      const data = await _getAllByUser(userId);
+      const data = await _getAllByUser(userId, {
+        includeRemoved: req.query.include === "removed"
+      });
       const whole = await requireSelfOrPlatformStaff(req, userId, {
         resource: "members",
         action: "view-members"
@@ -30046,7 +30053,7 @@ function useMemberController() {
         org
       ) : null;
       const inOrg = org && !atSite ? await _getByUserIdTypeOrg(user, type, org).catch(() => null) : null;
-      const liveInOrg = inOrg && inOrg.status !== "deleted" && !inOrg.deletedAt ? inOrg : null;
+      const liveInOrg = inOrg && isLiveMembership(inOrg) ? inOrg : null;
       const data = atSite ?? liveInOrg ?? await _getByUserIdType(user, type);
       res.json(data);
       return;
@@ -108075,7 +108082,7 @@ function useNotificationPreferenceService() {
     const db2 = import_node_server_utils330.useAtlas.getDb();
     if (!db2)
       return [];
-    const members = await db2.collection("members").find({ user: new import_mongodb200.ObjectId(userId), status: { $ne: "deleted" } }).toArray();
+    const members = await db2.collection("members").find({ user: new import_mongodb200.ObjectId(userId), status: { $nin: TAKEN_AWAY_MEMBER_STATUSES } }).toArray();
     if (!members.length)
       return [];
     const isResident = members.some((m) => m.type === "resident");