Merge branch 'user_changes' into 'main'

User changes

See merge request kdeng00/icarus-models!20
This commit is contained in:
KD
2025-03-14 00:22:23 +00:00

View File

@@ -4,19 +4,33 @@ use serde::{Deserialize, Serialize};
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, Deserialize, Serialize)]
pub struct User { pub struct User {
#[serde(skip_serializing_if = "is_zero")]
pub id: i32, pub id: i32,
#[serde(skip_serializing_if = "String::is_empty")]
pub username: String, pub username: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub password: String, pub password: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub email: String, pub email: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub phone: String, pub phone: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub firstname: String, pub firstname: String,
#[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: String, pub date_created: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub status: String, pub status: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub last_login: String, pub last_login: String,
} }
fn is_zero(num: &i32) -> bool {
*num == 0
}
impl Default for User { impl Default for User {
fn default() -> Self { fn default() -> Self {
User { User {
@@ -36,7 +50,7 @@ impl Default for User {
} }
impl User { impl User {
pub fn _to_json(&self) -> Result<String, serde_json::Error> { pub fn to_json(&self) -> Result<String, serde_json::Error> {
return serde_json::to_string_pretty(&self); return serde_json::to_string_pretty(&self);
} }
} }