chore: use as_select instead of listing columns

Author: DataEraserC

file_classification_core/src/internal/file_group.rs

@@ -1,9 +1,11 @@
 use super::models::{FileGroupCondition, FileGroupDTO};
-use crate::model::schema::file_groups;
+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::{FileGroupOrderBy, FileGroupQueryOptions, OrderDirection};
+use crate::model::models::{File, FileGroupOrderBy, FileGroupQueryOptions, OrderDirection};
+use crate::utils::errors::AppError;
+use crate::utils::errors::AppError::CannotUnbindPrimaryGroup;
 
 pub fn insert_file_group(
     conn: &mut AnyConnection,
@@ -17,13 +19,25 @@ pub fn insert_file_group(
 pub fn delete_file_group_by_id(
     conn: &mut AnyConnection,
     file_group_dto: &FileGroupDTO,
-) -> Result<usize, diesel::result::Error> {
+) -> Result<usize, AppError> {
+    // 判断是否是文件-主组关系 若是则抛异常
+    let file = files::table
+        .select(File::as_select())
+        .filter(files::id.eq(file_group_dto.file_id))
+        .first(conn);
+
+    if file.is_ok() && file.unwrap().group_id == file_group_dto.group_id {
+        return Err(CannotUnbindPrimaryGroup);
+    }
+
     // 删除关联记录
     diesel::delete(
         file_groups::table
             .filter(file_groups::group_id.eq(file_group_dto.group_id))
-            .filter(file_groups::file_id.eq(file_group_dto.file_id))
-    ).execute(conn)
+            .filter(file_groups::file_id.eq(file_group_dto.file_id)),
+    )
+    .execute(conn)
+    .map_err(AppError::from) // 将 QueryResult 转换为 AppError
 }
 
 impl Debug for FileGroupDTO {
@@ -94,7 +108,7 @@ pub fn select_file_groups_by_conditions(
     }
 
     query
-        .select((file_groups::file_id, file_groups::group_id))
+        .select(FileGroupDTO::as_select())
         .load(conn)
 }
 
@@ -140,7 +154,7 @@ pub fn select_file_groups_by_conditions_with_options(
     }
 
     query
-        .select((file_groups::file_id, file_groups::group_id))
+        .select(FileGroupDTO::as_select())
         .load(conn)
 }
 

file_classification_core/src/internal/files.rs

@@ -15,7 +15,7 @@ pub fn create_file(conn: &mut AnyConnection, new_file: &CreateFileDTO) -> Result
 pub fn find_file_by_id(conn: &mut AnyConnection, _id: i32) -> Result<Option<File>, diesel::result::Error> {
     files::table
         .filter(files::id.eq(_id))
-        .select((files::id, files::type_, files::path, files::reference_count, files::group_id))
+        .select(File::as_select())
         .first(conn)
         .optional()
 }
@@ -66,7 +66,7 @@ pub fn select_files(
 
     // 执行查询
     base_query
-        .select((files::id, files::type_, files::path, files::reference_count, files::group_id))
+        .select(File::as_select())
         .load(conn)
 }
 
@@ -158,7 +158,7 @@ pub fn select_files_by_conditions(
     }
 
     query
-        .select((files::id, files::type_, files::path, files::reference_count, files::group_id))
+        .select(File::as_select())
         .load(conn)
 }
 
@@ -222,7 +222,7 @@ pub fn select_files_by_conditions_with_options(
     }
 
     query
-        .select((files::id, files::type_, files::path, files::reference_count, files::group_id))
+        .select(File::as_select())
         .load(conn)
 }
 

file_classification_core/src/internal/group_tag.rs

@@ -98,7 +98,7 @@ pub fn select_group_tags_by_conditions(
     }
 
     query
-        .select((group_tags::group_id, group_tags::tag_id))
+        .select(GroupTagDTO::as_select())
         .load(conn)
 }
 
@@ -144,7 +144,7 @@ pub fn select_group_tags_by_conditions_with_options(
     }
 
     query
-        .select((group_tags::group_id, group_tags::tag_id))
+        .select(GroupTagDTO::as_select())
         .load(conn)
 }
 

file_classification_core/src/internal/tags.rs

@@ -20,7 +20,7 @@ pub fn create_tag(
 
     // 手动获取最新插入的记录
     tags.order(tags::id.desc())
-        .select((tags::id, tags::name, tags::reference_count))
+        .select(Tag::as_select())
         .first(conn)
 }
 
@@ -30,14 +30,14 @@ pub fn find_tag_by_name(
     tag_name: &str,
 ) -> Result<Option<Tag>, diesel::result::Error> {
     tags.filter(tags::name.eq(tag_name))
-        .select((tags::id, tags::name, tags::reference_count))
+        .select(Tag::as_select())
         .first::<Tag>(conn)
         .optional()
 }
 
 pub fn find_tag_by_id(conn: &mut AnyConnection, tag_id: i32) -> Result<Option<Tag>, diesel::result::Error> {
     tags.filter(tags::id.eq(tag_id))
-        .select((tags::id, tags::name, tags::reference_count))
+        .select(Tag::as_select())
         .first::<Tag>(conn)
         .optional()
 }
@@ -78,7 +78,7 @@ pub fn select_tags(
 
     // 执行查询，手动指定选择的字段
     base_query
-        .select((tags::id, tags::name, tags::reference_count))
+        .select(Tag::as_select())
         .load(conn)
 }
 
@@ -162,7 +162,7 @@ pub fn select_tags_by_conditions(
     }
 
     query
-        .select((tags::id, tags::name, tags::reference_count))
+        .select(Tag::as_select())
         .load(conn)
 }
 
@@ -214,7 +214,7 @@ pub fn select_tags_by_conditions_with_options(
     }
 
     query
-        .select((tags::id, tags::name, tags::reference_count))
+        .select(Tag::as_select())
         .load(conn)
 }
 

file_classification_core/src/model/models.rs

@@ -311,8 +311,8 @@ pub struct UpdateTag {
 /** FileGroup Related
  */
 
-// NOTE: FileGroupDTO == CreateFileGroupDTO
-#[derive(Queryable, Insertable, Serialize, serde::Deserialize)]
+// NOTE: FileGroupDTO == CreateFileGroupDTO == FileGroup
+#[derive(Queryable, Selectable, Insertable, Serialize, serde::Deserialize)]
 #[diesel(table_name = file_groups)]
 pub struct FileGroupDTO {
     pub file_id: i32,
@@ -352,8 +352,8 @@ pub enum FileGroupOrderBy {
 /** GroupTag Related
 */
 
-// NOTE: GroupTagDTO == CreateGroupTagDTO
-#[derive(Queryable, Insertable, Serialize, Deserialize)]
+// NOTE: GroupTagDTO == CreateGroupTagDTO == GroupTag
+#[derive(Queryable, Selectable, Insertable, Serialize, Deserialize)]
 #[diesel(table_name = group_tags)]
 pub struct GroupTagDTO {
     pub group_id: i32,