phoenix/icarus_models
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 53 Wiki Activity

Merge branch 'user_changes' into 'main'

Browse Source 
User changes

See merge request kdeng00/icarus-models!21
This commit is contained in:
KD
2025-03-14 00:43:12 +00:00
parent daeb208448 6bed8590ca
commit a2371b7bf1
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/user.rs
View File

@@ -4,7 +4,7 @@ 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")] #[serde(skip_serializing_if = "is_id_valid")]
pub id: i32, pub id: i32,
#[serde(skip_serializing_if = "String::is_empty")] #[serde(skip_serializing_if = "String::is_empty")]
pub username: String, pub username: String,
@@ -27,8 +27,8 @@ pub struct User {
pub last_login: String, pub last_login: String,
} }
fn is_zero(num: &i32) -> bool { fn is_id_valid(num: &i32) -> bool {
*num == 0 *num > 0
} }
impl Default for User { impl Default for User {
@@ -50,7 +50,11 @@ impl Default for User {
} }
impl User { impl User {
pub fn to_json(&self) -> Result<String, serde_json::Error> { pub fn to_json(&self, output_pretty: bool) -> Result<String, serde_json::Error> {
if output_pretty {
return serde_json::to_string_pretty(&self); return serde_json::to_string_pretty(&self);
} else {
return serde_json::to_string(&self);
}
} }
} }