Model changes (#22)

Reviewed-on: phoenix/textsender-models#22

Cargo.lock

@@ -609,7 +609,7 @@ dependencies = [
 
 [[package]]
 name = "textsender_models"
-version = "0.3.0"
+version = "0.2.5"
 dependencies = [
  "const_format",
  "dotenvy",

Cargo.toml

@@ -1,10 +1,9 @@
 [package]
 name = "textsender_models"
-version = "0.3.0"
+version = "0.2.5"
 edition = "2024"
 rust-version = "1.95"
 description = "models used for the textsender project"
-# license = "MIT"
 
 [dependencies]
 serde = { version = "1.0.228", features = ["derive"] }

src/config/auxiliary/mod.rs

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct TwilioConfig {
     #[serde(alias = "auth_id")]
-    pub account_sid: uuid::Uuid,
+    pub account_sid: String,
     #[serde(skip_serializing_if = "String::is_empty")]
     pub service_sid: String,
     #[serde(skip_serializing_if = "String::is_empty")]

src/contact/mod.rs

@@ -3,18 +3,18 @@ use serde::{Deserialize, Serialize};
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Contact {
     #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
-    pub id: uuid::Uuid,
+    pub id: Option<uuid::Uuid>,
     // empty?
-    #[serde(skip_serializing_if = "String::is_empty")]
-    pub firstname: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub firstname: Option<String>,
     // empty?
-    #[serde(skip_serializing_if = "String::is_empty")]
-    pub lastname: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub lastname: Option<String>,
     // empty?
-    #[serde(skip_serializing_if = "String::is_empty")]
-    pub nickname: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub nickname: Option<String>,
     pub phone_number: String,
     // empty
     #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
-    pub user_id: uuid::Uuid,
+    pub user_id: Option<uuid::Uuid>,
 }

src/lib.rs

@@ -6,7 +6,10 @@ pub mod token;
 pub mod user;
 
 pub mod init {
-    pub fn is_uuid_nil(uuid: &uuid::Uuid) -> bool {
-        uuid.is_nil()
+    pub fn is_uuid_nil(uuid: &Option<uuid::Uuid>) -> bool {
+        match uuid {
+            Some(id) => id.is_nil(),
+            None => true,
+        }
     }
 }

src/message/mod.rs

@@ -5,7 +5,9 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct Message {
-    pub id: uuid::Uuid,
+    #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
+    pub id: Option<uuid::Uuid>,
     pub content: String,
-    pub user_id: uuid::Uuid,
+    #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
+    pub user_id: Option<uuid::Uuid>,
 }

src/user/mod.rs

@@ -71,7 +71,7 @@ pub struct UserProfile {
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Salt {
-    #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
+    // #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
     pub id: uuid::Uuid,
     #[serde(skip_serializing_if = "String::is_empty")]
     pub salt: String,