Skip to content

Commit 1037d30

Browse files
committed
chore: clean import
1 parent 64f1df4 commit 1037d30

5 files changed

Lines changed: 27 additions & 31 deletions

File tree

file_classification_core/src/internal/file_group.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use crate::model::schema::file_groups;
33
use diesel::prelude::*;
44
use std::fmt::{Debug, Formatter, Result as fmtResult};
55
use crate::utils::database::AnyConnection;
6+
use crate::model::models::{FileGroupOrderBy, FileGroupQueryOptions, OrderDirection};
67

78
pub fn insert_file_group(
89
conn: &mut AnyConnection,
@@ -31,8 +32,6 @@ impl Debug for FileGroupDTO {
3132
}
3233
}
3334

34-
use crate::model::models::{FileGroupOrderBy, FileGroupQueryOptions, OrderDirection};
35-
3635
// 将 FileGroupCondition 转换为 diesel 查询条件的辅助函数
3736
fn build_file_group_condition(condition: FileGroupCondition) -> Box<dyn BoxableExpression<file_groups::table, <AnyConnection as Connection>::Backend, SqlType=diesel::sql_types::Bool>> {
3837
match condition {

file_classification_core/src/internal/files.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
use super::models::{CreateFileDTO, File, FileCondition, FileFilter, UpdateFileDTO};
22
use diesel::prelude::*;
33
use crate::utils::database::AnyConnection;
4+
use crate::model::models::{FileOrderBy, FileQueryOptions, OrderDirection};
5+
use crate::model::schema::files;
6+
use crate::model::schema::files::dsl::*;
7+
use diesel::sql_types::Bool;
8+
use std::fmt::{Debug, Formatter, Result as fmtResult};
49

510
pub fn create_file(conn: &mut AnyConnection, new_file: &CreateFileDTO) -> Result<usize, diesel::result::Error> {
611
diesel::insert_into(files::table)
@@ -69,12 +74,6 @@ pub fn delete_file_by_id(conn: &mut AnyConnection, file_id: i32) -> Result<usize
6974
diesel::delete(files.filter(files::id.eq(file_id))).execute(conn)
7075
}
7176

72-
use crate::model::models::{FileOrderBy, FileQueryOptions, OrderDirection};
73-
use crate::model::schema::files;
74-
use crate::model::schema::files::dsl::*;
75-
use diesel::sql_types::Bool;
76-
use std::fmt::{Debug, Formatter, Result as fmtResult};
77-
7877
impl Debug for File {
7978
fn fmt(&self, f: &mut Formatter<'_>) -> fmtResult {
8079
write!(

file_classification_core/src/internal/group_tag.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ use crate::model::schema::group_tags;
33
use diesel::prelude::*;
44
use std::fmt::{Debug, Formatter, Result as fmtResult};
55
use crate::utils::database::AnyConnection;
6+
use super::models::GroupTagCondition;
7+
use crate::model::models::{GroupTagOrderBy, GroupTagQueryOptions, OrderDirection};
8+
use diesel::dsl::not;
9+
use diesel::sql_types::Bool;
610

711
// 在 group_tag.rs 中添加数据访问层函数
812
pub fn insert_group_tag(
@@ -32,11 +36,6 @@ impl Debug for GroupTagDTO {
3236
}
3337
}
3438

35-
use super::models::GroupTagCondition;
36-
use crate::model::models::{GroupTagOrderBy, GroupTagQueryOptions, OrderDirection};
37-
use diesel::dsl::not;
38-
use diesel::sql_types::Bool;
39-
4039
// 将 GroupTagCondition 转换为 diesel 查询条件的辅助函数
4140
fn build_group_tag_condition(condition: GroupTagCondition) -> Box<dyn BoxableExpression<group_tags::table, <AnyConnection as Connection>::Backend, SqlType=diesel::sql_types::Bool>> {
4241
match condition {

file_classification_core/src/internal/groups.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
use super::models::{CreateGroupDTO, Group, GroupFilter};
22
use diesel::prelude::*;
3+
use crate::model::schema::groups::dsl::*;
4+
use crate::model::schema::groups;
5+
use std::fmt::{Debug, Formatter, Result as fmtResult};
6+
use super::models::GroupCondition;
7+
use crate::model::models::{GroupOrderBy, GroupQueryOptions, OrderDirection, UpdateGroupDTO};
8+
use diesel::dsl::not;
9+
use diesel::sql_types::Bool;
10+
use crate::utils::database::AnyConnection;
11+
312
pub fn create_group(conn: &mut AnyConnection, new_group: &CreateGroupDTO) -> Result<usize, diesel::result::Error> {
413
diesel::insert_into(groups::table)
514
.values(new_group).execute(conn)
@@ -83,9 +92,6 @@ pub fn delete_group(
8392
) -> Result<usize, diesel::result::Error> {
8493
diesel::delete(groups.filter(groups::id.eq(group_id))).execute(conn)
8594
}
86-
use crate::model::schema::groups::dsl::*;
87-
use crate::model::schema::groups;
88-
use std::fmt::{Debug, Formatter, Result as fmtResult};
8995

9096
pub fn increase_group_reference_count(
9197
conn: &mut AnyConnection,
@@ -120,12 +126,6 @@ impl Debug for Group {
120126
}
121127
}
122128

123-
use super::models::GroupCondition;
124-
use crate::model::models::{GroupOrderBy, GroupQueryOptions, OrderDirection, UpdateGroupDTO};
125-
use diesel::dsl::not;
126-
use diesel::sql_types::Bool;
127-
use crate::utils::database::AnyConnection;
128-
129129
// 将 GroupCondition 转换为 diesel 查询条件的辅助函数
130130
fn build_group_condition(condition: GroupCondition) -> Box<dyn BoxableExpression<groups::table, <AnyConnection as Connection>::Backend, SqlType=diesel::sql_types::Bool>> {
131131
match condition {

file_classification_core/src/internal/tags.rs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
use super::models::{CreateTagDTO, Tag, TagFilter};
22
use diesel::prelude::*;
33
use crate::utils::database::AnyConnection;
4+
use crate::model::schema::tags::dsl::*;
5+
use crate::model::schema::{groups, tags};
6+
use std::fmt::{Debug, Formatter, Result as fmtResult};
7+
use super::models::TagCondition;
8+
use crate::model::models::{Group, OrderDirection, TagOrderBy, TagQueryOptions, UpdateTagDTO};
9+
use diesel::dsl::not;
10+
use diesel::sql_types::Bool;
11+
use crate::model::schema::group_tags::dsl::group_tags;
412

513
pub fn create_tag(
614
conn: &mut AnyConnection,
@@ -78,9 +86,6 @@ pub fn delete_tag(conn: &mut AnyConnection, tag_id: i32) -> Result<usize, diesel
7886
diesel::delete(tags.filter(tags::id.eq(tag_id))).execute(conn)
7987
}
8088

81-
use crate::model::schema::tags::dsl::*;
82-
use crate::model::schema::{groups, tags};
83-
use std::fmt::{Debug, Formatter, Result as fmtResult};
8489

8590
impl Debug for Tag {
8691
fn fmt(&self, f: &mut Formatter<'_>) -> fmtResult {
@@ -92,12 +97,6 @@ impl Debug for Tag {
9297
}
9398
}
9499

95-
use super::models::TagCondition;
96-
use crate::model::models::{Group, OrderDirection, TagOrderBy, TagQueryOptions, UpdateTagDTO};
97-
use diesel::dsl::not;
98-
use diesel::sql_types::Bool;
99-
use crate::model::schema::group_tags::dsl::group_tags;
100-
101100
// 将 TagCondition 转换为 diesel 查询条件的辅助函数
102101
fn build_tag_condition(condition: TagCondition) -> Box<dyn BoxableExpression<tags::table, <AnyConnection as Connection>::Backend, SqlType=diesel::sql_types::Bool>> {
103102
match condition {

0 commit comments

Comments
 (0)