cargo fmt

Reviewed-on: phoenix/textsender-models#14

src/lib.rs

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

src/message/event/mod.rs

@@ -0,0 +1,18 @@
+use serde::{Deserialize, Serialize};
+
+pub const MESSAGE_EVENT_RESPONSE_STATUS_INSTANT: &str = "INSTANT";
+pub const MESSAGE_EVENT_RESPONSE_STATUS_SCHEDULED: &str = "SCHEDULED";
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+pub struct MessageEventResponse {
+    pub id: uuid::Uuid,
+    pub scheduled_message_event_id: uuid::Uuid,
+    // Json field
+    pub response: String,
+    pub user_id: uuid::Uuid,
+    pub contact_id: uuid::Uuid,
+    pub message_id: uuid::Uuid,
+    pub status: String,
+    #[serde(with = "time::serde::rfc3339::option")]
+    pub sent: Option<time::OffsetDateTime>,
+}

src/message/mod.rs

@@ -0,0 +1,11 @@
+pub mod event;
+pub mod scheduling;
+
+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/message/scheduling/mod.rs

@@ -0,0 +1,27 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+pub struct ScheduledMessageEvent {
+    id: uuid::Uuid,
+    contact_id: uuid::Uuid,
+    message_id: uuid::Uuid,
+    scheduled_message_id: uuid::Uuid,
+    #[serde(with = "time::serde::rfc3339::option")]
+    created: Option<time::OffsetDateTime>,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+pub struct ScheduledMessage {
+    id: uuid::Uuid,
+    #[serde(with = "time::serde::rfc3339::option")]
+    scheduled: Option<time::OffsetDateTime>,
+    #[serde(with = "time::serde::rfc3339::option")]
+    created: Option<time::OffsetDateTime>,
+    status: String,
+    user_id: uuid::Uuid,
+}
+
+pub const READY: &str = "READY";
+pub const PENDING: &str = "PENDING";
+pub const PROCESSING: &str = "PROCESSING";
+pub const DONE: &str = "DONE";

src/user/mod.rs

@@ -28,6 +28,14 @@ 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,
@@ -51,19 +59,44 @@ 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 {
-    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;
+    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,
+    }
+}
+
+#[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"
+        );
+    }
 }