From 2c0d6ba2eb119a0260583e269532b8f0613078c9 Mon Sep 17 00:00:00 2001
From: gch3n <gch3n@qq.com>
Date: Sun, 24 May 2026 14:02:48 +0800
Subject: [PATCH] fix: include user relation in scheme create, use raw UUID as
 id

---
 .gitignore               | 1 +
 src/routes/favorites.ts  | 2 +-
 src/routes/schemes.ts    | 5 ++++-
 src/routes/schemesAob.ts | 5 ++++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index fc1cc14..61dccfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ dist/
 `n__pycache__/
 test_output*.json
 results_v*.json
+`n__pycache__/`noriget/ test_output_*.json`noriget/results_v*.json`n*.pyc
diff --git a/src/routes/favorites.ts b/src/routes/favorites.ts
index 1a6c9b1..5b356e8 100644
--- a/src/routes/favorites.ts
+++ b/src/routes/favorites.ts
@@ -16,7 +16,7 @@ function sourceToType(source?: string): string {
 // 格式化方案卡片（对齐顶层 API）
 function formatScheme(s: any) {
   return {
-    id: parseInt(s.id, 36) || String(s.id).split('-')[0] || s.id,
+    id: s.id,
     user_id: s.userId,
     description: s.description || '',
     scheme_content: s.schemeContent || '',
diff --git a/src/routes/schemes.ts b/src/routes/schemes.ts
index 916eaac..9250189 100644
--- a/src/routes/schemes.ts
+++ b/src/routes/schemes.ts
@@ -10,7 +10,7 @@ const router = Router();
 
 function formatScheme(s: any) {
   return {
-    id: parseInt(s.id, 36) || String(s.id).split('-')[0] || s.id,
+    id: s.id,
     user_id: s.userId,
     description: s.description || '',
     scheme_content: s.schemeContent || '',
@@ -190,6 +190,9 @@ router.post('/', authMiddleware, async (req: Request, res: Response) => {
         price: priceNum,
         status: 'PUBLISHED',
       },
+      include: {
+        user: { select: { id: true, username: true, avatar: true } },
+      },
     });
 
     await prisma.user.update({
diff --git a/src/routes/schemesAob.ts b/src/routes/schemesAob.ts
index 7098ecd..93fd345 100644
--- a/src/routes/schemesAob.ts
+++ b/src/routes/schemesAob.ts
@@ -8,7 +8,7 @@ const router = Router();
 
 function formatScheme(s: any) {
   return {
-    id: parseInt(s.id, 36) || String(s.id).split('-')[0] || s.id,
+    id: s.id,
     user_id: s.userId,
     description: s.description || '',
     scheme_content: s.schemeContent || '',
@@ -151,6 +151,9 @@ router.post('/', authMiddleware, async (req: Request, res: Response) => {
         schemeContent: body.scheme,
         status: 'PUBLISHED',
       },
+      include: {
+        user: { select: { id: true, username: true, avatar: true } },
+      },
     });
 
     await prisma.user.update({