@meith/db 0.28.0 → 0.29.0

package/migrations/0059_member_directory_navigation.sql

@@ -0,0 +1,3 @@
+INSERT INTO "navigation_items" ("key", "href", "display_order", "audience")
+VALUES ('members', '/members', 60, 'all'),
+  ('staff', '/staff', 70, 'all');

package/migrations/meta/_journal.json

@@ -414,6 +414,13 @@
       "when": 1787771682008,
       "tag": "0058_mass_mail_opt_in",
       "breakpoints": true
+    },
+    {
+      "idx": 59,
+      "version": "7",
+      "when": 1788876000000,
+      "tag": "0059_member_directory_navigation",
+      "breakpoints": true
     }
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meith/db",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -22,35 +22,35 @@
   "dependencies": {
     "drizzle-orm": "^0.45.2",
     "postgres": "^3.4.7",
-    "@meith/accounts": "0.28.0",
-    "@meith/admin": "0.28.0",
-    "@meith/antispam": "0.28.0",
-    "@meith/api": "0.28.0",
-    "@meith/attachments": "0.28.0",
-    "@meith/authorization": "0.28.0",
-    "@meith/avatars": "0.28.0",
-    "@meith/core": "0.28.0",
-    "@meith/drafts": "0.28.0",
-    "@meith/events": "0.28.0",
-    "@meith/forums": "0.28.0",
-    "@meith/groups": "0.28.0",
-    "@meith/i18n": "0.28.0",
-    "@meith/markdown": "0.28.0",
-    "@meith/marketplace": "0.28.0",
-    "@meith/messages": "0.28.0",
-    "@meith/moderation": "0.28.0",
-    "@meith/notifications": "0.28.0",
-    "@meith/plugin-kit": "0.28.0",
-    "@meith/polls": "0.28.0",
-    "@meith/profile-fields": "0.28.0",
-    "@meith/relations": "0.28.0",
-    "@meith/reputation": "0.28.0",
-    "@meith/search": "0.28.0",
-    "@meith/settings": "0.28.0",
-    "@meith/signatures": "0.28.0",
-    "@meith/subscriptions": "0.28.0",
-    "@meith/tasks": "0.28.0",
-    "@meith/threads": "0.28.0"
+    "@meith/accounts": "0.29.0",
+    "@meith/admin": "0.29.0",
+    "@meith/antispam": "0.29.0",
+    "@meith/api": "0.29.0",
+    "@meith/attachments": "0.29.0",
+    "@meith/authorization": "0.29.0",
+    "@meith/avatars": "0.29.0",
+    "@meith/core": "0.29.0",
+    "@meith/drafts": "0.29.0",
+    "@meith/events": "0.29.0",
+    "@meith/forums": "0.29.0",
+    "@meith/groups": "0.29.0",
+    "@meith/i18n": "0.29.0",
+    "@meith/markdown": "0.29.0",
+    "@meith/marketplace": "0.29.0",
+    "@meith/messages": "0.29.0",
+    "@meith/moderation": "0.29.0",
+    "@meith/notifications": "0.29.0",
+    "@meith/plugin-kit": "0.29.0",
+    "@meith/polls": "0.29.0",
+    "@meith/profile-fields": "0.29.0",
+    "@meith/relations": "0.29.0",
+    "@meith/search": "0.29.0",
+    "@meith/settings": "0.29.0",
+    "@meith/signatures": "0.29.0",
+    "@meith/subscriptions": "0.29.0",
+    "@meith/tasks": "0.29.0",
+    "@meith/threads": "0.29.0",
+    "@meith/reputation": "0.29.0"
   },
   "devDependencies": {
     "drizzle-kit": "^0.31.6",

package/src/group-identity-repo.ts

@@ -15,6 +15,18 @@ export interface GroupIdentity {
 
 export interface MemberStanding extends GroupIdentity {
   readonly reputation: number
+  readonly groups: readonly GroupIdentity[]
+}
+
+function identityOf(row: Record<string, unknown>): GroupIdentity {
+  return {
+    groupId: Number(row.group_id),
+    title: String(row.title),
+    nameColorLight: row.name_color_light === null ? null : String(row.name_color_light),
+    nameColorDark: row.name_color_dark === null ? null : String(row.name_color_dark),
+    badgeImageLight: row.badge_image_light === null ? null : String(row.badge_image_light),
+    badgeImageDark: row.badge_image_dark === null ? null : String(row.badge_image_dark),
+  }
 }
 
 export class PostgresGroupIdentityRepository {
@@ -32,33 +44,47 @@ export class PostgresGroupIdentityRepository {
                g.name_color_light,
                g.name_color_dark,
                g.badge_image_light,
-               g.badge_image_dark
+               g.badge_image_dark,
+               (g.id = ${displayGroupIdSql('u', 'p')}) as is_display
           from users u
           join usergroups p
             on p.id = u.primary_group_id
           join usergroups g
             on g.id = ${displayGroupIdSql('u', 'p')}
+            or g.id = u.primary_group_id
+            or g.id in (
+              select m.group_id
+                from user_group_memberships m
+               where m.user_id = u.id
+                 and (m.expires_at is null or m.expires_at > now())
+            )
          where u.id in ${sql`(${sql.join(
            userIds.map((id) => sql`${id}`),
            sql`, `,
          )})`}
+         order by u.id, is_display desc, g.display_order, g.title, g.id
       `),
     ) as Array<Record<string, unknown>>
 
-    return new Map(
-      rows.map((row) => [
-        Number(row.user_id),
-        {
-          groupId: Number(row.group_id),
-          title: String(row.title),
-          nameColorLight: row.name_color_light === null ? null : String(row.name_color_light),
-          nameColorDark: row.name_color_dark === null ? null : String(row.name_color_dark),
-          badgeImageLight: row.badge_image_light === null ? null : String(row.badge_image_light),
-          badgeImageDark: row.badge_image_dark === null ? null : String(row.badge_image_dark),
-          reputation: Number(row.reputation ?? 0),
-        },
-      ]),
-    )
+    const byUser = new Map<number, { reputation: number; groups: GroupIdentity[] }>()
+
+    for (const row of rows) {
+      const userId = Number(row.user_id)
+      let entry = byUser.get(userId)
+      if (entry === undefined) {
+        entry = { reputation: Number(row.reputation ?? 0), groups: [] }
+        byUser.set(userId, entry)
+      }
+      entry.groups.push(identityOf(row))
+    }
+
+    const standings = new Map<number, MemberStanding>()
+    for (const [userId, entry] of byUser) {
+      const display = entry.groups[0]
+      if (display === undefined) continue
+      standings.set(userId, { ...display, reputation: entry.reputation, groups: entry.groups })
+    }
+    return standings
   }
 
   async styled(): Promise<readonly GroupIdentity[]> {
@@ -72,13 +98,6 @@ export class PostgresGroupIdentityRepository {
       `),
     ) as Array<Record<string, unknown>>
 
-    return rows.map((row) => ({
-      groupId: Number(row.group_id),
-      title: String(row.title),
-      nameColorLight: row.name_color_light === null ? null : String(row.name_color_light),
-      nameColorDark: row.name_color_dark === null ? null : String(row.name_color_dark),
-      badgeImageLight: row.badge_image_light === null ? null : String(row.badge_image_light),
-      badgeImageDark: row.badge_image_dark === null ? null : String(row.badge_image_dark),
-    }))
+    return rows.map(identityOf)
   }
 }

package/src/index.ts

@@ -157,6 +157,13 @@ export {
 } from './latest-repo'
 export { PostgresMaintenanceRepository } from './maintenance-repo'
 export { PostgresMarketplaceCacheRepository } from './marketplace-repo'
+export {
+  type MemberDirectoryPage,
+  type MemberDirectoryRow,
+  type MemberDirectorySort,
+  PostgresMemberDirectoryRepository,
+  type StaffGroupRow,
+} from './member-directory-repo'
 export { PostgresMemberProfileRepository } from './member-profile-repo'
 export { PostgresMemberSettingsRepository } from './member-settings-repo'
 export { PostgresMessageRepository } from './message-repo'

package/src/member-directory-repo.ts

@@ -0,0 +1,118 @@
+import { sql } from 'drizzle-orm'
+
+import type { Database } from './client'
+import { resultRows } from './result-rows'
+
+export type MemberDirectorySort = 'name' | 'posts' | 'joined'
+
+export interface MemberDirectoryRow {
+  readonly id: number
+  readonly username: string
+  readonly postCount: number
+  readonly createdAt: Date
+}
+
+export interface MemberDirectoryPage {
+  readonly rows: readonly MemberDirectoryRow[]
+  readonly total: number
+}
+
+export interface StaffGroupRow {
+  readonly groupId: number
+  readonly title: string
+  readonly description: string | null
+  readonly members: readonly { readonly id: number; readonly username: string }[]
+}
+
+const SORT_SQL: Readonly<Record<MemberDirectorySort, ReturnType<typeof sql.raw>>> = {
+  name: sql.raw('u.username_lower asc, u.id asc'),
+  posts: sql.raw('u.post_count desc, u.username_lower asc, u.id asc'),
+  joined: sql.raw('u.created_at desc, u.id desc'),
+}
+
+export class PostgresMemberDirectoryRepository {
+  constructor(private readonly db: Database) {}
+
+  async page(input: {
+    readonly offset: number
+    readonly limit: number
+    readonly sort: MemberDirectorySort
+    readonly nameContains?: string
+  }): Promise<MemberDirectoryPage> {
+    const name = input.nameContains?.trim().toLowerCase() ?? ''
+    const nameFilter =
+      name === ''
+        ? sql``
+        : sql` and u.username_lower like ${`%${name.replaceAll('\\', '\\\\').replaceAll('%', '\\%').replaceAll('_', '\\_')}%`}`
+
+    const counted = resultRows(
+      await this.db.execute(sql`
+        select count(*) as total
+          from users u
+         where u.state <> 'deleted'${nameFilter}
+      `),
+    ) as Array<Record<string, unknown>>
+
+    const rows = resultRows(
+      await this.db.execute(sql`
+        select u.id, u.username, u.post_count, u.created_at
+          from users u
+         where u.state <> 'deleted'${nameFilter}
+         order by ${SORT_SQL[input.sort]}
+         limit ${input.limit} offset ${input.offset}
+      `),
+    ) as Array<Record<string, unknown>>
+
+    return {
+      total: Number(counted[0]?.total ?? 0),
+      rows: rows.map((row) => ({
+        id: Number(row.id),
+        username: String(row.username),
+        postCount: Number(row.post_count ?? 0),
+        createdAt: new Date(row.created_at as string),
+      })),
+    }
+  }
+
+  async staff(): Promise<readonly StaffGroupRow[]> {
+    const rows = resultRows(
+      await this.db.execute(sql`
+        select g.id as group_id, g.title, g.description, u.id as user_id, u.username
+          from usergroups g
+          join users u
+            on (u.primary_group_id = g.id
+             or exists (
+              select 1
+                from user_group_memberships m
+               where m.user_id = u.id
+                 and m.group_id = g.id
+                 and (m.expires_at is null or m.expires_at > now())
+             ))
+           and u.state <> 'deleted'
+         where g.is_staff_group = true
+         order by g.display_order, g.id, u.username_lower, u.id
+      `),
+    ) as Array<Record<string, unknown>>
+
+    const groups = new Map<
+      number,
+      { title: string; description: string | null; members: { id: number; username: string }[] }
+    >()
+
+    for (const row of rows) {
+      const groupId = Number(row.group_id)
+      let entry = groups.get(groupId)
+      if (entry === undefined) {
+        entry = {
+          title: String(row.title),
+          description: row.description === null ? null : String(row.description),
+          members: [],
+        }
+        groups.set(groupId, entry)
+      }
+      entry.members.push({ id: Number(row.user_id), username: String(row.username) })
+    }
+
+    return [...groups].map(([groupId, entry]) => ({ groupId, ...entry }))
+  }
+}