0.3.0.0

app/api/trees/route.ts

@@ -18,42 +18,59 @@ export async function GET(req: NextRequest) {
       return NextResponse.json({ error: "未授权" }, { status: 401 })
     }
 
-    // 1. 查询拥有的家族树
-    const ownedTrees = await prisma.familyTree.findMany({
-      where: { ownerId: session.user.id },
-      include: {
-        owner: {
-          select: { id: true, name: true, email: true }
+    // 使用并行查询优化性能
+    const [ownedTrees, collaboratedRelations] = await Promise.all([
+      // 1. 查询拥有的家族树 - 只选择必要字段
+      prisma.familyTree.findMany({
+        where: { ownerId: session.user.id },
+        select: {
+          id: true,
+          name: true,
+          description: true,
+          rootMemberId: true,
+          ownerId: true,
+          createdAt: true,
+          updatedAt: true,
+          owner: {
+            select: { id: true, name: true, email: true }
+          },
+          _count: {
+            select: { members: true, collaborators: true }
+          }
         },
-        _count: {
-          select: { members: true, collaborators: true }
-        }
-      },
-      orderBy: { updatedAt: 'desc' }
-    })
-
-    // 2. 查询协作的家族树
-    const collaboratedRelations = await prisma.treeCollaborator.findMany({
-      where: { userId: session.user.id },
-      include: {
-        tree: {
-          include: {
-            owner: {
-              select: { id: true, name: true, email: true }
-            },
-            _count: {
-              select: { members: true, collaborators: true }
+        orderBy: { updatedAt: 'desc' }
+      }),
+      // 2. 查询协作的家族树
+      prisma.treeCollaborator.findMany({
+        where: { userId: session.user.id },
+        select: {
+          role: true,
+          tree: {
+            select: {
+              id: true,
+              name: true,
+              description: true,
+              rootMemberId: true,
+              ownerId: true,
+              createdAt: true,
+              updatedAt: true,
+              owner: {
+                select: { id: true, name: true, email: true }
+              },
+              _count: {
+                select: { members: true, collaborators: true }
+              }
             }
           }
-        }
-      },
-      orderBy: { invitedAt: 'desc' }
-    })
+        },
+        orderBy: { invitedAt: 'desc' }
+      })
+    ])
 
     // 3. 格式化数据
     const formattedOwnedTrees = ownedTrees.map(tree => ({
       ...tree,
-      currentUserRole: "OWNER"
+      currentUserRole: "OWNER" as const
     }))
 
     const formattedCollaboratedTrees = collaboratedRelations.map(relation => ({
@@ -64,14 +81,6 @@ export async function GET(req: NextRequest) {
     // 4. 合并列表
     const trees = [...formattedOwnedTrees, ...formattedCollaboratedTrees]
 
-    console.log('🌳 GET /api/trees 返回数据:', {
-      userId: session.user.id,
-      ownedCount: formattedOwnedTrees.length,
-      collaboratedCount: formattedCollaboratedTrees.length,
-      totalCount: trees.length,
-      trees: trees.map(t => ({ id: t.id, name: t.name, role: t.currentUserRole }))
-    })
-
     return NextResponse.json({ trees })
   } catch (error) {
     console.error("获取家族树失败:", error)