Fixing issue with Contact fields

Reviewed-on: phoenix/textsender-models#19

Cargo.lock

@@ -2,12 +2,33 @@
 # It is not intended for manual editing.
 version = 4
 
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "anyhow"
 version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
 
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
 [[package]]
 name = "bitflags"
 version = "2.11.1"
@@ -20,6 +41,16 @@ version = "3.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
 
+[[package]]
+name = "cc"
+version = "1.2.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "556e016178bb5662a08681bbe0f00f8e17631781a4dfc8c45e466e4b185ec27f"
+dependencies = [
+ "find-msvc-tools",
+ "shlex",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.4"
@@ -37,6 +68,27 @@ dependencies = [
  "rand_core",
 ]
 
+[[package]]
+name = "const_format"
+version = "0.2.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4481a617ad9a412be3b97c5d403fef8ed023103368908b9c50af598ff467cc1e"
+dependencies = [
+ "const_format_proc_macros",
+ "konst",
+]
+
+[[package]]
+name = "const_format_proc_macros"
+version = "0.2.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
 [[package]]
 name = "cpufeatures"
 version = "0.3.0"
@@ -46,6 +98,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "crc32fast"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "deranged"
 version = "0.5.8"
@@ -56,6 +117,12 @@ dependencies = [
  "serde_core",
 ]
 
+[[package]]
+name = "dotenvy"
+version = "0.15.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
+
 [[package]]
 name = "equivalent"
 version = "1.0.2"
@@ -78,12 +145,43 @@ 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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
+
+[[package]]
+name = "flate2"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "foldhash"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
 [[package]]
 name = "futures-core"
 version = "0.3.32"
@@ -167,6 +265,23 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
+[[package]]
+name = "josekit"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a808e078330e6af222eb0044b71d4b1ff981bfef43e7bc8133a88234e0c86a0c"
+dependencies = [
+ "anyhow",
+ "base64",
+ "flate2",
+ "openssl",
+ "regex",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "time",
+]
+
 [[package]]
 name = "js-sys"
 version = "0.3.99"
@@ -179,6 +294,21 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "konst"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "128133ed7824fcd73d6e7b17957c5eb7bacb885649bd8c69708b2331a10bcefb"
+dependencies = [
+ "konst_macro_rules",
+]
+
+[[package]]
+name = "konst_macro_rules"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37"
+
 [[package]]
 name = "leb128fmt"
 version = "0.1.0"
@@ -209,6 +339,16 @@ version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8"
 
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+ "simd-adler32",
+]
+
 [[package]]
 name = "num-conv"
 version = "0.2.2"
@@ -221,12 +361,55 @@ version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
+[[package]]
+name = "openssl"
+version = "0.10.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a45fa2aa886c42762255da344f0a0d313e254066c46aad76f300c3d3da62d967"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "foreign-types",
+ "libc",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.116"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f28a22dc7140cda5f096e5e7724a6962ca81a7f8bfd2979f9b18c11af56318c4"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
 
+[[package]]
+name = "pkg-config"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
+
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -284,6 +467,35 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
 
+[[package]]
+name = "regex"
+version = "1.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
+
 [[package]]
 name = "rustix"
 version = "1.1.4"
@@ -345,6 +557,7 @@ version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
 dependencies = [
+ "indexmap",
  "itoa",
  "memchr",
  "serde",
@@ -352,6 +565,18 @@ dependencies = [
  "zmij",
 ]
 
+[[package]]
+name = "shlex"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
+
 [[package]]
 name = "slab"
 version = "0.4.12"
@@ -386,14 +611,38 @@ dependencies = [
 name = "textsender_models"
 version = "0.3.0"
 dependencies = [
+ "const_format",
+ "dotenvy",
+ "josekit",
  "rand",
  "serde",
  "serde_json",
  "tempfile",
  "time",
+ "utoipa",
  "uuid",
 ]
 
+[[package]]
+name = "thiserror"
+version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "time"
 version = "0.3.47"
@@ -437,6 +686,30 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
+[[package]]
+name = "utoipa"
+version = "5.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bde15df68e80b16c7d16b9616e80770ad158988daa56a27dccd1e55558b0160"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_json",
+ "utoipa-gen",
+]
+
+[[package]]
+name = "utoipa-gen"
+version = "5.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ba0b99ee52df3028635d93840c797102da61f8a7bb3cf751032455895b52ef8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "uuid",
+]
+
 [[package]]
 name = "uuid"
 version = "1.23.1"
@@ -449,6 +722,12 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
 [[package]]
 name = "wasip2"
 version = "1.0.3+wasi-0.2.9"

Cargo.toml

@@ -12,8 +12,10 @@ serde_json = { version = "1.0.149" }
 rand = { version = "0.10.1" }
 time = { version = "0.3.47", features = ["formatting", "macros", "parsing", "serde"] }
 uuid = { version = "1.23.1", features = ["v4", "serde"] }
-# josekit = { version = "0.10.3" }
-# utoipa = { version = "5.4.0", features = ["uuid", "time"] }
+dotenvy = { version = "0.15.7" }
+const_format = { version = "0.2.36" }
+josekit = { version = "0.10.3" }
+utoipa = { version = "5.4.0", features = ["uuid", "time"] }
 
 [dev-dependencies]
 tempfile = { version = "3.27.0" }

src/config/auxiliary/mod.rs

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

src/contact/mod.rs

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

src/envy/environment.rs

@@ -0,0 +1,106 @@
+pub async fn get_db_url() -> crate::envy::EnvVar {
+    dotenvy::dotenv().ok();
+    let key = crate::envy::keys::DB_URL;
+    let value = std::env::var(key).expect(key);
+
+    crate::envy::init_envvar(key, &value)
+}
+
+pub async fn get_secret_main_key() -> crate::envy::EnvVar {
+    dotenvy::dotenv().ok();
+    let key = crate::envy::keys::SECRET_MAIN_KEY;
+    let value = std::env::var(key).expect(key);
+
+    crate::envy::init_envvar(key, &value)
+}
+
+pub async fn get_service_passphrase() -> crate::envy::EnvVar {
+    dotenvy::dotenv().ok();
+    let key = crate::envy::keys::SERVICE_PASSPHRASE;
+    let value = std::env::var(key).expect(key);
+
+    crate::envy::init_envvar(key, &value)
+}
+
+pub async fn get_secret_key() -> crate::envy::EnvVar {
+    dotenvy::dotenv().ok();
+    let key = crate::envy::keys::SECRET_KEY;
+    let value = std::env::var(key).expect(key);
+
+    crate::envy::init_envvar(key, &value)
+}
+
+pub async fn get_root_directory() -> crate::envy::EnvVar {
+    dotenvy::dotenv().ok();
+    let key = crate::envy::keys::ROOT_DIRECTORY;
+    let value = std::env::var(key).expect(key);
+
+    crate::envy::init_envvar(key, &value)
+}
+
+pub async fn get_app_base_api_url() -> crate::envy::EnvVar {
+    dotenvy::dotenv().ok();
+    let key = crate::envy::keys::TEXTSENDER_BASE_API_URL;
+    let value = std::env::var(key).expect(key);
+
+    crate::envy::init_envvar(key, &value)
+}
+
+pub async fn get_app_auth_base_api_url() -> crate::envy::EnvVar {
+    dotenvy::dotenv().ok();
+    let key = crate::envy::keys::TEXTSENDER_AUTH_BASE_API_URL;
+    let value = std::env::var(key).expect(key);
+
+    crate::envy::init_envvar(key, &value)
+}
+
+pub async fn get_app_env() -> crate::envy::EnvVar {
+    dotenvy::dotenv().ok();
+    let key = crate::envy::keys::APP_ENV;
+    let value = std::env::var(key).expect(key);
+
+    crate::envy::init_envvar(key, &value)
+}
+
+pub async fn get_backend_port() -> crate::envy::EnvVar {
+    dotenvy::dotenv().ok();
+    let key = crate::envy::keys::BACKEND_PORT;
+    let value = std::env::var(key).expect(key);
+    crate::envy::init_envvar(key, &value)
+}
+
+pub async fn get_frontend_url() -> crate::envy::EnvVar {
+    dotenvy::dotenv().ok();
+    let key = crate::envy::keys::FRONTEND_URL;
+    let value = std::env::var(key).expect(key);
+
+    crate::envy::init_envvar(key, &value)
+}
+
+pub async fn get_rust_log() -> crate::envy::EnvVar {
+    dotenvy::dotenv().ok();
+    let key = crate::envy::keys::RUST_LOG;
+    let value = std::env::var(key).expect(key);
+
+    crate::envy::init_envvar(key, &value)
+}
+
+pub async fn get_allowed_origins() -> crate::envy::EnvVar {
+    dotenvy::dotenv().ok();
+    let key = crate::envy::keys::ALLOWED_ORIGINS;
+    let value = std::env::var(key).expect(key);
+
+    let mut envvar = crate::envy::init_envvar(key, &value);
+    crate::envy::init_delimiter(&mut envvar, ',');
+
+    envvar
+}
+
+/// Get environment not specified in the code
+pub async fn get_env(environment: &str) -> crate::envy::EnvVar {
+    dotenvy::dotenv().ok();
+    let my_error = format!("{environment} {}", crate::envy::keys::error::GENERAL_ERROR);
+    let value = std::env::var(environment).expect(&my_error);
+
+    crate::envy::init_envvar(environment, &value)
+}

src/envy/keys.rs

@@ -0,0 +1,53 @@
+/// Environment key for Database management
+pub const DB_URL: &str = "DATABASE_URL";
+
+/// Environment key for secret main key
+/// Used for the textsender app
+pub const SECRET_MAIN_KEY: &str = "SECRET_MAIN_KEY";
+
+/// Environment key for service logins
+pub const SERVICE_PASSPHRASE: &str = "SERVICE_PASSPHRASE";
+
+/// Environment key for secret key
+/// Generic use of secret key that could be found in various apps
+pub const SECRET_KEY: &str = "SECRET_KEY";
+
+/// Environment key for root directory for the textsender app
+pub const ROOT_DIRECTORY: &str = "ROOT_DIRECTORY";
+
+/// Environment key for textsender api url
+pub const TEXTSENDER_BASE_API_URL: &str = "TEXTSENDER_BASE_API_URL";
+
+/// Environment key for textsender auth api url
+pub const TEXTSENDER_AUTH_BASE_API_URL: &str = "TEXTSENDER_AUTH_BASE_API_URL";
+
+/// Environment key for App status
+pub const APP_ENV: &str = "APP_ENV";
+/// Environment key for backend port. Used for both auth and core functionality
+pub const BACKEND_PORT: &str = "BACKEND_PORT";
+/// Environment key for frontend url
+pub const FRONTEND_URL: &str = "FRONTEND_URL";
+/// Environment key for application logging
+pub const RUST_LOG: &str = "RUST_LOG";
+/// Environment key for allowed origins for CORS support
+pub const ALLOWED_ORIGINS: &str = "ALLOWED_ORIGINS";
+
+pub mod error {
+    use const_format::concatcp;
+
+    pub const GENERAL_ERROR: &str = "must not be set in enviornment file";
+    pub const DB_URL: &str = concatcp!(super::DB_URL, " ", GENERAL_ERROR);
+    pub const SECRET_MAIN_KEY: &str = concatcp!(super::SECRET_MAIN_KEY, " ", GENERAL_ERROR);
+    pub const SERVICE_LOGIN: &str = concatcp!(super::SERVICE_PASSPHRASE, " ", GENERAL_ERROR);
+    pub const SECRET_KEY: &str = concatcp!(super::SECRET_KEY, " ", GENERAL_ERROR);
+    pub const ROOT_DIRECTORY: &str = concatcp!(super::ROOT_DIRECTORY, " ", GENERAL_ERROR);
+    pub const TEXTSENDER_BASE_API_URL: &str =
+        concatcp!(super::TEXTSENDER_BASE_API_URL, " ", GENERAL_ERROR);
+    pub const TEXTSENDER_AUTH_BASE_API_URL: &str =
+        concatcp!(super::TEXTSENDER_AUTH_BASE_API_URL, " ", GENERAL_ERROR);
+    pub const APP_ENV: &str = concatcp!(super::APP_ENV, " ", GENERAL_ERROR);
+    pub const BACKEND_PORT: &str = concatcp!(super::BACKEND_PORT, " ", GENERAL_ERROR);
+    pub const FRONTEND_URL: &str = concatcp!(super::FRONTEND_URL, " ", GENERAL_ERROR);
+    pub const RUST_LOG: &str = concatcp!(super::RUST_LOG, " ", GENERAL_ERROR);
+    pub const ALLOWED_ORIGINS: &str = concatcp!(super::ALLOWED_ORIGINS, " ", GENERAL_ERROR);
+}

src/envy/mod.rs

@@ -0,0 +1,39 @@
+pub mod environment;
+pub mod keys;
+pub mod utility;
+
+#[derive(Debug, Default, Clone)]
+pub struct EnvVar {
+    pub key: String,
+    pub value: String,
+    pub has_delimiter: bool,
+    pub delimiter: char,
+}
+
+pub fn init_envvar(key: &str, value: &str) -> EnvVar {
+    EnvVar {
+        key: key.to_string(),
+        value: value.to_string(),
+        has_delimiter: false,
+        ..Default::default()
+    }
+}
+
+pub fn init_delimiter(envvar: &mut EnvVar, delimiter: char) {
+    let mut amount_of_delimiters_found: i32 = 0;
+
+    for v in envvar.value.chars() {
+        if v == delimiter {
+            amount_of_delimiters_found += 1;
+        }
+    }
+
+    let has_delimiter = amount_of_delimiters_found >= 1;
+
+    if has_delimiter {
+        envvar.has_delimiter = has_delimiter;
+        envvar.delimiter = delimiter;
+    } else {
+        envvar.has_delimiter = has_delimiter;
+    }
+}

src/envy/utility.rs

@@ -0,0 +1,15 @@
+/// Take the Environment variable and delimitize it. If the value has a delimiter,
+/// extract it into some strings
+pub fn delimitize(var: &crate::envy::EnvVar) -> Result<Vec<String>, std::io::Error> {
+    if var.has_delimiter {
+        Ok(var
+            .value
+            .split(var.delimiter)
+            .map(|c| c.parse::<String>().unwrap())
+            .collect())
+    } else {
+        Err(std::io::Error::other(
+            "Environment variable does not have a delimiter",
+        ))
+    }
+}

src/lib.rs

@@ -1,2 +1,15 @@
 pub mod config;
 pub mod contact;
+pub mod envy;
+pub mod message;
+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,
+        }
+    }
+}

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, utoipa::ToSchema)]
+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, utoipa::ToSchema)]
+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/token/mod.rs

@@ -0,0 +1,89 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+pub struct Claims {
+    pub user_id: uuid::Uuid,
+    pub role: String,
+    #[serde(alias = "iss")]
+    pub issued: String,
+    #[serde(alias = "exp")]
+    pub expired: i64,
+    #[serde(alias = "iat")]
+    pub issued_at: i64,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
+pub struct LoginResult {
+    pub user_id: uuid::Uuid,
+    pub access_token: String,
+    pub token_type: String,
+    pub expires_in: i64,
+    pub issued_at: i64,
+}
+
+// Alias for LoginResult
+pub type Login = LoginResult;
+
+pub fn get_issued() -> time::Result<time::OffsetDateTime> {
+    Ok(time::OffsetDateTime::now_utc())
+}
+
+mod util {
+    pub fn time_to_std_time(
+        provided_time: &time::OffsetDateTime,
+    ) -> Result<std::time::SystemTime, std::time::SystemTimeError> {
+        let converted = std::time::SystemTime::from(*provided_time);
+        Ok(converted)
+    }
+}
+
+#[derive(Debug, utoipa::ToSchema)]
+pub struct TokenResource {
+    pub message: String,
+    pub issuer: String,
+    pub audiences: Vec<String>,
+    pub id: uuid::Uuid,
+}
+
+pub const TOKEN_TYPE: &str = "JWT";
+
+pub fn create_token(
+    key: &String,
+    token_resource: &TokenResource,
+    duration: time::Duration,
+) -> Result<(String, i64), josekit::JoseError> {
+    let mut header = josekit::jws::JwsHeader::new();
+    header.set_token_type(TOKEN_TYPE);
+
+    let mut payload = josekit::jwt::JwtPayload::new();
+    let message = &token_resource.message;
+    let issuer = &token_resource.issuer;
+    let audiences: &Vec<String> = &token_resource.audiences;
+    payload.set_subject(message);
+    payload.set_issuer(issuer);
+    payload.set_audience(audiences.clone());
+    if !token_resource.id.is_nil() {
+        match payload.set_claim("id", Some(serde_json::json!(token_resource.id))) {
+            Ok(_) => {}
+            Err(err) => {
+                return Err(err);
+            }
+        }
+    }
+    match get_issued() {
+        Ok(issued) => {
+            let expire = issued + duration;
+            payload.set_issued_at(&util::time_to_std_time(&issued).unwrap());
+            payload.set_expires_at(&util::time_to_std_time(&expire).unwrap());
+
+            let signer = josekit::jws::alg::hmac::HmacJwsAlgorithm::Hs256
+                .signer_from_bytes(key.as_bytes())
+                .unwrap();
+            Ok((
+                josekit::jwt::encode_with_signer(&payload, &header, &signer).unwrap(),
+                (expire - time::OffsetDateTime::UNIX_EPOCH).whole_seconds(),
+            ))
+        }
+        Err(e) => Err(josekit::JoseError::InvalidClaim(e.into())),
+    }
+}

src/user/mod.rs

@@ -0,0 +1,124 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
+pub struct User {
+    pub id: uuid::Uuid,
+    pub phone_number: String,
+    pub username: String,
+    pub password: String,
+    // Firstname is a pointer
+    pub firstname: String,
+    // Lastname is a pointer
+    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>,
+    #[serde(skip)]
+    pub salt_id: uuid::Uuid,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
+pub struct ServiceUser {
+    pub id: uuid::Uuid,
+    pub username: String,
+    pub passphrase: String,
+    #[serde(with = "time::serde::rfc3339::option")]
+    pub created: Option<time::OffsetDateTime>,
+    // When serializing to json, if empty do not populate
+    #[serde(with = "time::serde::rfc3339::option")]
+    pub last_login: Option<time::OffsetDateTime>,
+    #[serde(skip)]
+    pub salt_id: uuid::Uuid,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
+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, utoipa::ToSchema)]
+pub struct UserLoginHistory {
+    pub id: uuid::Uuid,
+    #[serde(with = "time::serde::rfc3339::option")]
+    pub login_time: Option<time::OffsetDateTime>,
+    pub user_id: uuid::Uuid,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
+pub struct ServiceUserLoginHistory {
+    pub id: uuid::Uuid,
+    #[serde(with = "time::serde::rfc3339::option")]
+    pub login_time: Option<time::OffsetDateTime>,
+    pub service_user_id: uuid::Uuid,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
+pub struct UserProfile {
+    pub user_id: uuid::Uuid,
+    pub phone_number: String,
+    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>,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+pub struct Salt {
+    // #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
+    pub id: uuid::Uuid,
+    #[serde(skip_serializing_if = "String::is_empty")]
+    pub salt: String,
+}
+
+impl Salt {
+    pub fn to_json(&self, output_pretty: bool) -> Result<String, serde_json::Error> {
+        if output_pretty {
+            serde_json::to_string_pretty(&self)
+        } else {
+            serde_json::to_string(&self)
+        }
+    }
+}
+
+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,
+    }
+}
+
+#[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"
+        );
+    }
+}