@jskit-ai/workspaces-core 0.2.12 → 0.2.13

package/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- `services.members.getMember(workspace, userId, options)` answers one active member's summary, the same as their `listMembers` entry, or `null` for a removed or unknown member. It reads that one membership through `workspaceMembershipsRepository.findActiveByWorkspaceIdAndUserId`, so a per-member lookup (a notification's recipient check, for example) costs the same few statements in a workspace of 10 or 1,000 members instead of listing them all.
 - The workspace, settings, member and invitation field messages are sent in the coded form `{ code, message, params }`, so their field errors translate. The English is unchanged.
 - The resources' save, delete and validation feedback names catalog keys under `jskit.workspaces.feedback.*` instead of plain English; JSKIT's forms render them with `text()`, so the English shown is unchanged.
 - The invitation email writes its expiry date with `Intl` in the recipient's locale and saved time zone (UTC without one), for example "November 2, 2026 at 12:00 AM UTC", instead of the raw ISO timestamp. An app's own `workspaces.invite-email-template` also receives the recipient's `timeZone` next to `locale`.

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@jskit-ai/workspaces-core",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "type": "module",
   "scripts": {
-    "test": "node --test --test-concurrency=1"
+    "test": "jskit test"
   },
   "exports": {
     "./server/WorkspacesFeature": "./src/server/WorkspacesFeature.js",
@@ -22,11 +22,11 @@
     "./locales/en.json": "./locales/en.json"
   },
   "dependencies": {
-    "@jskit-ai/database-runtime": "0.1.259",
-    "@jskit-ai/json-rest-api-core": "0.2.11",
-    "@jskit-ai/resource-core": "0.1.201",
-    "@jskit-ai/resource-crud-core": "0.1.201",
-    "@jskit-ai/users-core": "0.2.12",
+    "@jskit-ai/database-runtime": "0.1.260",
+    "@jskit-ai/json-rest-api-core": "0.2.12",
+    "@jskit-ai/resource-core": "0.1.202",
+    "@jskit-ai/resource-crud-core": "0.1.202",
+    "@jskit-ai/users-core": "0.2.13",
     "json-rest-schema": "^1.0.17"
   },
   "description": "Workspace tenancy runtime plus HTTP routes, role catalog, and workspace config scaffolding.",
@@ -198,8 +198,8 @@
     }
   },
   "peerDependencies": {
-    "@jskit-ai/auth-core": "0.2.10",
-    "@jskit-ai/http-runtime": "0.2.10",
-    "@jskit-ai/kernel": "0.2.10"
+    "@jskit-ai/auth-core": "0.2.11",
+    "@jskit-ai/http-runtime": "0.2.11",
+    "@jskit-ai/kernel": "0.2.11"
   }
 }

package/src/server/common/repositories/workspaceMembershipsRepository.js

@@ -42,6 +42,21 @@ function normalizeMemberSummaryRow(row) {
   };
 }
 
+// A membership read with its user included, as a member summary.
+function memberSummaryFromMembership(row) {
+  if (!row) {
+    return null;
+  }
+
+  return normalizeMemberSummaryRow({
+    user_id: row.user?.id,
+    role_sid: row.roleSid,
+    status: row.status,
+    display_name: row.user?.displayName,
+    email: row.user?.email
+  });
+}
+
 /** @param {{ api: import("@jskit-ai/json-rest-api-core/server/types").RuntimeJsonRestApi }} dependencies */
 function createRepository({ api }) {
   const withTransaction = (work) => retryDeadlocks(() => api.transaction(work));
@@ -215,20 +230,34 @@ function createRepository({ api }) {
       { include: ["user"] }
     );
 
-    const members = rows
-      .map((row) => normalizeMemberSummaryRow({
-        user_id: row?.user?.id,
-        role_sid: row?.roleSid,
-        status: row?.status,
-        display_name: row?.user?.displayName,
-        email: row?.user?.email
-      }))
-      .filter(Boolean);
+    const members = rows.map(memberSummaryFromMembership).filter(Boolean);
 
     members.sort((left, right) => String(left.displayName || "").localeCompare(String(right.displayName || "")));
     return members;
   }
 
+  // One active member's summary, as listActiveByWorkspaceId lists it, or null. Its cost does not grow
+  // with the workspace's members.
+  async function findActiveByWorkspaceIdAndUserId(workspaceId, userId, options = {}) {
+    const normalizedWorkspaceId = normalizeRecordId(workspaceId, { fallback: null });
+    const normalizedUserId = normalizeRecordId(userId, { fallback: null });
+    if (!normalizedWorkspaceId || !normalizedUserId) {
+      return null;
+    }
+
+    const rows = await queryMemberships(
+      {
+        workspace: normalizedWorkspaceId,
+        user: normalizedUserId,
+        status: "active"
+      },
+      options,
+      { include: ["user"] }
+    );
+
+    return memberSummaryFromMembership(rows[0] || null);
+  }
+
   async function listActiveWorkspaceIdsByUserId(userId, options = {}) {
     const normalizedUserId = normalizeRecordId(userId, { fallback: null });
     if (!normalizedUserId) {
@@ -255,6 +284,7 @@ function createRepository({ api }) {
     ensureOwnerMembership,
     upsertMembership,
     listActiveByWorkspaceId,
+    findActiveByWorkspaceIdAndUserId,
     listActiveWorkspaceIdsByUserId
   });
 }

package/src/server/workspaceMembers/workspaceMembersService.js

@@ -208,6 +208,13 @@ function createService({
     });
   }
 
+  // One active member's summary, the same as their listMembers entry, or null for a removed or
+  // unknown member. It reads one membership, so a per-member lookup costs the same in any workspace.
+  async function getMember(workspace, userId, options = {}) {
+    const member = await workspaceMembershipsRepository.findActiveByWorkspaceIdAndUserId(workspace.id, userId, options);
+    return member ? mapMemberSummary(member, workspace) : null;
+  }
+
   async function listMembersResponse(workspace, options = {}) {
     return returnJsonApiData(await listMembers(workspace, options));
   }
@@ -410,6 +417,7 @@ function createService({
     listRoles,
     listRolesResponse,
     listMembers,
+    getMember,
     listMembersResponse,
     updateMemberRole,
     removeMember,

package/test/repositories.integration.test.js

@@ -238,6 +238,20 @@ describe(`users and workspaces repositories on migrated ${databaseLabel}`, () =>
     assert.deepEqual(await workspaces.listForUserId(member.id), []);
   });
 
+  const createMembers = () => createMembersService({
+    workspaceMembershipsRepository: memberships,
+    workspaceInvitesRepository: invites,
+    inviteExpiresInMs: 86400000,
+    roleCatalog: createWorkspaceRoleCatalog(),
+    workspaceInvitationsEnabled: false,
+    inviteUrlBuilder: createWorkspaceInviteUrlBuilder({ appConfig: {}, env: {} }),
+    workspaceInviteMailer: unconfiguredWorkspaceInviteMailer,
+    workspaceInviteEmailTemplate: renderDefaultWorkspaceInviteEmail,
+    i18n: createWorkspacesServerI18n(),
+    userProfilesRepository: profiles,
+    userSettingsRepository: userSettings
+  });
+
   // Lists of more rows than json-rest-api's default page (20) and maximum page (100), written in bulk.
   async function insertRows(table, rows) {
     for (let start = 0; start < rows.length; start += 100) {
@@ -289,19 +303,7 @@ describe(`users and workspaces repositories on migrated ${databaseLabel}`, () =>
     assert.deepEqual(listed.map(({ displayName }) => displayName), expectedNames);
     assert.equal(new Set(listed.map(({ userId }) => userId)).size, 1050);
 
-    const membersService = createMembersService({
-      workspaceMembershipsRepository: memberships,
-      workspaceInvitesRepository: invites,
-      inviteExpiresInMs: 86400000,
-      roleCatalog: createWorkspaceRoleCatalog(),
-      workspaceInvitationsEnabled: false,
-      inviteUrlBuilder: createWorkspaceInviteUrlBuilder({ appConfig: {}, env: {} }),
-      workspaceInviteMailer: unconfiguredWorkspaceInviteMailer,
-      workspaceInviteEmailTemplate: renderDefaultWorkspaceInviteEmail,
-      i18n: createWorkspacesServerI18n(),
-      userProfilesRepository: profiles,
-      userSettingsRepository: userSettings
-    });
+    const membersService = createMembers();
     const { members } = await membersService.listMembers(workspace);
     assert.deepEqual(members.map(({ userId }) => userId), listed.map(({ userId }) => userId));
     assert.deepEqual(members.filter(({ isOwner }) => isOwner).map(({ userId }) => userId), [ownerId]);
@@ -315,6 +317,66 @@ describe(`users and workspaces repositories on migrated ${databaseLabel}`, () =>
     });
   });
 
+  test("getMember answers a member's listMembers entry at the same cost among 10 and 200 members", async () => {
+    const usernames = Array.from({ length: 212 }, (_, index) => `person-${String(index).padStart(3, "0")}`);
+    const users = await insertUsers(usernames, (username) => username.replace("person-", "Person "));
+    const ownerId = users.get("person-000");
+    const small = await workspaces.insert({ slug: "small-team", name: "Small Team", ownerUserId: ownerId });
+    const large = await workspaces.insert({ slug: "large-team", name: "Large Team", ownerUserId: ownerId });
+    // Small: persons 0-9 (9 removed). Large: persons 0 and 10-209 (209 removed). 210 and 211 are in neither.
+    const membership = (workspaceId, username, status = "active") => ({
+      workspace_id: workspaceId,
+      user_id: users.get(username),
+      role_sid: users.get(username) === ownerId ? "owner" : "member",
+      status
+    });
+    await insertRows("workspace_memberships", [
+      ...usernames.slice(0, 10).map((username) => membership(small.id, username, username === "person-009" ? "revoked" : "active")),
+      membership(large.id, "person-000"),
+      ...usernames.slice(10, 210).map((username) => membership(large.id, username, username === "person-209" ? "revoked" : "active"))
+    ]);
+    const membersService = createMembers();
+    async function statementsOf(run) {
+      let statements = 0;
+      const onQuery = () => { statements += 1; };
+      knex.on("query", onQuery);
+      try {
+        const result = await run();
+        return { result, statements };
+      } finally {
+        knex.removeListener("query", onQuery);
+      }
+    }
+
+    for (const [workspace, memberName, removedName] of [
+      [small, "person-004", "person-009"],
+      [large, "person-150", "person-209"]
+    ]) {
+      const { members } = await membersService.listMembers(workspace);
+      for (const userId of [users.get(memberName), ownerId]) {
+        const entry = members.find((member) => member.userId === userId);
+        assert.ok(entry);
+        assert.deepEqual(await membersService.getMember(workspace, userId), entry);
+      }
+      assert.equal((await membersService.getMember(workspace, ownerId)).isOwner, true);
+      assert.equal(await membersService.getMember(workspace, users.get(removedName)), null);
+      assert.equal(await membersService.getMember(workspace, users.get("person-211")), null);
+      assert.equal(await membersService.getMember(workspace, "999999"), null);
+    }
+    assert.equal(await membersService.getMember(small, users.get("person-150")), null);
+
+    const smallRead = await statementsOf(() => membersService.getMember(small, users.get("person-004")));
+    const largeRead = await statementsOf(() => membersService.getMember(large, users.get("person-150")));
+    assert.equal(smallRead.result.displayName, "Person 004");
+    assert.equal(largeRead.result.displayName, "Person 150");
+    assert.equal(largeRead.statements, smallRead.statements);
+    assert.ok(smallRead.statements <= 4, `one member read costs ${smallRead.statements} statements`);
+    await profiles.withTransaction(async (trx) => {
+      const member = await membersService.getMember(large, users.get("person-150"), { trx });
+      assert.equal(member.userId, users.get("person-150"));
+    });
+  });
+
   test("a member of 130 workspaces has all of them listed", async () => {
     const users = await insertUsers(["host", "roaming"]);
     const workspaceIds = await insertWorkspaces(135, users.get("host"));

package/test/workspaceMembershipsRepository.test.js

@@ -283,7 +283,7 @@ test("workspaceMembershipsRepository.listActiveWorkspaceIdsByUserId returns norm
       },
       include: ["workspace"],
       sort: ["id"],
-      page: { size: 100 }
+      page: { size: 1000 }
     }
   ]);
 });