Merge pull request #222 from Enraged-Dun-Cookie-Development-Team/feat…

…-修改版本cdn问题 🧑‍💻 限制接口请求字段 & 修改objectid序列化不符合要求
Enraged-Dun-Cookie-Development-Team · Dec 11, 2024 · 485b6d8 · 485b6d8
2 parents 1d9d5f5 + 58f3a6e
commit 485b6d8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/http_service/ceobe_operation/release_version_service/src/handlers/cdn.rs b/http_service/ceobe_operation/release_version_service/src/handlers/cdn.rs
@@ -2,10 +2,7 @@ use ceobe_operation_logic::{
     release_version::ReleaseVersionLogic, CeobeOperationLogic,
 };
 use page_next_id::response::ListWithNextId;
-use persistence::{
-    ceobe_operate::models::version::models::ReleaseVersion,
-    mongodb::mongodb::bson::oid::ObjectId,
-};
+use persistence::ceobe_operate::models::version::models::ReleaseVersion;
 use serve_utils::{
     axum::extract::Query,
     axum_resp_result::{resp_result, MapReject},
@@ -38,7 +35,7 @@ impl crate::ReleaseVersionController {
             platform,
             first_id,
         }): MapRejecter<Query<QueryVersionNextIdFilter>>,
-    ) -> Result<ListWithNextId<ReleaseVersion, ObjectId>> {
+    ) -> Result<ListWithNextId<ReleaseVersion, String>> {
         let ret = logic.all_by_page_id(first_id, platform, false).await?;
 
         Ok(ret)

diff --git a/http_service/ceobe_operation/release_version_service/src/view.rs b/http_service/ceobe_operation/release_version_service/src/view.rs
@@ -13,6 +13,7 @@ use serde::Deserialize;
 use serve_utils::{OptionField, OptionViewField, ValueField};
 
 #[derive(Deserialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
 pub struct QueryReleaseVersion<
     Version: OptionViewField<semver::Version> = OptionField<semver::Version>,
 > {
@@ -66,6 +67,7 @@ impl<D: Display + OptionViewField<bool>> Display for QueryVersionFilter<D> {
 }
 
 #[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct QueryVersionNextIdFilter {
     pub platform: ReleasePlatform,
     #[serde(default)]

diff --git a/libs/page_next_id/src/response/mod.rs b/libs/page_next_id/src/response/mod.rs
@@ -1,5 +1,4 @@
 use _private::NextIdTrait;
-use mongodb::bson::oid::ObjectId;
 use serde::Serialize;
 
 #[derive(Debug, Serialize)]
@@ -43,5 +42,4 @@ where
 }
 
 // 支持成为NextId的类型
-impl NextIdTrait for ObjectId {}
 impl NextIdTrait for String {}
diff --git a/logic/ceobe_operation_logic/src/release_version/implement.rs b/logic/ceobe_operation_logic/src/release_version/implement.rs
@@ -153,7 +153,7 @@ impl ReleaseVersionLogic {
     pub async fn all_by_page_id(
         &self, first_id: Option<ObjectId>, platform: ReleasePlatform,
         deleted: bool,
-    ) -> LogicResult<ListWithNextId<ReleaseVersion, ObjectId>> {
+    ) -> LogicResult<ListWithNextId<ReleaseVersion, String>> {
         let list = task::spawn({
             let mongodb = self.mongodb.clone();
             async move {
@@ -182,6 +182,6 @@ impl ReleaseVersionLogic {
         let list = list.await??;
         let next_id = next_id.await??;
 
-        Ok(list.with_page_next_id_info(next_id))
+        Ok(list.with_page_next_id_info(next_id.map(|id| id.to_string())))
     }
 }