Skip to content

Commit 440297a

Browse files
committed
snapshot
1 parent 0619e67 commit 440297a

35 files changed

Lines changed: 642 additions & 3840 deletions

Cargo.lock

Lines changed: 0 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ diesel = { version = "2.2", features = [
2222
"returning_clauses_for_sqlite_3_35",
2323
] }
2424
dotenvy = "0.15"
25-
chrono = "0.4"
25+
chrono = { version = "0.4", features = ["serde"] }

file_classification_core/src/model/models.rs

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
use super::schema::{file_groups, files, group_tags, groups, tags};
22
use chrono;
33
use diesel::prelude::*;
4-
use serde::Serialize;
4+
use serde::{Deserialize, Serialize};
55

66
/** File Related
77
*/
88

9-
#[derive(Queryable, Selectable, AsChangeset, Serialize)]
9+
#[derive(Queryable, Selectable, AsChangeset, Serialize, Deserialize)]
1010
#[diesel(table_name = files)]
1111
#[diesel(check_for_backend(diesel::sqlite::Sqlite))]
1212
#[diesel(treat_none_as_null = true)]
@@ -86,7 +86,7 @@ pub struct UpdateFileDTO {
8686
/** Group Related
8787
*/
8888

89-
#[derive(Queryable, Selectable)]
89+
#[derive(Queryable, Selectable, Serialize)]
9090
#[diesel(table_name = groups)]
9191
#[diesel(check_for_backend(diesel::sqlite::Sqlite))]
9292
pub struct Group {
@@ -106,6 +106,7 @@ pub struct CreateGroupDTO<'a> {
106106
pub name: &'a str,
107107
}
108108

109+
#[derive(Deserialize)]
109110
pub enum GroupCondition {
110111
Id(i32),
111112
Name(String),
@@ -158,7 +159,7 @@ pub enum OrderDirection {
158159
Desc,
159160
}
160161

161-
#[derive(AsChangeset)]
162+
#[derive(AsChangeset, Deserialize)]
162163
#[diesel(table_name = groups)]
163164
pub struct UpdateGroupDTO {
164165
pub id: Option<i32>,
@@ -173,6 +174,7 @@ pub struct UpdateGroupDTO {
173174

174175
// NOTE: you may find File is like SearchFile
175176
// it is bcs IDK how to unify them
177+
#[derive(Deserialize)]
176178
pub struct GroupFilter {
177179
pub id: Option<i32>,
178180
pub name: Option<String>,
@@ -217,6 +219,7 @@ pub struct CreateTagDTO<'a> {
217219
pub name: &'a str,
218220
}
219221

222+
#[derive(Deserialize)]
220223
pub enum TagCondition {
221224
Id(i32),
222225
Name(String),
@@ -246,13 +249,14 @@ pub enum TagOrderBy {
246249
ReferenceCount(OrderDirection),
247250
}
248251

249-
#[derive(AsChangeset)]
252+
#[derive(AsChangeset, Deserialize)]
250253
#[diesel(table_name = tags)]
251254
pub struct UpdateTagDTO {
252255
pub name: Option<String>,
253256
pub reference_count: Option<i32>,
254257
}
255258

259+
#[derive(Deserialize)]
256260
pub struct TagFilter {
257261
pub id: Option<i32>,
258262
pub name: Option<String>,
@@ -311,13 +315,14 @@ pub enum FileGroupOrderBy {
311315
*/
312316

313317
// NOTE: GroupTagDTO == CreateGroupTagDTO
314-
#[derive(Queryable, Insertable, Serialize)]
318+
#[derive(Queryable, Insertable, Serialize, Deserialize)]
315319
#[diesel(table_name = group_tags)]
316320
pub struct GroupTagDTO {
317321
pub group_id: i32,
318322
pub tag_id: i32,
319323
}
320324

325+
#[derive(serde::Deserialize)]
321326
pub enum GroupTagCondition {
322327
GroupId(i32),
323328
TagId(i32),
Lines changed: 9 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,15 @@
11
[package]
2-
name = "file_classification_webapi"
2+
name = "file_classification_webapi2"
33
version = "0.2.0"
44
edition = "2024"
55

66
[dependencies]
77
file_classification_core = { path = "../file_classification_core" }
8-
chrono = { workspace = true }
9-
10-
[[bin]]
11-
name = "list_files"
12-
doc = false
13-
14-
[[bin]]
15-
name = "list_files_by_conditions"
16-
doc = false
17-
18-
[[bin]]
19-
name = "delete_file"
20-
doc = false
21-
22-
[[bin]]
23-
name = "update_files_by_conditions"
24-
doc = false
25-
26-
[[bin]]
27-
name = "list_groups"
28-
doc = false
29-
30-
[[bin]]
31-
name = "list_groups_by_conditions"
32-
doc = false
33-
34-
[[bin]]
35-
name = "create_group"
36-
doc = false
37-
38-
[[bin]]
39-
name = "delete_group"
40-
doc = false
41-
42-
[[bin]]
43-
name = "update_groups_by_conditions"
44-
doc = false
45-
46-
[[bin]]
47-
name = "list_tags"
48-
doc = false
49-
50-
[[bin]]
51-
name = "list_tags_by_conditions"
52-
doc = false
53-
54-
[[bin]]
55-
name = "create_tag"
56-
doc = false
57-
58-
[[bin]]
59-
name = "delete_tag"
60-
doc = false
61-
62-
[[bin]]
63-
name = "update_tags_by_conditions"
64-
doc = false
65-
66-
[[bin]]
67-
name = "list_group_tags_by_conditions"
68-
doc = false
69-
70-
[[bin]]
71-
name = "create_group_tag"
72-
doc = false
73-
74-
[[bin]]
75-
name = "delete_group_tag"
76-
doc = false
77-
78-
[[bin]]
79-
name = "list_file_groups_by_conditions"
80-
doc = false
81-
82-
[[bin]]
83-
name = "create_file_group"
84-
doc = false
85-
86-
[[bin]]
87-
name = "delete_file_group"
88-
doc = false
8+
chrono = { workspace = true, version = "0.4.41", features = ["serde"] }
9+
actix-web = "4.11.0"
10+
serde = { version = "1.0.219", features = ["derive"] }
11+
lazy_static = "1.5.0"
12+
diesel = { version = "2.2.12", features = ["r2d2"] }
13+
serde_json = "1.0.142"
14+
once_cell = "1.21.3"
15+
env_logger = "0.11.8"

file_classification_webapi/src/bin/create_file_group.rs

Lines changed: 0 additions & 37 deletions
This file was deleted.

file_classification_webapi/src/bin/create_group.rs

Lines changed: 0 additions & 31 deletions
This file was deleted.

file_classification_webapi/src/bin/create_group_tag.rs

Lines changed: 0 additions & 37 deletions
This file was deleted.

file_classification_webapi/src/bin/create_tag.rs

Lines changed: 0 additions & 31 deletions
This file was deleted.

file_classification_webapi/src/bin/delete_file.rs

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)