refactor(models):重构模型调试实现并优化依赖导入

DataEraserC · DataEraserC · commit d150f5df66c8 · 2025-10-07T00:41:39.000+08:00
- 移除各模块中重复的 Debug trait 实现- 在 models.rs 中统一实现 Debug trait
- 清理未使用的标准库 fmt 导入- 移除 service 模块中未使用的 JoinOnDsl 导入
- 优化文件分组判断逻辑使用 ? 操作符
- 集中管理模型结构体的调试格式化输出
diff --git a/file_classification_core/src/internal/file_group.rs b/file_classification_core/src/internal/file_group.rs
@@ -1,7 +1,6 @@
 use super::models::{FileGroupCondition, FileGroupDTO};
 use crate::model::schema::{file_groups, files};
 use diesel::prelude::*;
-use std::fmt::{Debug, Formatter, Result as fmtResult};
 use crate::utils::database::AnyConnection;
 use crate::model::models::{File, FileGroupOrderBy, FileGroupQueryOptions, OrderDirection};
 use crate::utils::errors::AppError;
@@ -26,7 +25,7 @@ pub fn delete_file_group_by_id(
         .filter(files::id.eq(file_group_dto.file_id))
         .first(conn);
 
-    if file.is_ok() && file.unwrap().group_id == file_group_dto.group_id {
+    if file.is_ok() && file?.group_id == file_group_dto.group_id {
         return Err(CannotUnbindPrimaryGroup);
     }
 
@@ -40,12 +39,6 @@ pub fn delete_file_group_by_id(
     .map_err(AppError::from) // 将 QueryResult 转换为 AppError
 }
 
-impl Debug for FileGroupDTO {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmtResult {
-        write!(f, "FileGroup {{ file_id: {}, group_id: {} }}", self.file_id, self.group_id)
-    }
-}
-
 // 将 FileGroupCondition 转换为 diesel 查询条件的辅助函数
 fn build_file_group_condition(condition: FileGroupCondition) -> Box<dyn BoxableExpression<file_groups::table, <AnyConnection as Connection>::Backend, SqlType=diesel::sql_types::Bool>> {
     match condition {
diff --git a/file_classification_core/src/internal/files.rs b/file_classification_core/src/internal/files.rs
@@ -5,7 +5,6 @@ use crate::model::models::{FileOrderBy, FileQueryOptions, OrderDirection};
 use crate::model::schema::files;
 use crate::model::schema::files::dsl::*;
 use diesel::sql_types::Bool;
-use std::fmt::{Debug, Formatter, Result as fmtResult};
 
 pub fn create_file(conn: &mut AnyConnection, new_file: &CreateFileDTO) -> Result<usize, diesel::result::Error> {
     diesel::insert_into(files::table)
@@ -74,15 +73,6 @@ pub fn delete_file_by_id(conn: &mut AnyConnection, file_id: i32) -> Result<usize
     diesel::delete(files.filter(files::id.eq(file_id))).execute(conn)
 }
 
-impl Debug for File {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmtResult {
-        write!(
-            f,
-            "File {{ id: {}, type_: {}, path: {}, reference_count: {}, group_id: {} }}",
-            self.id, self.type_, self.path, self.reference_count, self.group_id
-        )
-    }
-}
 
 // 将 FileCondition 转换为 diesel 查询条件的辅助函数
 // 更新 build_condition 函数以处理新增的条件类型
diff --git a/file_classification_core/src/internal/group_tag.rs b/file_classification_core/src/internal/group_tag.rs
@@ -1,7 +1,6 @@
 use super::models::GroupTagDTO;
 use crate::model::schema::group_tags;
 use diesel::prelude::*;
-use std::fmt::{Debug, Formatter, Result as fmtResult};
 use crate::utils::database::AnyConnection;
 use super::models::GroupTagCondition;
 use crate::model::models::{GroupTagOrderBy, GroupTagQueryOptions, OrderDirection};
@@ -30,12 +29,6 @@ pub fn delete_group_tag_by_id(
         .execute(conn)
 }
 
-impl Debug for GroupTagDTO {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmtResult {
-        write!(f, "GroupTag {{ group_id: {}, tag_id: {} }}", self.group_id, self.tag_id)
-    }
-}
-
 // 将 GroupTagCondition 转换为 diesel 查询条件的辅助函数
 fn build_group_tag_condition(condition: GroupTagCondition) -> Box<dyn BoxableExpression<group_tags::table, <AnyConnection as Connection>::Backend, SqlType=diesel::sql_types::Bool>> {
     match condition {
diff --git a/file_classification_core/src/internal/groups.rs b/file_classification_core/src/internal/groups.rs
@@ -2,7 +2,6 @@ use super::models::{CreateGroupDTO, Group, GroupFilter};
 use diesel::prelude::*;
 use crate::model::schema::groups::dsl::*;
 use crate::model::schema::groups;
-use std::fmt::{Debug, Formatter, Result as fmtResult};
 use super::models::GroupCondition;
 use crate::model::models::{GroupOrderBy, GroupQueryOptions, OrderDirection, UpdateGroupDTO};
 use diesel::dsl::not;
@@ -109,22 +108,6 @@ pub fn decrease_group_reference_count(
         .set(groups::reference_count.eq(groups::reference_count - 1))
         .execute(conn)
 }
-impl Debug for Group {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmtResult {
-        write!(
-            f,
-            "Group {{ id: {}, name: {}, reference_count: {}, is_primary: {}, click_count: {}, share_count: {}, create_time: {}, modify_time: {} }}",
-            self.id,
-            self.name,
-            self.reference_count,
-            self.is_primary,
-            self.click_count,
-            self.share_count,
-            self.create_time,
-            self.modify_time
-        )
-    }
-}
 
 // 将 GroupCondition 转换为 diesel 查询条件的辅助函数
 fn build_group_condition(condition: GroupCondition) -> Box<dyn BoxableExpression<groups::table, <AnyConnection as Connection>::Backend, SqlType=diesel::sql_types::Bool>> {
diff --git a/file_classification_core/src/internal/tags.rs b/file_classification_core/src/internal/tags.rs
@@ -2,13 +2,11 @@ use super::models::{CreateTagDTO, Tag, TagFilter};
 use diesel::prelude::*;
 use crate::utils::database::AnyConnection;
 use crate::model::schema::tags::dsl::*;
-use crate::model::schema::{groups, tags};
-use std::fmt::{Debug, Formatter, Result as fmtResult};
+use crate::model::schema::{tags};
 use super::models::TagCondition;
-use crate::model::models::{Group, OrderDirection, TagOrderBy, TagQueryOptions, UpdateTagDTO};
+use crate::model::models::{OrderDirection, TagOrderBy, TagQueryOptions, UpdateTagDTO};
 use diesel::dsl::not;
 use diesel::sql_types::Bool;
-use crate::model::schema::group_tags::dsl::group_tags;
 
 pub fn create_tag(
     conn: &mut AnyConnection,
@@ -86,17 +84,6 @@ pub fn delete_tag(conn: &mut AnyConnection, tag_id: i32) -> Result<usize, diesel
     diesel::delete(tags.filter(tags::id.eq(tag_id))).execute(conn)
 }
 
-
-impl Debug for Tag {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmtResult {
-        write!(
-            f,
-            "Tag {{ id: {}, name: {}, reference_count: {} }}",
-            self.id, self.name, self.reference_count
-        )
-    }
-}
-
 // 将 TagCondition 转换为 diesel 查询条件的辅助函数
 fn build_tag_condition(condition: TagCondition) -> Box<dyn BoxableExpression<tags::table, <AnyConnection as Connection>::Backend, SqlType=diesel::sql_types::Bool>> {
     match condition {
diff --git a/file_classification_core/src/model/models.rs b/file_classification_core/src/model/models.rs
@@ -1,3 +1,4 @@
+use std::fmt::{Debug, Formatter, Result as fmtResult};
 use super::schema::{file_groups, files, group_tags, groups, tags};
 use chrono;
 use diesel::prelude::*;
@@ -18,6 +19,16 @@ pub struct File {
     pub group_id: i32,
 }
 
+impl Debug for File {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmtResult {
+        write!(
+            f,
+            "File {{ id: {}, type_: {}, path: {}, reference_count: {}, group_id: {} }}",
+            self.id, self.type_, self.path, self.reference_count, self.group_id
+        )
+    }
+}
+
 #[derive(Insertable)]
 #[diesel(table_name = files)]
 pub struct CreateFileDTO {
@@ -119,13 +130,29 @@ pub struct Group {
     pub modify_time: chrono::NaiveDateTime,
 }
 
+impl Debug for Group {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmtResult {
+        write!(
+            f,
+            "Group {{ id: {}, name: {}, reference_count: {}, is_primary: {}, click_count: {}, share_count: {}, create_time: {}, modify_time: {} }}",
+            self.id,
+            self.name,
+            self.reference_count,
+            self.is_primary,
+            self.click_count,
+            self.share_count,
+            self.create_time,
+            self.modify_time
+        )
+    }
+}
+
 #[derive(Insertable, Deserialize, Serialize)]
 #[diesel(table_name = groups)]
 pub struct CreateGroupDTO {
     pub name: String,
 }
 
-
 #[derive(Deserialize,Clone)]
 pub enum GroupCondition {
     Id(i32),
@@ -242,6 +269,16 @@ pub struct Tag {
     pub reference_count: i32,
 }
 
+impl Debug for Tag {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmtResult {
+        write!(
+            f,
+            "Tag {{ id: {}, name: {}, reference_count: {} }}",
+            self.id, self.name, self.reference_count
+        )
+    }
+}
+
 #[derive(Insertable, Deserialize, Serialize)]
 #[diesel(table_name = tags)]
 pub struct CreateTagDTO {
@@ -319,6 +356,12 @@ pub struct FileGroupDTO {
     pub group_id: i32,
 }
 
+impl Debug for FileGroupDTO {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmtResult {
+        write!(f, "FileGroup {{ file_id: {}, group_id: {} }}", self.file_id, self.group_id)
+    }
+}
+
 #[derive(serde::Deserialize, Clone)]
 pub enum FileGroupCondition {
     FileId(i32),
@@ -360,6 +403,12 @@ pub struct GroupTagDTO {
     pub tag_id: i32,
 }
 
+impl Debug for GroupTagDTO {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmtResult {
+        write!(f, "GroupTag {{ group_id: {}, tag_id: {} }}", self.group_id, self.tag_id)
+    }
+}
+
 #[derive(serde::Deserialize, Clone)]
 pub enum GroupTagCondition {
     GroupId(i32),
diff --git a/file_classification_core/src/service/groups.rs b/file_classification_core/src/service/groups.rs
@@ -2,7 +2,7 @@ use crate::model::models::{FileCondition, FileGroupCondition, GroupCondition, Gr
 use crate::service::AppError;
 use crate::{internal::groups, model::models::{CreateGroupDTO, Group, GroupFilter}};
 use diesel::result::Error;
-use diesel::{Connection, JoinOnDsl};
+use diesel::{Connection};
 use crate::utils::database::AnyConnection;
 
 pub fn create_group_by_name<S>(conn: &mut AnyConnection, name: S) -> Result<usize, Error>
diff --git a/file_classification_core/src/service/tags.rs b/file_classification_core/src/service/tags.rs
@@ -3,7 +3,7 @@ use crate::{
     internal::tags,
     model::models::{CreateTagDTO, Tag, TagFilter},
 };
-use diesel::{Connection, JoinOnDsl};
+use diesel::{Connection};
 use crate::utils::database::AnyConnection;
 
 pub fn create_tag_by_name<S>(conn: &mut AnyConnection, name: S) -> Result<Tag, diesel::result::Error>
