Adding envy module

.gitea/workflows/pr.yml

@@ -1,46 +0,0 @@
-name: textsender_models PR
-
-on:
-  pull_request:
-    branches:
-      - main
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  check:
-    name: Check
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v5
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.96
-      - uses: Swatinem/rust-cache@v2
-      - run: cargo check
-
-  fmt:
-    name: Rustfmt
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v5
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.96
-      - uses: Swatinem/rust-cache@v2
-      - run: rustup component add rustfmt
-      - run: cargo fmt --all -- --check
-
-  clippy:
-    name: Clippy
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v5
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.96
-      - uses: Swatinem/rust-cache@v2
-      - run: rustup component add clippy
-      - run: cargo clippy -- -D warnings

.gitea/workflows/release.yml

@@ -3,10 +3,10 @@ name: Release Tagging
 on:
   push:
     branches:
-      - main
+      - v0.3.0-migrate
   pull_request:
     branches:
-      - main
+      - v0.3.0-migrate
 
 jobs:
   release:
@@ -20,7 +20,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.95
           components: cargo
 
       - name: Extract Version from Cargo.toml

.gitea/workflows/rust.yml

@@ -3,11 +3,10 @@ name: Rust Build
 on:
   push:
     branches:
-      - main
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+      - v0.3.0-migrate
+  pull_request:
+    branches:
+      - v0.3.0-migrate
 
 jobs:
   check:
@@ -17,8 +16,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
-      - uses: Swatinem/rust-cache@v2
+          toolchain: 1.95
       - run: cargo check
 
   test:
@@ -28,8 +26,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
-      - uses: Swatinem/rust-cache@v2
+          toolchain: 1.95
       - run: cargo test
 
   fmt:
@@ -39,8 +36,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
-      - uses: Swatinem/rust-cache@v2
+          toolchain: 1.95
       - run: rustup component add rustfmt
       - run: cargo fmt --all -- --check
 
@@ -51,8 +47,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
-      - uses: Swatinem/rust-cache@v2
+          toolchain: 1.95
       - run: rustup component add clippy
       - run: cargo clippy -- -D warnings
 
@@ -63,6 +58,5 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
-      - uses: Swatinem/rust-cache@v2
+          toolchain: 1.95
       - run: cargo build

Cargo.toml

@@ -1,29 +1,21 @@
 [package]
 name = "textsender_models"
-version = "0.4.10"
+version = "0.3.0"
 edition = "2024"
-rust-version = "1.96"
-description = "Models used for the textsender project"
+rust-version = "1.95"
+description = "models used for the textsender project"
+# license = "MIT"
 
 [dependencies]
 serde = { version = "1.0.228", features = ["derive"] }
-serde_json = { version = "1.0.150" }
-time = { version = "0.3.49", features = ["formatting", "macros", "parsing", "serde"] }
-sqlx = { version = "0.8.6", features = ["postgres", "runtime-tokio-native-tls", "time", "uuid"] }
-uuid = { version = "1.23.3", features = ["v4", "serde"] }
+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"] }
 dotenvy = { version = "0.15.7" }
 const_format = { version = "0.2.36" }
-josekit = { version = "0.10.3" }
-utoipa = { version = "5.5.0", features = ["uuid", "time"] }
-
-[features]
-default = ["full"]
-full = ["user", "message", "contact", "config", "envy", "token"]
-user = []
-message = []
-contact = []
-config = []
-envy = []
-token = []
+# 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

@@ -1,7 +1,9 @@
-#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
+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")]
@@ -19,26 +21,3 @@ impl TwilioConfig {
         println!("Number: {:?}", self.phone_number);
     }
 }
-
-// TODO: Remove the async at a later point
-pub async fn load_config() -> Result<TwilioConfig, std::io::Error> {
-    let auth_sid_var = crate::envy::environment::get_env("TWILIO_AUTH_SID").await;
-    let service_sid_var = crate::envy::environment::get_env("TWILIO_SERVICE_SID").await;
-    let auth_token_var = crate::envy::environment::get_env("TWILIO_AUTH_TOKEN").await;
-    let phone_number_var = crate::envy::environment::get_env("TWILIO_PHONE_NUMBER").await;
-
-    if auth_sid_var.value.is_empty()
-        || service_sid_var.value.is_empty()
-        || auth_token_var.value.is_empty()
-        || phone_number_var.value.is_empty()
-    {
-        Err(std::io::Error::other("Config not set"))
-    } else {
-        Ok(TwilioConfig {
-            service_sid: service_sid_var.value,
-            auth_token: auth_token_var.value,
-            account_sid: auth_sid_var.value,
-            phone_number: phone_number_var.value,
-        })
-    }
-}

src/contact/mod.rs

@@ -1,19 +1,15 @@
-#[derive(
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
+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>,
+    pub firstname: String,
     // empty?
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub lastname: Option<String>,
+    pub lastname: String,
     // empty?
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub nickname: Option<String>,
+    pub nickname: String,
     pub phone_number: String,
-    #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
-    pub user_id: Option<uuid::Uuid>,
+    // empty
+    pub user_id: uuid::Uuid,
 }

src/envy/environment.rs

@@ -1,5 +1,3 @@
-// TODO: Functions does not need to be async
-
 pub async fn get_db_url() -> crate::envy::EnvVar {
     dotenvy::dotenv().ok();
     let key = crate::envy::keys::DB_URL;

src/envy/keys.rs

@@ -41,8 +41,7 @@ pub mod 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_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);

src/envy/mod.rs

@@ -37,3 +37,4 @@ pub fn init_delimiter(envvar: &mut EnvVar, delimiter: char) {
         envvar.has_delimiter = has_delimiter;
     }
 }
+

src/lib.rs

@@ -4,12 +4,3 @@ 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

@@ -1,17 +1,14 @@
-/// Message status - Instant
+use serde::{Deserialize, Serialize};
+
 pub const MESSAGE_EVENT_RESPONSE_STATUS_INSTANT: &str = "INSTANT";
-/// Message status - Scheduled
 pub const MESSAGE_EVENT_RESPONSE_STATUS_SCHEDULED: &str = "SCHEDULED";
 
-#[derive(
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct MessageEventResponse {
     pub id: uuid::Uuid,
-    #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
-    pub scheduled_message_event_id: Option<uuid::Uuid>,
-    /// Stores a json response of the sent message
-    pub response: serde_json::Value,
+    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,

src/message/mod.rs

@@ -1,13 +1,11 @@
 pub mod event;
 pub mod scheduling;
 
-#[derive(
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 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,
 }

src/message/scheduling/mod.rs

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

src/token/mod.rs

@@ -1,40 +1,18 @@
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Claims {
     pub user_id: uuid::Uuid,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub role: Option<String>,
+    pub role: String,
     #[serde(alias = "iss")]
     pub issued: String,
     #[serde(alias = "exp")]
-    #[serde(deserialize_with = "deserialize_i64_from_f64")]
     pub expired: i64,
     #[serde(alias = "iat")]
-    #[serde(deserialize_with = "deserialize_i64_from_f64")]
     pub issued_at: i64,
 }
 
-fn deserialize_i64_from_f64<'de, D>(deserializer: D) -> Result<i64, D::Error>
-where
-    D: serde::Deserializer<'de>,
-{
-    let val = f64::deserialize(deserializer)?;
-    // Handle NaN and infinity cases
-    if val.is_nan() || val.is_infinite() {
-        return Err(serde::de::Error::custom("invalid float value"));
-    }
-    // Round to nearest integer and convert
-    let rounded = val.round();
-    // Check if the rounded value can fit in i64
-    if rounded < (i64::MIN as f64) || rounded > (i64::MAX as f64) {
-        Err(serde::de::Error::custom("float out of i64 range"))
-    } else {
-        Ok(rounded as i64)
-    }
-}
-
-#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct LoginResult {
     pub user_id: uuid::Uuid,
     pub access_token: String,
@@ -43,121 +21,5 @@ pub struct LoginResult {
     pub issued_at: i64,
 }
 
-/// Alias for LoginResult
+// 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 = (*provided_time).into();
-        Ok(converted)
-    }
-}
-
-#[derive(Debug, utoipa::ToSchema)]
-pub struct TokenResource {
-    pub message: String,
-    pub issuer: String,
-    pub audiences: Vec<String>,
-    pub user_id: uuid::Uuid,
-}
-
-/// Token type
-pub const TOKEN_TYPE: &str = "JWT";
-
-pub struct CreateTokenResult {
-    pub access_token: String,
-    pub issued: i64,
-    pub expires_in: i64,
-    pub token_issued: time::OffsetDateTime,
-}
-
-pub fn create_token(
-    key: &String,
-    token_resource: &TokenResource,
-    duration: time::Duration,
-) -> Result<CreateTokenResult, josekit::JoseError> {
-    let mut header = josekit::jws::JwsHeader::new();
-    header.set_token_type(TOKEN_TYPE);
-
-    let mut payload = josekit::jwt::JwtPayload::new();
-    payload.set_subject(&token_resource.message);
-    payload.set_issuer(&token_resource.issuer);
-    payload.set_audience(token_resource.audiences.clone());
-    if !token_resource.user_id.is_nil() {
-        match payload.set_claim("user_id", Some(serde_json::json!(token_resource.user_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(CreateTokenResult {
-                access_token: josekit::jwt::encode_with_signer(&payload, &header, &signer).unwrap(),
-                issued: issued.unix_timestamp(),
-                expires_in: expire.unix_timestamp(),
-                token_issued: issued,
-            })
-        }
-        Err(e) => Err(josekit::JoseError::InvalidClaim(e.into())),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    const TEST_MESSAGE: &str = "Testing for textsender";
-    const TEST_ISSUER: &str = "textsender-test";
-    const TEST_AUDIENCE: &str = "area-test";
-    const TEST_USER_ID: uuid::Uuid = uuid::uuid!("9ab1c75f-d184-4913-ae99-544b4dcfcb41");
-    const TEST_KEY: &str = "8342nhf7ycrt4983q7ryfc93w478ryfc3w9487ryfc342w98i7cy";
-
-    #[test]
-    fn test_create_token() {
-        let token_resource = super::TokenResource {
-            message: String::from(TEST_MESSAGE),
-            issuer: String::from(TEST_ISSUER),
-            audiences: vec![String::from(TEST_AUDIENCE)],
-            user_id: TEST_USER_ID,
-        };
-
-        let token_duration = time::Duration::minutes(30);
-        let key = String::from(TEST_KEY);
-
-        match super::create_token(&key, &token_resource, token_duration) {
-            Ok(cst) => match time::OffsetDateTime::from_unix_timestamp(cst.issued) {
-                Ok(d_result) => {
-                    let they_match = {
-                        d_result.year() == cst.token_issued.year()
-                            && d_result.month() == cst.token_issued.month()
-                            && d_result.day() == cst.token_issued.day()
-                            && d_result.hour() == cst.token_issued.hour()
-                            && d_result.minute() == cst.token_issued.minute()
-                            && d_result.second() == cst.token_issued.second()
-                    };
-                    assert!(they_match, "Issued times do not match");
-                }
-                Err(err) => {
-                    assert!(false, "Error: {err:?}");
-                }
-            },
-            Err(err) => {
-                assert!(false, "Error: {err:?}");
-            }
-        }
-    }
-}

src/user/mod.rs

@@ -1,6 +1,6 @@
-#[derive(
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct User {
     pub id: uuid::Uuid,
     pub phone_number: String,
@@ -14,13 +14,9 @@ pub struct User {
     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, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct ServiceUser {
     pub id: uuid::Uuid,
     pub username: String,
@@ -30,13 +26,9 @@ pub struct ServiceUser {
     // 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, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Organization {
     pub id: uuid::Uuid,
     pub name: String,
@@ -44,9 +36,7 @@ pub struct Organization {
     pub created: Option<time::OffsetDateTime>,
 }
 
-#[derive(
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct UserLoginHistory {
     pub id: uuid::Uuid,
     #[serde(with = "time::serde::rfc3339::option")]
@@ -54,9 +44,7 @@ pub struct UserLoginHistory {
     pub user_id: uuid::Uuid,
 }
 
-#[derive(
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct ServiceUserLoginHistory {
     pub id: uuid::Uuid,
     #[serde(with = "time::serde::rfc3339::option")]
@@ -64,9 +52,7 @@ pub struct ServiceUserLoginHistory {
     pub service_user_id: uuid::Uuid,
 }
 
-#[derive(
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct UserProfile {
     pub user_id: uuid::Uuid,
     pub phone_number: String,
@@ -79,24 +65,6 @@ pub struct UserProfile {
     pub last_login: Option<time::OffsetDateTime>,
 }
 
-#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow)]
-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,