From 95c6cbbf45dd1a41c13ee9700ee689e3bbba1cc5 Mon Sep 17 00:00:00 2001 From: Kould Date: Wed, 13 Dec 2023 19:51:02 +0800 Subject: [PATCH] fix: created_at & updated_at (#5) Co-authored-by: kould <2435992353@qq.com> --- Cargo.toml | 1 + src/api/tag.rs | 2 +- src/entity/dialog_info.rs | 2 ++ src/entity/doc_info.rs | 4 ++-- src/entity/kb_info.rs | 2 ++ src/entity/tag_info.rs | 2 ++ src/entity/user_info.rs | 6 ++++-- src/service/tag_info.rs | 11 ++++++----- 8 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e27e50d8c..0c881467a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,6 +16,7 @@ serde_json = "1.0" tracing-subscriber = "0.3.18" dotenvy = "0.15.7" listenfd = "1.0.1" +chrono = "0.4.31" migration = { path = "./migration" } [[bin]] diff --git a/src/api/tag.rs b/src/api/tag.rs index 3af8a65a8..b902f3d3a 100644 --- a/src/api/tag.rs +++ b/src/api/tag.rs @@ -11,7 +11,7 @@ async fn create(model: web::Json, data: web::Data) -> let model = Mutation::create_tag(&data.conn, model.into_inner()).await.unwrap(); let mut result = HashMap::new(); - result.insert("tid", model.uid.unwrap()); + result.insert("tid", model.tid.unwrap()); let json_response = JsonResponse { code: 200, diff --git a/src/entity/dialog_info.rs b/src/entity/dialog_info.rs index d0c49359b..a97999b2e 100644 --- a/src/entity/dialog_info.rs +++ b/src/entity/dialog_info.rs @@ -11,7 +11,9 @@ pub struct Model { pub dialog_name: String, pub history: String, + #[serde(skip_deserializing)] pub created_at: Date, + #[serde(skip_deserializing)] pub updated_at: Date, } diff --git a/src/entity/doc_info.rs b/src/entity/doc_info.rs index 4e5641b20..0f39a8d69 100644 --- a/src/entity/doc_info.rs +++ b/src/entity/doc_info.rs @@ -14,10 +14,10 @@ pub struct Model { pub r#type: String, pub kb_progress: f64, + #[serde(skip_deserializing)] pub created_at: Date, + #[serde(skip_deserializing)] pub updated_at: Date, - #[sea_orm(soft_delete_column)] - pub is_deleted: bool, } #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] diff --git a/src/entity/kb_info.rs b/src/entity/kb_info.rs index 11cb3b2c2..46ce903b1 100644 --- a/src/entity/kb_info.rs +++ b/src/entity/kb_info.rs @@ -11,7 +11,9 @@ pub struct Model { pub kn_name: String, pub icon: i64, + #[serde(skip_deserializing)] pub created_at: Date, + #[serde(skip_deserializing)] pub updated_at: Date, } diff --git a/src/entity/tag_info.rs b/src/entity/tag_info.rs index 230ed8558..f2a8efe3b 100644 --- a/src/entity/tag_info.rs +++ b/src/entity/tag_info.rs @@ -14,7 +14,9 @@ pub struct Model { pub icon: i64, pub dir: String, + #[serde(skip_deserializing)] pub created_at: Date, + #[serde(skip_deserializing)] pub updated_at: Date, } diff --git a/src/entity/user_info.rs b/src/entity/user_info.rs index 464d33e63..c706e3538 100644 --- a/src/entity/user_info.rs +++ b/src/entity/user_info.rs @@ -14,8 +14,10 @@ pub struct Model { pub list_style: String, pub language: String, - pub created_at: DateTimeWithTimeZone, - pub updated_at: DateTimeWithTimeZone, + #[serde(skip_deserializing)] + pub created_at: Date, + #[serde(skip_deserializing)] + pub updated_at: Date, } #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] diff --git a/src/service/tag_info.rs b/src/service/tag_info.rs index c0a3ce774..656eb2c94 100644 --- a/src/service/tag_info.rs +++ b/src/service/tag_info.rs @@ -1,3 +1,4 @@ +use chrono::{Local, NaiveDate}; use sea_orm::{ActiveModelTrait, DbConn, DbErr, DeleteResult, EntityTrait, PaginatorTrait, QueryOrder}; use sea_orm::ActiveValue::Set; use crate::entity::tag_info; @@ -38,15 +39,15 @@ impl Mutation { form_data: tag_info::Model, ) -> Result { tag_info::ActiveModel { - tid: Set(form_data.tid.to_owned()), + tid: Default::default(), uid: Set(form_data.uid.to_owned()), tag_name: Set(form_data.tag_name.to_owned()), regx: Set(form_data.regx.to_owned()), color: Set(form_data.color.to_owned()), icon: Set(form_data.icon.to_owned()), dir: Set(form_data.dir.to_owned()), - created_at: Default::default(), - updated_at: Default::default(), + created_at: Set(Local::now().date_naive()), + updated_at: Set(Local::now().date_naive()), } .save(db) .await @@ -60,7 +61,7 @@ impl Mutation { let tag: tag_info::ActiveModel = Entity::find_by_id(id) .one(db) .await? - .ok_or(DbErr::Custom("Cannot find post.".to_owned())) + .ok_or(DbErr::Custom("Cannot find tag.".to_owned())) .map(Into::into)?; tag_info::ActiveModel { @@ -72,7 +73,7 @@ impl Mutation { icon: Set(form_data.icon.to_owned()), dir: Set(form_data.dir.to_owned()), created_at: Default::default(), - updated_at: Default::default(), + updated_at: Set(Local::now().date_naive()), } .update(db) .await