From 8d2f1cdd47c92f766a09ef668dc50e269cdd39b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=B2=E9=B8=BF=E5=AE=87?= <shywzt@iCloud.com>
Date: Fri, 21 Feb 2025 16:35:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E8=BD=AC=E5=82=A8=E4=BB=A5=E6=8E=92=E9=99=A4=E7=A9=BA=E5=80=BC?=
 =?UTF-8?q?=E5=B9=B6=E4=BD=BF=E7=94=A8=E5=88=AB=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 史鸿宇 <shywzt@iCloud.com>
---
 apps/manager/service.py | 10 +++++-----
 apps/routers/service.py |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/manager/service.py b/apps/manager/service.py
index 101f8bdb..839bf064 100644
--- a/apps/manager/service.py
+++ b/apps/manager/service.py
@@ -116,7 +116,7 @@ class ServiceCenterManager:
                     description=endpoint.description,
                     call_id="api",
                     path="test path",
-                ).model_dump(),
+                ).model_dump(exclude_none=True, by_alias=True),
             )
         yaml_hash = "hash"  # TODO: 计算 OpenAPI YAML 文件的哈希值
         # 存入数据库
@@ -129,7 +129,7 @@ class ServiceCenterManager:
             openapi_spec=data,
         )
         service_collection = MongoDB.get_collection("service")
-        await service_collection.insert_one(service_pool.model_dump())
+        await service_collection.insert_one(service_pool.model_dump(exclude_none=True, by_alias=True))
         # 返回服务ID
         return service_id
 
@@ -165,7 +165,7 @@ class ServiceCenterManager:
                     description=endpoint.description,
                     call_id="api",
                     path="test path",
-                ).model_dump(),
+                ).model_dump(exclude_none=True, by_alias=True),
             )
         yaml_hash = "hash"  # TODO: 计算 OpenAPI YAML 文件的哈希值
         # 更新数据库
@@ -179,7 +179,7 @@ class ServiceCenterManager:
         )
         await service_collection.update_one(
             {"_id": service_id},
-            {"$set": service_pool.model_dump()},
+            {"$set": service_pool.model_dump(exclude_none=True, by_alias=True)},
         )
         # 返回服务ID
         return service_id
@@ -276,7 +276,7 @@ class ServiceCenterManager:
             service_pool_store.favorites.remove(user_sub)
         await service_collection.update_one(
             {"_id": service_id},
-            {"$set": service_pool_store.model_dump()},
+            {"$set": service_pool_store.model_dump(exclude_none=True, by_alias=True)},
         )
         return True
 
diff --git a/apps/routers/service.py b/apps/routers/service.py
index 57ae3892..f0ac576c 100644
--- a/apps/routers/service.py
+++ b/apps/routers/service.py
@@ -125,7 +125,7 @@ async def update_service(  # noqa: PLR0911
     if not data.service_id:
         try:
             service_id = await ServiceCenterManager.create_service(user_sub, data.data)
-        except ValueError as e:
+        except ValueError as e:  # OpenAPI YAML 接口字段不完整
             return JSONResponse(
                 status_code=status.HTTP_400_BAD_REQUEST,
                 content=ResponseData(
@@ -148,7 +148,7 @@ async def update_service(  # noqa: PLR0911
         try:
             service_id = await ServiceCenterManager.update_service(user_sub, data.service_id, data.data)
         except ValueError as e:
-            if str(e).startswith("Endpoint error"):
+            if str(e).startswith("Endpoint error"):  # OpenAPI YAML 接口字段不完整
                 return JSONResponse(
                     status_code=status.HTTP_400_BAD_REQUEST,
                     content=ResponseData(
-- 
Gitee