Merge branch 'devel' of git.kundeng.us:phoenix/icarus_models into devel

This commit is contained in:
2025-04-05 12:43:48 -04:00
2 changed files with 5 additions and 6 deletions

View File

@@ -9,6 +9,7 @@ license = "MIT"
serde = { version = "1.0.218", features = ["derive"] } serde = { version = "1.0.218", features = ["derive"] }
serde_json = { version = "1.0.139" } serde_json = { version = "1.0.139" }
rand = { version = "0.9" } rand = { version = "0.9" }
time = { version = "0.3.41", features = ["macros", "serde"] }
uuid = { version = "1.16.0", features = ["v4", "serde"] } uuid = { version = "1.16.0", features = ["v4", "serde"] }
[dev-dependencies] [dev-dependencies]
tempfile = { version = "3.19.1" } tempfile = { version = "3.19.1" }

View File

@@ -21,12 +21,10 @@ pub struct User {
#[serde(skip_serializing_if = "String::is_empty")] #[serde(skip_serializing_if = "String::is_empty")]
pub lastname: String, pub lastname: String,
pub email_verified: bool, pub email_verified: bool,
#[serde(skip_serializing_if = "String::is_empty")] pub date_created: Option<time::OffsetDateTime>,
pub date_created: String,
#[serde(skip_serializing_if = "String::is_empty")] #[serde(skip_serializing_if = "String::is_empty")]
pub status: String, pub status: String,
#[serde(skip_serializing_if = "String::is_empty")] pub last_login: Option<time::OffsetDateTime>,
pub last_login: String,
#[serde(skip_serializing_if = "init::is_uuid_nil")] #[serde(skip_serializing_if = "init::is_uuid_nil")]
pub salt_id: uuid::Uuid, pub salt_id: uuid::Uuid,
} }
@@ -42,9 +40,9 @@ impl Default for User {
firstname: String::new(), firstname: String::new(),
lastname: String::new(), lastname: String::new(),
email_verified: false, email_verified: false,
date_created: String::new(), date_created: None,
status: String::new(), status: String::new(),
last_login: String::new(), last_login: None,
salt_id: uuid::Uuid::nil(), salt_id: uuid::Uuid::nil(),
} }
} }