From 152ee16218353b3d74f950dd4a860422cb152d4b Mon Sep 17 00:00:00 2001 From: Antony Rizzitelli Date: Fri, 20 Nov 2026 22:18:51 +0000 Subject: [PATCH 1/3] refactor(dms): read tenant members through bounded queries instead of listAll page_verify picks a sole holder per role with one projected row per role, and the tests read only the member fields they compare. --- packages/dms/src/mcp/page-verify/accounts.ts | 53 ++++++++++++------- .../notification-recipients.test.ts | 13 +++-- .../dms/src/test/unit/mcp/page-verify.test.ts | 45 +++++++++++++--- .../pages/settings/role-holder-reads.test.ts | 18 +++++-- 4 files changed, 94 insertions(+), 35 deletions(-) diff --git a/packages/dms/src/mcp/page-verify/accounts.ts b/packages/dms/src/mcp/page-verify/accounts.ts index 0f85e21a4..a8b280c52 100644 --- a/packages/dms/src/mcp/page-verify/accounts.ts +++ b/packages/dms/src/mcp/page-verify/accounts.ts @@ -1,4 +1,4 @@ -import { CROSS_INSTANCE } from "@antelopejs/interface-database"; +import { CROSS_INSTANCE, ValueProxy } from "@antelopejs/interface-database"; import { GetModel } from "@antelopejs/interface-database-decorators"; import { createSession } from "@antelopejs/interface-dms/auth"; import { @@ -81,38 +81,51 @@ async function ownerTenantId(owner: User): Promise { } /** - * A member holding `roleId` and nothing more: any other role, or owning the - * workspace or the platform, could open what the role alone does not. + * A member of `model`'s instance holding `roleId` and nothing more: any other + * role, or owning the workspace or the platform, could open what the role + * alone does not. */ -export function pickMember( - members: readonly MemberRoles[], +export async function pickMember( + model: TenantMemberModel, roleId: string, ownerIds: ReadonlySet, -): MemberRoles | undefined { - return members.find( - (member) => - member.roleIds.length === 1 && - member.roleIds[0] === roleId && - !member.isTenantOwner && - !ownerIds.has(member.userId), - ); +): Promise { + const member = await model.table + .filter((row) => + row + .key("roleIds", []) + .eq([roleId]) + .and(row.key("isTenantOwner").eq(true).not()) + .and( + ValueProxy.constant([...ownerIds]) + .includes(row.key("userId")) + .not(), + ), + ) + .pluck("userId", "roleIds", "isTenantOwner") + .nth(0) + .default(null) + .run(); + return member ?? undefined; } /** The owner's workspace, its roles, and a member to sign in as for each role. */ export async function loadWorkspace(): Promise { const owner = await findOwner(); const tenantId = await ownerTenantId(owner); - const [roles, members, owners] = await Promise.all([ + const [roles, owners] = await Promise.all([ GetModel(RoleModel, tenantId).getAll(), - GetModel(TenantMemberModel, tenantId).listAll(), GetModel(UserModel).getOwners(), ]); const ownerIds = new Set(owners.map((user) => user._id)); - const memberByRole = new Map(); - for (const role of roles) { - const member = pickMember(members, role._id, ownerIds); - if (member !== undefined) memberByRole.set(role._id, member); - } + const members = GetModel(TenantMemberModel, tenantId); + const picked = await Promise.all( + roles.map(async (role): Promise> => { + const member = await pickMember(members, role._id, ownerIds); + return member === undefined ? [] : [[role._id, member]]; + }), + ); + const memberByRole = new Map(picked.flat()); return { tenantId, owner, roles, memberByRole }; } diff --git a/packages/dms/src/test/integration/notification-recipients.test.ts b/packages/dms/src/test/integration/notification-recipients.test.ts index c3a1bcce1..e5c00d33c 100644 --- a/packages/dms/src/test/integration/notification-recipients.test.ts +++ b/packages/dms/src/test/integration/notification-recipients.test.ts @@ -44,7 +44,10 @@ async function recipients(): Promise { return rows.map((row) => row.userId).sort(); } -function holdersInJs(members: TenantMember[], roleIds: string[]): string[] { +function holdersInJs( + members: Pick[], + roleIds: string[], +): string[] { const wanted = new Set(roleIds); const userIds = new Set(); for (const row of members) { @@ -86,7 +89,9 @@ describe("Notification recipients (MongoDB adapter)", () => { }); it("sends to a role the members of one tenant the in-memory filter picked", async () => { - const members = await GetModel(TenantMemberModel, "recipients-a").listAll(); + const members = await GetModel(TenantMemberModel, "recipients-a") + .table.pluck("userId", "roleIds") + .run(); await internal.SendToRoles([ADMIN, SUPPORT], data, { tenantId: "recipients-a", @@ -99,7 +104,9 @@ describe("Notification recipients (MongoDB adapter)", () => { }); it("sends once to a user holding the role in several tenants when read across them", async () => { - const members = await GetModel(TenantMemberModel, CROSS_INSTANCE).listAll(); + const members = await GetModel(TenantMemberModel, CROSS_INSTANCE) + .table.pluck("userId", "roleIds") + .run(); await internal.SendToRoles([ADMIN, SUPPORT], data, { dedupe: false }); diff --git a/packages/dms/src/test/unit/mcp/page-verify.test.ts b/packages/dms/src/test/unit/mcp/page-verify.test.ts index fd975a0a9..e15e35b1b 100644 --- a/packages/dms/src/test/unit/mcp/page-verify.test.ts +++ b/packages/dms/src/test/unit/mcp/page-verify.test.ts @@ -1,10 +1,11 @@ +import { GetModel } from "@antelopejs/interface-database-decorators"; +import { TenantMemberModel } from "@antelopejs/interface-dms/db"; import type { JsonValue } from "@antelopejs/interface-dms/json"; import type { PageInfo } from "@antelopejs/interface-dms/page"; import { expect } from "chai"; import { isToolAllowed } from "../../../mcp/access"; import { listFailures, - type MemberRoles, pickMember, type PageProbe, type PageReport, @@ -211,23 +212,53 @@ function namesSourcesAndJudgesOpeners(): void { } function checksRolesAndListsFailures(): void { - it("checks a role only through a member holding that role alone, never through an owner or a member with more roles", () => { + it("checks a role only through a member of the workspace holding that role alone, never through an owner or a member with more roles", async () => { + const tenant = "page-verify-pick-member"; const member = ( userId: string, roleIds: string[], isTenantOwner = false, - ): MemberRoles => ({ userId, roleIds, isTenantOwner }); - const members = [ + ) => ({ + _id: `${tenant}-${userId}`, + userId, + roleIds, + isTenantOwner, + joinedAt: new Date("2026-06-01T00:00:00Z"), + invitedBy: null, + }); + const members = GetModel(TenantMemberModel, tenant); + await members.insert([ member("both", ["nobody", "viewer"]), member("owner", ["viewer"], true), member("platform", ["viewer"]), member("viewer-only", ["viewer"]), - ]; + member("auditor-only", ["auditor"]), + ]); + await members.table + .insert({ + _id: `${tenant}-without-roles`, + userId: "without-roles", + isTenantOwner: false, + joinedAt: new Date("2026-06-01T00:00:00Z"), + invitedBy: null, + }) + .run(); + await GetModel(TenantMemberModel, `${tenant}-other`).insert([ + member("elsewhere", ["solo"]), + ]); const owners = new Set(["platform"]); - expect(pickMember(members, "nobody", owners)).to.equal(undefined); - expect(pickMember(members, "viewer", owners)?.userId).to.equal( + + expect(await pickMember(members, "nobody", owners)).to.equal(undefined); + expect(await pickMember(members, "solo", new Set())).to.equal(undefined); + expect((await pickMember(members, "viewer", owners))?.userId).to.equal( "viewer-only", ); + expect((await pickMember(members, "auditor", new Set()))?.userId).to.equal( + "auditor-only", + ); + expect( + await pickMember(members, "auditor", new Set(["auditor-only"])), + ).to.equal(undefined); }); it("lists one line per failed check and none for the checks that passed", () => { diff --git a/packages/dms/src/test/unit/pages/settings/role-holder-reads.test.ts b/packages/dms/src/test/unit/pages/settings/role-holder-reads.test.ts index d8e3e27f4..8ab4fff12 100644 --- a/packages/dms/src/test/unit/pages/settings/role-holder-reads.test.ts +++ b/packages/dms/src/test/unit/pages/settings/role-holder-reads.test.ts @@ -32,9 +32,15 @@ const CAPABILITIES = { canAdd: true, canEdit: true, canDelete: true }; const ROLE_KEYS = ["support", "admin", "ops-1", "ops-2", "unheld"]; +/** The fields of a membership the in-memory answers read. */ +type StoredMember = Pick< + TenantMember, + "_id" | "userId" | "roleIds" | "isTenantOwner" +>; + interface Fixture { roles: Role[]; - members: TenantMember[]; + members: StoredMember[]; invites: UserInvite[]; } @@ -136,7 +142,7 @@ function isInvitePending(invite: UserInvite, now: Date): boolean { return new Date(invite.expiresAt).getTime() > now.getTime(); } -function holdsRole(roleId: string, member: TenantMember): boolean { +function holdsRole(roleId: string, member: StoredMember): boolean { return (member.roleIds ?? []).includes(roleId); } @@ -153,7 +159,7 @@ function pendingInvitesFor( function countRoleHoldersInJs( roleId: string, - members: TenantMember[], + members: StoredMember[], invites: UserInvite[], now: Date, ): number { @@ -163,7 +169,7 @@ function countRoleHoldersInJs( ); } -function previewInJs(members: TenantMember[], userNames: Map) { +function previewInJs(members: StoredMember[], userNames: Map) { return members.slice(0, ROLE_MEMBER_PREVIEW_LIMIT).map((member) => ({ userId: member.userId, name: userNames.get(member.userId) ?? "", @@ -196,7 +202,9 @@ function summarizeRolesInJs( async function storedRows(tenantId: string) { const [members, invites] = await Promise.all([ - GetModel(TenantMemberModel, tenantId).listAll(), + GetModel(TenantMemberModel, tenantId) + .table.pluck("_id", "userId", "roleIds", "isTenantOwner") + .run(), GetModel(UserInviteModel, tenantId).getAll(), ]); return { members, invites }; From 64a0968f0e39b38d9b5d6b58e21fb47eaa04097c Mon Sep 17 00:00:00 2001 From: Antony Rizzitelli Date: Fri, 20 Nov 2026 22:18:55 +0000 Subject: [PATCH 2/3] refactor(interface-dms)!: remove TenantMemberModel.listAll() BREAKING CHANGE: TenantMemberModel.listAll() is gone. Read members through count(), listOwners() or a projected, bounded query on the table. --- packages/dms/src/test/helpers/page-layout.ts | 4 ---- packages/interface-dms/docs/1.core/5.tenancy.md | 1 - .../interface-dms/src/db/models/tenantMembers.model.ts | 7 ------- 3 files changed, 12 deletions(-) diff --git a/packages/dms/src/test/helpers/page-layout.ts b/packages/dms/src/test/helpers/page-layout.ts index b8ce67ea1..fac57c6b4 100644 --- a/packages/dms/src/test/helpers/page-layout.ts +++ b/packages/dms/src/test/helpers/page-layout.ts @@ -41,10 +41,6 @@ class UnqueriedMemberModel extends TenantMemberModel { return refuse("memberships"); } - override async listAll(): Promise { - return refuse("memberships"); - } - override async listOwners(): Promise { return refuse("memberships"); } diff --git a/packages/interface-dms/docs/1.core/5.tenancy.md b/packages/interface-dms/docs/1.core/5.tenancy.md index 51e650db0..54c332f9f 100644 --- a/packages/interface-dms/docs/1.core/5.tenancy.md +++ b/packages/interface-dms/docs/1.core/5.tenancy.md @@ -102,7 +102,6 @@ Table `tenant_members` in `dms-tenant`. It holds one row per member of the tenan | ------ | ------- | | `getByUser(userId)` | `Promise` | | `existsByUser(userId)` | `Promise` | -| `listAll()` | `Promise` | | `listOwners()` | `Promise`, the members with `isTenantOwner` set | | `listByUserWithTenantIds(userId)` | `Promise>` | | `getOldestByUser(userId)` | `Promise<{ tenantId: string; member: TenantMember } \| undefined>`, the row with the earliest `joinedAt` | diff --git a/packages/interface-dms/src/db/models/tenantMembers.model.ts b/packages/interface-dms/src/db/models/tenantMembers.model.ts index 1eace1fb0..e57063a93 100644 --- a/packages/interface-dms/src/db/models/tenantMembers.model.ts +++ b/packages/interface-dms/src/db/models/tenantMembers.model.ts @@ -21,13 +21,6 @@ export class TenantMemberModel extends BasicDataModel( return count > 0; } - async listAll(): Promise { - const rows = await this.table.run(); - return rows - .map((row) => TenantMemberModel.fromDatabase(row)) - .filter((member): member is TenantMember => member !== undefined); - } - async listOwners(): Promise { const rows = await this.table .filter((row) => row.key("isTenantOwner").eq(true)) From 16832f53b8dd2207a3a4f572491f9a82971fc73d Mon Sep 17 00:00:00 2001 From: Antony Rizzitelli Date: Fri, 20 Nov 2026 22:23:36 +0000 Subject: [PATCH 3/3] test(dms): pick a member stored without isTenantOwner as a non-owner --- packages/dms/src/test/unit/mcp/page-verify.test.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/dms/src/test/unit/mcp/page-verify.test.ts b/packages/dms/src/test/unit/mcp/page-verify.test.ts index e15e35b1b..8cb3913e7 100644 --- a/packages/dms/src/test/unit/mcp/page-verify.test.ts +++ b/packages/dms/src/test/unit/mcp/page-verify.test.ts @@ -236,9 +236,9 @@ function checksRolesAndListsFailures(): void { ]); await members.table .insert({ - _id: `${tenant}-without-roles`, - userId: "without-roles", - isTenantOwner: false, + _id: `${tenant}-unflagged`, + userId: "unflagged", + roleIds: ["editor"], joinedAt: new Date("2026-06-01T00:00:00Z"), invitedBy: null, }) @@ -259,6 +259,9 @@ function checksRolesAndListsFailures(): void { expect( await pickMember(members, "auditor", new Set(["auditor-only"])), ).to.equal(undefined); + expect((await pickMember(members, "editor", owners))?.userId).to.equal( + "unflagged", + ); }); it("lists one line per failed check and none for the checks that passed", () => {