Added UserProfile

src/lib.rs

@@ -1,5 +1,4 @@
 pub mod config;
 pub mod contact;
-pub mod message;
 pub mod token;
 pub mod user;

src/message/mod.rs

@@ -1,8 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
-pub struct Message {
-    pub id: uuid::Uuid,
-    pub content: String,
-    pub user_id: uuid::Uuid,
-}

src/user/mod.rs

@@ -28,14 +28,6 @@ pub struct ServiceUser {
     pub last_login: Option<time::OffsetDateTime>,
 }
 
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
-pub struct Organization {
-    pub id: uuid::Uuid,
-    pub name: String,
-    #[serde(with = "time::serde::rfc3339::option")]
-    pub created: Option<time::OffsetDateTime>,
-}
-
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct UserLoginHistory {
     pub id: uuid::Uuid,
@@ -59,44 +51,19 @@ pub struct UserProfile {
     pub username: String,
     pub firstname: String,
     pub lastname: String,
-    #[serde(with = "time::serde::rfc3339::option")]
     pub created: Option<time::OffsetDateTime>,
-    #[serde(with = "time::serde::rfc3339::option")]
     pub last_login: Option<time::OffsetDateTime>,
 }
 
 pub fn init_user_profile(usr: &User) -> UserProfile {
-    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,
-    }
-}
+    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();
 
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn test_init_user_profile() {
-        let usr = super::User {
-            id: uuid::Uuid::new_v4(),
-            phone_number: String::from("+12308438462"),
-            username: String::from("Cowboy99"),
-            password: String::from("238n7cyr2q89d3xhe2"),
-            firstname: String::from("BillyBob"),
-            lastname: String::from("Jones"),
-            created: Some(time::OffsetDateTime::now_utc()),
-            last_login: Some(time::OffsetDateTime::now_utc()),
-            ..Default::default()
-        };
-
-        let profile = super::init_user_profile(&usr);
-        assert_eq!(
-            usr.phone_number, profile.phone_number,
-            "Phone numbers are not equal"
-        );
-    }
+    return usrProfile;
 }