Skipping serialization of fields in Contact

2026-06-01 21:36:47 -04:00
7 changed files with 123 additions and 24 deletions
@@ -57,6 +57,17 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"

+[[package]]
+name = "chacha20"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "rand_core",
+]
+
 [[package]]
 name = "const_format"
 version = "0.2.36"
@@ -78,6 +89,15 @@ dependencies = [
 "unicode-xid",
 ]

+[[package]]
+name = "cpufeatures"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "crc32fast"
 version = "1.5.0"
@@ -109,6 +129,22 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"

+[[package]]
+name = "errno"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
+
 [[package]]
 name = "find-msvc-tools"
 version = "0.1.9"
@@ -179,6 +215,7 @@ dependencies = [
 "cfg-if",
 "libc",
 "r-efi",
+ "rand_core",
 "wasip2",
 "wasip3",
 ]
@@ -284,6 +321,12 @@ version = "0.2.186"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"

+[[package]]
+name = "linux-raw-sys"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
+
 [[package]]
 name = "log"
 version = "0.4.30"
@@ -407,6 +450,23 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"

+[[package]]
+name = "rand"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
+dependencies = [
+ "chacha20",
+ "getrandom",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
+
 [[package]]
 name = "regex"
 version = "1.12.3"
@@ -436,6 +496,19 @@ version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"

+[[package]]
+name = "rustix"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.22"
@@ -521,15 +594,30 @@ dependencies = [
 "unicode-ident",
 ]

+[[package]]
+name = "tempfile"
+version = "3.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
+dependencies = [
+ "fastrand",
+ "getrandom",
+ "once_cell",
+ "rustix",
+ "windows-sys",
+]
+
 [[package]]
 name = "textsender_models"
-version = "0.2.5"
+version = "0.3.0"
 dependencies = [
 "const_format",
 "dotenvy",
 "josekit",
+ "rand",
 "serde",
 "serde_json",
+ "tempfile",
 "time",
 "utoipa",
 "uuid",
@@ -737,6 +825,21 @@ dependencies = [
 "semver",
 ]

+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "wit-bindgen"
 version = "0.51.0"
@@ -1,14 +1,15 @@
 [package]
 name = "textsender_models"
-version = "0.2.5"
+version = "0.3.0"
 edition = "2024"
 rust-version = "1.95"
-description = "Models used for the textsender project"
+description = "models used for the textsender project"
+# license = "MIT"

 [dependencies]
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = { version = "1.0.149" }
-# rand = { version = "0.10.1" }
+rand = { version = "0.10.1" }
 time = { version = "0.3.47", features = ["formatting", "macros", "parsing", "serde"] }
 uuid = { version = "1.23.1", features = ["v4", "serde"] }
 dotenvy = { version = "0.15.7" }
@@ -17,4 +18,4 @@ josekit = { version = "0.10.3" }
 utoipa = { version = "5.4.0", features = ["uuid", "time"] }

 [dev-dependencies]
-# tempfile = { version = "3.27.0" }
+tempfile = { version = "3.27.0" }
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct TwilioConfig {
    #[serde(alias = "auth_id")]
-    pub account_sid: String,
+    pub account_sid: uuid::Uuid,
    #[serde(skip_serializing_if = "String::is_empty")]
    pub service_sid: String,
    #[serde(skip_serializing_if = "String::is_empty")]
@@ -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: Option<uuid::Uuid>,
+    pub id: uuid::Uuid,
    // empty?
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub firstname: Option<String>,
+    #[serde(skip_serializing_if = "String::is_empty")]
+    pub firstname: String,
    // empty?
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub lastname: Option<String>,
+    #[serde(skip_serializing_if = "String::is_empty")]
+    pub lastname: String,
    // empty?
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub nickname: Option<String>,
+    #[serde(skip_serializing_if = "String::is_empty")]
+    pub nickname: String,
    pub phone_number: String,
    // empty
    #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
-    pub user_id: Option<uuid::Uuid>,
+    pub user_id: uuid::Uuid,
 }
@@ -6,10 +6,7 @@ pub mod token;
 pub mod user;

 pub mod init {
-    pub fn is_uuid_nil(uuid: &Option<uuid::Uuid>) -> bool {
-        match uuid {
-            Some(id) => id.is_nil(),
-            None => true,
-        }
+    pub fn is_uuid_nil(uuid: &uuid::Uuid) -> bool {
+        uuid.is_nil()
    }
 }
@@ -5,9 +5,7 @@ use serde::{Deserialize, Serialize};

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