From 04eaa1dff19dc9029f30e065d7a5d2f4565c38a8 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 29 May 2026 22:08:53 -0400 Subject: [PATCH 1/5] Added UserProfile --- src/user/mod.rs | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/user/mod.rs b/src/user/mod.rs index ffe509d..a6d5034 100644 --- a/src/user/mod.rs +++ b/src/user/mod.rs @@ -43,3 +43,27 @@ pub struct ServiceUserLoginHistory { pub login_time: Option, pub service_user_id: uuid::Uuid, } + +#[derive(Clone, Debug, Default, Deserialize, Serialize)] +pub struct UserProfile { + pub user_id: uuid::Uuid, + pub phone_number: String, + pub username: String, + pub firstname: String, + pub lastname: String, + pub created: Option, + pub last_login: Option, +} + +pub fn init_user_profile(usr: &User) -> UserProfile { + let mut usrProfile = UserProfile::default(); + usrProfile.user_id = usr.id.clone(); + usrProfile.phone_number = usr.phone_number.clone(); + usrProfile.username = usr.username.clone(); + usrProfile.firstname = usr.firstname.clone(); + usrProfile.lastname = usr.lastname.clone(); + usrProfile.created = usr.created.clone(); + usrProfile.last_login = usr.last_login.clone(); + + return usrProfile; +} -- 2.47.3 From 8de38f204ef3394b36edf605158f7be677e43938 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 29 May 2026 22:11:58 -0400 Subject: [PATCH 2/5] cargo fmt --- src/user/mod.rs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/user/mod.rs b/src/user/mod.rs index a6d5034..93fde9d 100644 --- a/src/user/mod.rs +++ b/src/user/mod.rs @@ -56,14 +56,15 @@ pub struct UserProfile { } pub fn init_user_profile(usr: &User) -> UserProfile { - let mut usrProfile = UserProfile::default(); - usrProfile.user_id = usr.id.clone(); - usrProfile.phone_number = usr.phone_number.clone(); - usrProfile.username = usr.username.clone(); - usrProfile.firstname = usr.firstname.clone(); - usrProfile.lastname = usr.lastname.clone(); - usrProfile.created = usr.created.clone(); - usrProfile.last_login = usr.last_login.clone(); + let usr_profile = UserProfile { + user_id: usr.id.clone(), + phone_number: usr.phone_number.clone(), + username: usr.username.clone(), + firstname: usr.firstname.clone(), + lastname: usr.lastname.clone(), + created: usr.created.clone(), + last_login: usr.last_login.clone(), + }; - return usrProfile; + return usr_profile; } -- 2.47.3 From f91069cdedd093cef796ee0c7879984b5f349b59 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 29 May 2026 22:15:32 -0400 Subject: [PATCH 3/5] Formatted code --- src/user/mod.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/user/mod.rs b/src/user/mod.rs index 93fde9d..2832daa 100644 --- a/src/user/mod.rs +++ b/src/user/mod.rs @@ -57,14 +57,14 @@ pub struct UserProfile { pub fn init_user_profile(usr: &User) -> UserProfile { let usr_profile = UserProfile { - user_id: usr.id.clone(), + user_id: usr.id, phone_number: usr.phone_number.clone(), username: usr.username.clone(), firstname: usr.firstname.clone(), lastname: usr.lastname.clone(), - created: usr.created.clone(), - last_login: usr.last_login.clone(), + created: usr.created, + last_login: usr.last_login, }; - return usr_profile; + usr_profile } -- 2.47.3 From 8e31f27dff02a429aa551d6174ed02ce8ae7d840 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 29 May 2026 22:17:05 -0400 Subject: [PATCH 4/5] cargo fmt --- src/user/mod.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/user/mod.rs b/src/user/mod.rs index 2832daa..a1b2493 100644 --- a/src/user/mod.rs +++ b/src/user/mod.rs @@ -57,13 +57,13 @@ pub struct UserProfile { pub fn init_user_profile(usr: &User) -> UserProfile { let usr_profile = UserProfile { - user_id: usr.id, - phone_number: usr.phone_number.clone(), - username: usr.username.clone(), - firstname: usr.firstname.clone(), - lastname: usr.lastname.clone(), - created: usr.created, - last_login: usr.last_login, + user_id: usr.id, + phone_number: usr.phone_number.clone(), + username: usr.username.clone(), + firstname: usr.firstname.clone(), + lastname: usr.lastname.clone(), + created: usr.created, + last_login: usr.last_login, }; usr_profile -- 2.47.3 From 51c582b4f6276d5313394db1b4b58c586127db7e Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 29 May 2026 22:20:07 -0400 Subject: [PATCH 5/5] code fixes --- src/user/mod.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/user/mod.rs b/src/user/mod.rs index a1b2493..5a25302 100644 --- a/src/user/mod.rs +++ b/src/user/mod.rs @@ -56,7 +56,7 @@ pub struct UserProfile { } pub fn init_user_profile(usr: &User) -> UserProfile { - let usr_profile = UserProfile { + UserProfile { user_id: usr.id, phone_number: usr.phone_number.clone(), username: usr.username.clone(), @@ -64,7 +64,5 @@ pub fn init_user_profile(usr: &User) -> UserProfile { lastname: usr.lastname.clone(), created: usr.created, last_login: usr.last_login, - }; - - usr_profile + } } -- 2.47.3