From c4b2c19f7713a50160b748b5fbd9713e2bc48d11 Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 17 Jun 2026 16:15:35 -0400 Subject: [PATCH] Some refactoring --- src/config/auxiliary/mod.rs | 4 +--- src/contact/mod.rs | 4 +--- src/token/mod.rs | 6 +++--- src/user/mod.rs | 16 +++++++--------- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/config/auxiliary/mod.rs b/src/config/auxiliary/mod.rs index 398668b..5a54aea 100644 --- a/src/config/auxiliary/mod.rs +++ b/src/config/auxiliary/mod.rs @@ -1,6 +1,4 @@ -use serde::{Deserialize, Serialize}; - -#[derive(Clone, Debug, Default, Deserialize, Serialize)] +#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)] pub struct TwilioConfig { #[serde(alias = "auth_id")] pub account_sid: String, diff --git a/src/contact/mod.rs b/src/contact/mod.rs index cb4c2e0..88898c2 100644 --- a/src/contact/mod.rs +++ b/src/contact/mod.rs @@ -1,6 +1,4 @@ -use serde::{Deserialize, Serialize}; - -#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)] +#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)] pub struct Contact { #[serde(skip_serializing_if = "crate::init::is_uuid_nil")] pub id: Option, diff --git a/src/token/mod.rs b/src/token/mod.rs index a4a7551..bf4fcf7 100644 --- a/src/token/mod.rs +++ b/src/token/mod.rs @@ -1,6 +1,6 @@ -use serde::{Deserialize, Serialize}; +use serde::Deserialize; -#[derive(Clone, Debug, Default, Deserialize, Serialize)] +#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)] pub struct Claims { pub user_id: uuid::Uuid, #[serde(skip_serializing_if = "Option::is_none")] @@ -34,7 +34,7 @@ where } } -#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)] +#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)] pub struct LoginResult { pub user_id: uuid::Uuid, pub access_token: String, diff --git a/src/user/mod.rs b/src/user/mod.rs index e2d4f66..a721fe2 100644 --- a/src/user/mod.rs +++ b/src/user/mod.rs @@ -1,6 +1,4 @@ -use serde::{Deserialize, Serialize}; - -#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)] +#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)] pub struct User { pub id: uuid::Uuid, pub phone_number: String, @@ -18,7 +16,7 @@ pub struct User { pub salt_id: uuid::Uuid, } -#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)] +#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)] pub struct ServiceUser { pub id: uuid::Uuid, pub username: String, @@ -32,7 +30,7 @@ pub struct ServiceUser { pub salt_id: uuid::Uuid, } -#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)] +#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)] pub struct Organization { pub id: uuid::Uuid, pub name: String, @@ -40,7 +38,7 @@ pub struct Organization { pub created: Option, } -#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)] +#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)] pub struct UserLoginHistory { pub id: uuid::Uuid, #[serde(with = "time::serde::rfc3339::option")] @@ -48,7 +46,7 @@ pub struct UserLoginHistory { pub user_id: uuid::Uuid, } -#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)] +#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)] pub struct ServiceUserLoginHistory { pub id: uuid::Uuid, #[serde(with = "time::serde::rfc3339::option")] @@ -56,7 +54,7 @@ pub struct ServiceUserLoginHistory { pub service_user_id: uuid::Uuid, } -#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)] +#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)] pub struct UserProfile { pub user_id: uuid::Uuid, pub phone_number: String, @@ -69,7 +67,7 @@ pub struct UserProfile { pub last_login: Option, } -#[derive(Clone, Debug, Default, Deserialize, Serialize)] +#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)] pub struct Salt { // #[serde(skip_serializing_if = "crate::init::is_uuid_nil")] pub id: uuid::Uuid,