@allbluecn/admin-app 0.3.1 → 0.3.3

package/src/routes/_nav/users/$userId/route.lazy.tsx

@@ -15,20 +15,20 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-import { createLazyFileRoute } from '@tanstack/react-router'
+import { createLazyFileRoute, useNavigate } from '@tanstack/react-router'
 import { m } from '@/paraglide/messages.js'
-import { useState, useTransition, useMemo } from 'react'
-import { formatTimestamp } from '@allbluecn/web-app/lib/datetime'
+import { useState, useTransition } from 'react'
+import { formatTimestamp } from '@allbluecn/ui/lib/datetime'
 import { getUserDetailFn } from '@/server/serverFns/user/detail'
 import { updateUserRoleFn } from '@/server/serverFns/user/update-role'
 import { updateUserStatusFn } from '@/server/serverFns/user/update-status'
 import { resetUserPasswordFn } from '@/server/serverFns/user/reset-password'
 import { deleteUserFn } from '@/server/serverFns/user/delete'
-import { TableDetailLayout } from '@/components/data-table/table-detail-layout'
-import { Badge } from '@/components/ui/badge'
-import { Separator } from '@/components/ui/separator'
-import { Button } from '@/components/ui/button'
-import { UserAvatar } from '@allbluecn/web-app/user-avatar'
+import { TableDetailLayout } from '@allbluecn/ui/data-table/table-detail-layout'
+import { Badge } from '@allbluecn/ui/badge'
+import { Separator } from '@allbluecn/ui/separator'
+import { Button } from '@allbluecn/ui/button'
+import { UserAvatar } from '@allbluecn/ui/components/user-avatar'
 
 const STATUS_LABELS: Record<string, () => string> = {
   active: m['admin-users_status_active'],
@@ -43,39 +43,12 @@ const ROLE_LABELS: Record<string, () => string> = {
   user: m['admin-users_role_user'],
 }
 import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-  DialogFooter,
-} from '@/components/ui/dialog'
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from '@/components/ui/alert-dialog'
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@/components/ui/select'
-import { Input } from '@/components/ui/input'
-import { Label } from '@/components/ui/label'
-import {
-  AlertCircle,
   FileTextIcon,
   Package2Icon,
   ShoppingBagIcon,
   ShieldCheckIcon,
 } from 'lucide-react'
-import { toast } from '@/components/ui/toast'
+import { toast } from '@allbluecn/ui/toast'
 import { parseUserAgent, formatParsedUA } from '@allbluecn/kernel'
 import type { AvatarConfig } from '@allbluecn/kernel'
 import SettingsActivityLog, {
@@ -88,7 +61,14 @@ import {
   CardDescription,
   CardHeader,
   CardTitle,
-} from '@/components/ui/card'
+} from '@allbluecn/ui/card'
+import { AdminUserErrorBoundary } from '@/components/user/user-detail/error-boundary'
+import {
+  UserDeleteDialog,
+  UserPasswordDialog,
+  UserRoleDialog,
+  UserStatusDialog,
+} from '@/components/user/user-detail/user-detail-dialogs'
 
 export const Route = createLazyFileRoute('/_nav/users/$userId')({
   pendingComponent: () => (
@@ -97,24 +77,18 @@ export const Route = createLazyFileRoute('/_nav/users/$userId')({
     </div>
   ),
   errorComponent: AdminUserErrorBoundary,
-  component: UserDetailPage,
+  component: UserDetailRoute,
 })
 
-function AdminUserErrorBoundary({ error, reset }: { error: Error; reset: () => void }) {
-  return <AdminUserErrorBoundaryInner error={error} reset={reset} />
-}
-
-function AdminUserErrorBoundaryInner({ error, reset }: { error: Error; reset: () => void }) {
-  return (
-    <div className="flex flex-col items-center justify-center h-64 gap-3">
-      <AlertCircle className="size-8 text-destructive" />
-      <p className="text-sm text-muted-foreground">{m['admin-users_detail_errorLoading']()}: {error.message}</p>
-      <Button variant="outline" size="sm" onClick={reset}>{m['admin-users_detail_retry']()}</Button>
-    </div>
-  )
+// route param（$userId）变化时组件实例被复用，useState(data.user) 只读初始值，
+// 用 key 强制重建避免残留上一用户的状态（删除用户后跳列表同理不受影响）
+function UserDetailRoute() {
+  const { userId } = Route.useParams()
+  return <UserDetailPage key={userId} />
 }
 
 function UserDetailPage() {
+  const navigate = useNavigate()
   const statusBadgeVariant: Record<string, 'default' | 'secondary' | 'destructive' | 'outline'> = {
     ACTIVE: 'default',
     INACTIVE: 'secondary',
@@ -152,6 +126,7 @@ function UserDetailPage() {
     <>
       <TableDetailLayout
         backHref="/users"
+        backLabel={m.common_common_backToList()}
         title={user.username}
         subtitle={user.email}
         avatar={
@@ -233,7 +208,7 @@ function UserDetailPage() {
                   <div className="flex items-center gap-2 rounded-lg border p-3">
                     <FileTextIcon className="h-4 w-4 text-muted-foreground" />
                     <div>
-                      <div className="text-lg font-semibold">{user._count.prds}</div>
+                      <div className="text-lg font-semibold">{user._count.designs}</div>
                       <div className="text-xs text-muted-foreground">{m['admin-users_detail_stats_prds']()}</div>
                     </div>
                   </div>
@@ -323,114 +298,74 @@ function UserDetailPage() {
         </div>
       </TableDetailLayout>
 
-      <Dialog open={roleDialog.open} onOpenChange={(o: boolean) => setRoleDialog((d) => ({ ...d, open: o }))}>
-        <DialogContent className="sm:max-w-100">
-          <DialogHeader>
-            <DialogTitle>{m['admin-users_dialog_role_title']({ username: user.username })}</DialogTitle>
-          </DialogHeader>
-          <div className="py-4">
-            <Label>{m['admin-users_dialog_role_newRole']()}</Label>
-            <Select value={roleDialog.value} onValueChange={(v) => setRoleDialog((d) => ({ ...d, value: v ?? "" }))}>
-              <SelectTrigger><SelectValue /></SelectTrigger>
-              <SelectContent>
-                <SelectItem value="USER">{m['admin-users_role_user']()}</SelectItem>
-                <SelectItem value="ADMIN">{m['admin-users_role_admin']()}</SelectItem>
-                <SelectItem value="SUPER_ADMIN">{m['admin-users_role_superAdmin']()}</SelectItem>
-              </SelectContent>
-            </Select>
-          </div>
-          <DialogFooter>
-            <Button variant="outline" onClick={() => setRoleDialog((d) => ({ ...d, open: false }))}>{m.common_button_cancel()}</Button>
-            <Button disabled={isPending} onClick={() => startTransition(async () => {
-              try {
-                await updateUserRoleFn({ data: { userId: user.id, role: roleDialog.value as 'USER' | 'ADMIN' | 'SUPER_ADMIN' } })
-                toast.success(m['admin-users_toast_roleUpdated']())
-                setRoleDialog((d) => ({ ...d, open: false }))
-                await refetchUser()
-              } catch { toast.error(m['admin-users_toast_updateFailed']()) }
-            })}>{m.common_button_confirm()}</Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
+      <UserRoleDialog
+        open={roleDialog.open}
+        value={roleDialog.value}
+        username={user.username}
+        isPending={isPending}
+        onOpenChange={(o) => setRoleDialog((d) => ({ ...d, open: o }))}
+        onValueChange={(v) => setRoleDialog((d) => ({ ...d, value: v }))}
+        onCancel={() => setRoleDialog((d) => ({ ...d, open: false }))}
+        onSubmit={() => startTransition(async () => {
+          try {
+            await updateUserRoleFn({ data: { userId: user.id, role: roleDialog.value as 'USER' | 'ADMIN' | 'SUPER_ADMIN' } })
+            toast.success(m['admin-users_toast_roleUpdated']())
+            setRoleDialog((d) => ({ ...d, open: false }))
+            await refetchUser()
+          } catch { toast.error(m['admin-users_toast_updateFailed']()) }
+        })}
+      />
 
-      <Dialog open={statusDialog.open} onOpenChange={(o: boolean) => setStatusDialog((d) => ({ ...d, open: o }))}>
-        <DialogContent className="sm:max-w-100">
-          <DialogHeader>
-            <DialogTitle>{m['admin-users_dialog_status_title']({ username: user.username })}</DialogTitle>
-          </DialogHeader>
-          <div className="py-4">
-            <Label>{m['admin-users_dialog_status_newStatus']()}</Label>
-            <Select value={statusDialog.value} onValueChange={(v) => setStatusDialog((d) => ({ ...d, value: v ?? "" }))}>
-              <SelectTrigger><SelectValue /></SelectTrigger>
-              <SelectContent>
-                <SelectItem value="ACTIVE">{m['admin-users_status_active']()}</SelectItem>
-                <SelectItem value="INACTIVE">{m['admin-users_status_inactive']()}</SelectItem>
-                <SelectItem value="BANNED">{m['admin-users_status_banned']()}</SelectItem>
-              </SelectContent>
-            </Select>
-          </div>
-          <DialogFooter>
-            <Button variant="outline" onClick={() => setStatusDialog((d) => ({ ...d, open: false }))}>{m.common_button_cancel()}</Button>
-            <Button disabled={isPending} onClick={() => startTransition(async () => {
-              try {
-                await updateUserStatusFn({ data: { userId: user.id, status: statusDialog.value as 'ACTIVE' | 'INACTIVE' | 'BANNED' } })
-                toast.success(m['admin-users_toast_statusUpdated']())
-                setStatusDialog((d) => ({ ...d, open: false }))
-                await refetchUser()
-              } catch { toast.error(m['admin-users_toast_updateFailed']()) }
-            })}>{m.common_button_confirm()}</Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
+      <UserStatusDialog
+        open={statusDialog.open}
+        value={statusDialog.value}
+        username={user.username}
+        isPending={isPending}
+        onOpenChange={(o) => setStatusDialog((d) => ({ ...d, open: o }))}
+        onValueChange={(v) => setStatusDialog((d) => ({ ...d, value: v }))}
+        onCancel={() => setStatusDialog((d) => ({ ...d, open: false }))}
+        onSubmit={() => startTransition(async () => {
+          try {
+            await updateUserStatusFn({ data: { userId: user.id, status: statusDialog.value as 'ACTIVE' | 'INACTIVE' | 'BANNED' } })
+            toast.success(m['admin-users_toast_statusUpdated']())
+            setStatusDialog((d) => ({ ...d, open: false }))
+            await refetchUser()
+          } catch { toast.error(m['admin-users_toast_updateFailed']()) }
+        })}
+      />
 
-      <Dialog open={passwordDialog.open} onOpenChange={(o: boolean) => setPasswordDialog((d) => ({ ...d, open: o }))}>
-        <DialogContent className="sm:max-w-100">
-          <DialogHeader>
-            <DialogTitle>{m['admin-users_dialog_password_title']({ username: user.username })}</DialogTitle>
-          </DialogHeader>
-          <form onSubmit={(e) => { e.preventDefault(); startTransition(async () => {
-            try {
-              await resetUserPasswordFn({ data: { userId: user.id, newPassword: passwordDialog.value } })
-              toast.success(m['admin-users_toast_passwordReset']())
-              setPasswordDialog((d) => ({ ...d, open: false, value: '' }))
-            } catch { toast.error(m['admin-users_toast_resetFailed']()) }
-          })}}>
-            <div className="py-4">
-              <Label>{m['admin-users_dialog_password_newPassword']()}</Label>
-              <Input type="password" required value={passwordDialog.value} onChange={(e: React.ChangeEvent<HTMLInputElement>) => setPasswordDialog((d) => ({ ...d, value: e.target.value }))} />
-            </div>
-            <DialogFooter>
-              <Button type="button" variant="outline" onClick={() => setPasswordDialog((d) => ({ ...d, open: false }))}>{m.common_button_cancel()}</Button>
-              <Button type="submit" disabled={isPending}>{m['admin-users_dialog_password_confirm']()}</Button>
-            </DialogFooter>
-          </form>
-        </DialogContent>
-      </Dialog>
+      <UserPasswordDialog
+        open={passwordDialog.open}
+        value={passwordDialog.value}
+        username={user.username}
+        isPending={isPending}
+        onOpenChange={(o) => setPasswordDialog((d) => ({ ...d, open: o }))}
+        onValueChange={(v) => setPasswordDialog((d) => ({ ...d, value: v }))}
+        onCancel={() => setPasswordDialog((d) => ({ ...d, open: false }))}
+        onSubmit={() => startTransition(async () => {
+          try {
+            await resetUserPasswordFn({ data: { userId: user.id, newPassword: passwordDialog.value } })
+            toast.success(m['admin-users_toast_passwordReset']())
+            setPasswordDialog((d) => ({ ...d, open: false, value: '' }))
+          } catch { toast.error(m['admin-users_toast_resetFailed']()) }
+        })}
+      />
 
-      <AlertDialog open={deleteDialog.open} onOpenChange={(o: boolean) => setDeleteDialog((d) => ({ ...d, open: o }))}>
-        <AlertDialogContent>
-          <AlertDialogHeader>
-            <AlertDialogTitle>{m['admin-users_dialog_delete_title']()}</AlertDialogTitle>
-            <AlertDialogDescription>
-              {m['admin-users_dialog_delete_description']({ username: user.username })}
-            </AlertDialogDescription>
-          </AlertDialogHeader>
-          <Input placeholder={m['admin-users_dialog_delete_placeholder']()} value={deleteDialog.confirmName} onChange={(e: React.ChangeEvent<HTMLInputElement>) => setDeleteDialog((d) => ({ ...d, confirmName: e.target.value }))} />
-          <AlertDialogFooter>
-            <AlertDialogCancel>{m.common_button_cancel()}</AlertDialogCancel>
-            <AlertDialogAction
-              disabled={deleteDialog.confirmName !== user.username || isPending}
-              onClick={() => startTransition(async () => {
-                try {
-                  await deleteUserFn({ data: { userId: user.id } })
-                  toast.success(m['admin-users_toast_userDeleted']())
-                  window.location.href = '/users'
-                } catch { toast.error(m['admin-users_toast_deleteFailed']()) }
-              })}
-            >{m['admin-users_dialog_delete_confirm']()}</AlertDialogAction>
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialog>
+      <UserDeleteDialog
+        open={deleteDialog.open}
+        confirmName={deleteDialog.confirmName}
+        username={user.username}
+        isPending={isPending}
+        onOpenChange={(o) => setDeleteDialog((d) => ({ ...d, open: o }))}
+        onConfirmNameChange={(v) => setDeleteDialog((d) => ({ ...d, confirmName: v }))}
+        onSubmit={() => startTransition(async () => {
+          try {
+            await deleteUserFn({ data: { userId: user.id } })
+            toast.success(m['admin-users_toast_userDeleted']())
+            navigate({ to: '/users' })
+          } catch { toast.error(m['admin-users_toast_deleteFailed']()) }
+        })}
+      />
     </>
   )
 }

package/src/routes/_nav/users/-components/users-table.tsx

@@ -16,7 +16,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 
-import { DataTable } from "@/components/data-table/data-table"
+import { DataTable } from "@allbluecn/ui/data-table"
 import { getUserColumns } from "@/components/user/columns"
 import type { UserRow } from "@/components/user/columns"
 import { useNavigate } from "@tanstack/react-router"

package/src/routes/_nav/users/route.lazy.tsx

@@ -21,7 +21,7 @@ import { useState } from 'react'
 import { UsersTable } from './-components/users-table'
 import { UserFilters } from '@/components/user/user-filters'
 import { UserCreateDialog } from '@/components/user/user-create-dialog'
-import { Button } from '@/components/ui/button'
+import { Button } from '@allbluecn/ui/button'
 import { PlusIcon } from 'lucide-react'
 
 export const Route = createLazyFileRoute('/_nav/users')({

package/src/routes/login/route.lazy.tsx

@@ -18,7 +18,7 @@
 import { createLazyFileRoute } from '@tanstack/react-router'
 import AdminLoginForm from '@/components/auth/admin-login-form'
 import { useSession } from '@/lib/auth-client'
-import type { AvatarConfig, ShapeType } from '@allbluecn/kernel'
+import type { AvatarConfig } from '@allbluecn/kernel'
 
 export const Route = createLazyFileRoute('/login')({
   component: AdminLoginPage,

package/src/routes/setup/route.lazy.tsx

@@ -18,14 +18,14 @@
 import { createLazyFileRoute, useNavigate } from '@tanstack/react-router'
 import { m } from '@/paraglide/messages.js'
 import { useState } from 'react'
-import { toast } from '@/components/ui/toast'
+import { toast } from '@allbluecn/ui/toast'
 import { Loader2, ShieldCheck, User, Mail, Database } from 'lucide-react'
 import { AuthLayout, AuthLayoutLeft, AuthLayoutRight } from '@/components/auth/auth-layout'
 import { AuthHeader } from '@/components/auth/auth-header'
 import { AuthBrandPanel } from '@/components/auth/auth-brand-panel'
 import { PasswordInput } from '@/components/auth/password-input'
 import { IconInput } from '@/components/auth/icon-input'
-import { Button } from '@/components/ui/button'
+import { Button } from '@allbluecn/ui/button'
 import { setupAdminFn } from '@/server/serverFns/auth/setup'
 
 export const Route = createLazyFileRoute('/setup')({

package/src/server/__tests__/admin-billing.test.ts

@@ -99,29 +99,92 @@ describe('listAllSubscriptionsFn', () => {
     expect(subscription.count).not.toHaveBeenCalled()
   })
 
-  it('默认分页：page=1 pageSize=20 时 skip=0 take=20', async () => {
+  it('默认分页：page=1 pageSize=20 时 skip=0 take=20，白名单 select', async () => {
+    subscription.findMany.mockResolvedValue([])
+
     await listAllSubscriptionsFn({ data: {} })
 
     expect(subscription.findMany).toHaveBeenCalledWith({
       where: {},
-      include: { plan: true, workspace: true },
       orderBy: { createdAt: 'desc' },
       skip: 0,
       take: 20,
+      select: {
+        id: true,
+        status: true,
+        addonSeats: true,
+        currentPeriodEnd: true,
+        plan: { select: { name: true, maxSeats: true } },
+        user: { select: { name: true, email: true } },
+      },
     })
+    expect(subscription.count).toHaveBeenCalledWith({ where: {} })
   })
 
-  it('search 按工作空间名模糊匹配（管理员全局检索入口）', async () => {
+  it('DB-05 shape 映射：workspace.name 由 user 映射、seats=maxSeats+addonSeats', async () => {
+    subscription.findMany.mockResolvedValue([
+      {
+        id: 'sub-1',
+        status: 'ACTIVE',
+        addonSeats: 2,
+        currentPeriodEnd: new Date('2026-12-01T00:00:00Z'),
+        plan: { name: 'Pro', maxSeats: 5 },
+        user: { name: 'Alice', email: 'alice@example.com' },
+      },
+      {
+        id: 'sub-2',
+        status: 'TRIALING',
+        addonSeats: 0,
+        currentPeriodEnd: null,
+        plan: null,
+        user: null,
+      },
+    ])
+
+    const res = await listAllSubscriptionsFn({ data: {} })
+
+    expect(res.items[0]).toEqual({
+      id: 'sub-1',
+      workspace: { name: 'Alice' },
+      plan: { name: 'Pro' },
+      status: 'ACTIVE',
+      seats: 7,
+      currentPeriodEnd: new Date('2026-12-01T00:00:00Z'),
+    })
+    // null plan/user 不崩，回退空值
+    expect(res.items[1]).toEqual({
+      id: 'sub-2',
+      workspace: { name: null },
+      plan: { name: null },
+      status: 'TRIALING',
+      seats: 0,
+      currentPeriodEnd: null,
+    })
+  })
+
+  it('search 按订阅属主 user name/email 模糊匹配（workspace 关系不存在）', async () => {
+    subscription.findMany.mockResolvedValue([])
+
     await listAllSubscriptionsFn({ data: { search: 'acme' } })
 
     const arg = subscription.findMany.mock.calls[0][0]
-    expect(arg.where.OR).toEqual([{ workspace: { name: { contains: 'acme' } } }])
+    expect(arg.where.OR).toEqual([
+      { user: { name: { contains: 'acme' } } },
+      { user: { email: { contains: 'acme' } } },
+    ])
     expect(subscription.count).toHaveBeenCalledWith({
-      where: { OR: [{ workspace: { name: { contains: 'acme' } } }] },
+      where: {
+        OR: [
+          { user: { name: { contains: 'acme' } } },
+          { user: { email: { contains: 'acme' } } },
+        ],
+      },
     })
   })
 
   it('plan 与 status 组合过滤同时生效', async () => {
+    subscription.findMany.mockResolvedValue([])
+
     await listAllSubscriptionsFn({ data: { plan: 'pro', status: 'active' } })
 
     expect(subscription.findMany.mock.calls[0][0].where).toEqual({
@@ -131,6 +194,8 @@ describe('listAllSubscriptionsFn', () => {
   })
 
   it('分页偏移正确计算（page=3 pageSize=10 → skip=20）', async () => {
+    subscription.findMany.mockResolvedValue([])
+
     await listAllSubscriptionsFn({ data: { page: 3, pageSize: 10 } })
 
     const arg = subscription.findMany.mock.calls[0][0]
@@ -140,20 +205,60 @@ describe('listAllSubscriptionsFn', () => {
 })
 
 describe('getSubscriptionDetailFn', () => {
-  it('按 subscriptionId 查详情并附带发票列表', async () => {
-    subscription.findUnique.mockResolvedValue({ id: 'sub-1' })
+  it('按 subscriptionId 查详情：白名单 select + workspace/seats 映射', async () => {
+    subscription.findUnique.mockResolvedValue({
+      id: 'sub-1',
+      status: 'ACTIVE',
+      addonSeats: 1,
+      currentPeriodStart: new Date('2026-11-01T00:00:00Z'),
+      currentPeriodEnd: new Date('2026-12-01T00:00:00Z'),
+      providerSubscriptionId: 'cus_pro_sub_123',
+      plan: { id: 'plan-1', name: 'Pro', displayName: 'Pro', maxSeats: 5 },
+      user: { id: 'u-1', name: 'Alice', email: 'alice@example.com' },
+      invoices: [],
+    })
 
     const res = await getSubscriptionDetailFn({ data: { subscriptionId: 'sub-1' } })
 
     expect(subscription.findUnique).toHaveBeenCalledWith({
       where: { id: 'sub-1' },
-      include: {
-        plan: true,
-        workspace: true,
-        invoices: { orderBy: { createdAt: 'desc' } },
+      select: {
+        id: true,
+        status: true,
+        addonSeats: true,
+        currentPeriodStart: true,
+        currentPeriodEnd: true,
+        providerSubscriptionId: true,
+        plan: { select: { id: true, name: true, displayName: true, maxSeats: true } },
+        user: { select: { id: true, name: true, email: true } },
+        invoices: {
+          orderBy: { createdAt: 'desc' },
+          select: {
+            id: true,
+            status: true,
+            currency: true,
+            amountDue: true,
+            periodStart: true,
+            periodEnd: true,
+            createdAt: true,
+          },
+        },
       },
     })
-    expect(res).toEqual({ id: 'sub-1' })
+    expect(res).toMatchObject({
+      id: 'sub-1',
+      workspace: { name: 'Alice' },
+      seats: 6,
+      providerSubscriptionId: 'cus_pro_sub_123',
+    })
+  })
+
+  it('订阅不存在 → 返回 null', async () => {
+    subscription.findUnique.mockResolvedValue(null)
+
+    const res = await getSubscriptionDetailFn({ data: { subscriptionId: 'nope' } })
+
+    expect(res).toBeNull()
   })
 
   it('非管理员拒绝：不触达 subscription 查询', async () => {
@@ -167,16 +272,86 @@ describe('getSubscriptionDetailFn', () => {
 })
 
 describe('listAllInvoicesFn', () => {
-  it('按 createdAt 降序分页并附带订阅归属信息', async () => {
+  it('按 createdAt 降序分页 + 白名单 select + count 携带 where', async () => {
+    invoice.findMany.mockResolvedValue([])
+
     await listAllInvoicesFn({ data: { page: 2, pageSize: 5 } })
 
     expect(invoice.findMany).toHaveBeenCalledWith({
+      where: {},
       orderBy: { createdAt: 'desc' },
-      include: { subscription: { include: { workspace: true, plan: true } } },
       skip: 5,
       take: 5,
+      select: {
+        id: true,
+        status: true,
+        currency: true,
+        amountDue: true,
+        amountPaid: true,
+        periodStart: true,
+        periodEnd: true,
+        createdAt: true,
+        subscription: {
+          select: {
+            id: true,
+            plan: { select: { name: true } },
+            user: { select: { name: true, email: true } },
+          },
+        },
+      },
+    })
+    // DB-02：count 与列表共享同一 where
+    expect(invoice.count).toHaveBeenCalledWith({ where: {} })
+  })
+
+  it('DB-02：status 过滤参数化，where 同时作用于 findMany 与 count', async () => {
+    invoice.findMany.mockResolvedValue([])
+
+    await listAllInvoicesFn({ data: { page: 1, pageSize: 20, status: 'paid' } })
+
+    const arg = invoice.findMany.mock.calls[0][0]
+    expect(arg.where).toEqual({ status: 'paid' })
+    expect(invoice.count).toHaveBeenCalledWith({ where: { status: 'paid' } })
+  })
+
+  it('DB-05 shape 映射：subscription.workspace 由 user 回填，键位不变', async () => {
+    invoice.findMany.mockResolvedValue([
+      {
+        id: 'inv-1',
+        status: 'paid',
+        currency: 'usd',
+        amountDue: 2000,
+        amountPaid: 2000,
+        periodStart: new Date('2026-11-01T00:00:00Z'),
+        periodEnd: new Date('2026-12-01T00:00:00Z'),
+        createdAt: new Date('2026-11-01T00:00:00Z'),
+        subscription: {
+          id: 'sub-1',
+          plan: { name: 'Pro' },
+          user: { name: null, email: 'alice@example.com' },
+        },
+      },
+      {
+        id: 'inv-2',
+        status: 'open',
+        currency: 'usd',
+        amountDue: 1000,
+        amountPaid: 0,
+        periodStart: new Date('2026-10-01T00:00:00Z'),
+        periodEnd: new Date('2026-11-01T00:00:00Z'),
+        createdAt: new Date('2026-10-01T00:00:00Z'),
+        subscription: null,
+      },
+    ])
+
+    const res = await listAllInvoicesFn({ data: {} })
+
+    expect(res.items[0].subscription).toEqual({
+      id: 'sub-1',
+      workspace: { name: 'alice@example.com' },
+      plan: { name: 'Pro' },
     })
-    // 发票总数不受分页影响
-    expect(invoice.count).toHaveBeenCalledWith()
+    expect(res.items[1].subscription).toBeNull()
+    expect(res.total).toBe(0)
   })
 })